|
@@ -725,8 +725,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
case R.id.iv_setting:
|
|
case R.id.iv_setting:
|
|
|
- Intent intent = new Intent(IndexActivity.this, VideoActivity.class);
|
|
|
|
|
-// intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, GloableParams.GRIDNAME_SETTING);
|
|
|
|
|
|
|
+ Intent intent = new Intent(IndexActivity.this, FunctionActivity.class);
|
|
|
|
|
+ intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, GloableParams.GRIDNAME_SETTING);
|
|
|
startActivity(intent);
|
|
startActivity(intent);
|
|
|
break;
|
|
break;
|
|
|
case R.id.line_login_post:
|
|
case R.id.line_login_post:
|
|
@@ -2006,7 +2006,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
|
|
|
|
|
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
- })).init("192.168.0.72",Integer.valueOf(ss_brdports));//Integer.valueOf(ss_brdports)192.168.2.6
|
|
|
|
|
|
|
+ })).init(ss_brdips,Integer.parseInt(ss_brdports));//Integer.valueOf(ss_brdports)192.168.2.6
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|
|
|
* 断开socket
|
|
* 断开socket
|
|
@@ -2031,6 +2031,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
|
|
|
return matcher.replaceAll("");
|
|
return matcher.replaceAll("");
|
|
|
}
|
|
}
|
|
|
public void setdataDisplay(String stringtextsss){//获取数据
|
|
public void setdataDisplay(String stringtextsss){//获取数据
|
|
|
|
|
+
|
|
|
// Log.e("stringtextsss====",stringtextsss+"");
|
|
// Log.e("stringtextsss====",stringtextsss+"");
|
|
|
// boolean badJson = JsonUtilsflase.isBadJson(stringtextsss);
|
|
// boolean badJson = JsonUtilsflase.isBadJson(stringtextsss);
|
|
|
LogUtil.edayin("stringtextsss=======",stringtextsss+"");
|
|
LogUtil.edayin("stringtextsss=======",stringtextsss+"");
|
|
@@ -2038,13 +2039,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
|
|
|
SharedPreUtil.removeString(this,"stringtexttcp");
|
|
SharedPreUtil.removeString(this,"stringtexttcp");
|
|
|
SharedPreUtil.saveString(IndexActivity.this,"stringtexttcp", stringtextsss);
|
|
SharedPreUtil.saveString(IndexActivity.this,"stringtexttcp", stringtextsss);
|
|
|
if (!stringtextsss.isEmpty()) {
|
|
if (!stringtextsss.isEmpty()) {
|
|
|
-// urlBeanList.clear();
|
|
|
|
|
-// list = new ArrayList<>();
|
|
|
|
|
-// String stringtext="[{path=aHR0cDovL21lcy51YnRvYi5uZXQ6ODA5OS9wb3N0YXR0YWNoL3pob25neWwvMTY2ZDZmNjc0NjhlNDMwYWE4OWEwMzZlY2JlZWM4NjUuanBn, ps_sourcecode=ZZ_01_PCBA, filename=945.jpg, ps_prodcode=04.DMH.EM11218201A, ps_code=2022110005, ss_code=A02}][{path=aHR0cDovL21lcy51YnRvYi5uZXQ6ODA5OS9wb3N0YXR0YWNoL3pob25neWwvMTY2ZDZmNjc0NjhlNDMwYWE4OWEwMzZlY2JlZWM4NjUuanBn, ps_sourcecode=ZZ_01_PCBA, filename=1234321.jpg, ps_prodcode=04.DMH.EM11218201A, ps_code=2022110005, ss_code=A01}]";
|
|
|
|
|
-// String s1 = removeSpace(stringtextsss);
|
|
|
|
|
-// String replace = s1.replace(":", "=");
|
|
|
|
|
-// String stringtext = replace.replaceAll("\"", "");
|
|
|
|
|
-// Log.e("replace====",stringtext);
|
|
|
|
|
|
|
|
|
|
list = new ArrayList<>();
|
|
list = new ArrayList<>();
|
|
|
Gson gson = new Gson();
|
|
Gson gson = new Gson();
|