diff --git a/app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java b/app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java index b5f8a2c..fba4e6d 100644 --- a/app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java @@ -184,9 +184,7 @@ public class UpdateFileActivity extends BaseActivity { //根据离线接口列表 获取离线数据和图片 if (!"信发".equals(deviceType)&&!"双面屏".equals(deviceType)) { H5Data.queryFileResources( () -> totalQueryCount++, () -> queryResponseCount++ ,bigFiles); - getOfflineDataByInterface(); - } if("指路机".equals(deviceType)){ diff --git a/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java b/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java index 19512b7..ccb5890 100644 --- a/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java +++ b/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java @@ -89,7 +89,6 @@ public class ScreenSaverActivity extends BaseActivity { static final int TYPE_HINT_PASSWORD = 3;// 隐藏密码输入框 static final int NOVA_HINT = 4;// 隐藏密码输入框 static final int SHOW_JXB = 5;// 机械臂轮播 - String TB40_password = "SN2008@+";// 华贸SN2008@+ int time = 0; @@ -109,11 +108,6 @@ public class ScreenSaverActivity extends BaseActivity { removeMessages(TYPE_HINT_PASSWORD); } time++; - try { - - } catch (Exception e) { - - } break; case NOVA_HINT: @@ -447,8 +441,8 @@ public class ScreenSaverActivity extends BaseActivity { String companyInfo = "{\"company\":\"NovaStar\",\"phone\":\"029-68216000\",\"email\":\"hr@novastar.tech\"}"; instance.nvSetDevLang("Java"); int i = instance.nvInit(getDiskCacheDir(MyApplication.getInstance()), companyInfo); - LoggerUtil.e("华贸led设备初始化", "code" + i); String ip = "{\"ip\":\"" + DeviceUtil.getEthIpAddress() + "\"}"; + LoggerUtil.e("华贸led设备初始化", "code" + i+" IP: "+ip); instance.nvSearchAppointIpAsync(ip, new ViplexCore.CallBack() { @Override public void dataCallBack(int code, String data) { @@ -456,28 +450,32 @@ public class ScreenSaverActivity extends BaseActivity { if (code == 0) { NovaDeviceBean novaDeviceBean = new Gson().fromJson(data, NovaDeviceBean.class); sn = novaDeviceBean.getSn(); - login(); - + login(""); } } }); } // TB40 华贸SN2008@+ 江湾里123456 - public void login() { + public void login(String cmd) { instance.nvLoginAsync("{\"sn\":\"" + sn + "\",\"username\":\"admin\",\"rememberPwd\":1,\"password\":\"" + TB40_password + "\",\"loginType\":0}", new ViplexCore.CallBack() { @Override public void dataCallBack(int code, String data) { - LoggerUtil.e("QHT: 登录1:", "code:" + code + "data:" + data); + LoggerUtil.e("QHT: 登录1: ", "code: " + code + "data: " + data); + if(code == 65300){ + } } }); instance.nvLoginAsync("{\"sn\":\"" + sn + "\",\"username\":\"admin\",\"rememberPwd\":1,\"password\":\"" + TB40_password + "\",\"loginType\":1}", new ViplexCore.CallBack() { @Override public void dataCallBack(int code, String data) { - LoggerUtil.e("QHT: 登录2:", "code:" + code + "data:" + data); + LoggerUtil.e("QHT: 登录2: ", "code: " + code + "data: " + data); + if("reboot".equals(cmd)){ + reboot(); + } } }); } @@ -490,13 +488,15 @@ public class ScreenSaverActivity extends BaseActivity { @Override public void dataCallBack(int code, String data) { LoggerUtil.e("QHT: 重启:", "code:" + code + ",data:" + data); + if(code == 65350){ + login("reboot"); + } } }); } // 本地路径 public void updateApp(String url) { - String data4 = "{\n" + " \"sn\":\"" + sn + "\",\n" + " \"taskInfo\":{\n" + @@ -524,6 +524,9 @@ public class ScreenSaverActivity extends BaseActivity { @Override public void dataCallBack(int code, String data) { LoggerUtil.e("QHT: 更新:", "code:" + code + ",data:" + data); + if(code == 65350){ + login(""); + } } }); } @@ -549,6 +552,8 @@ public class ScreenSaverActivity extends BaseActivity { if (code == 0) { uploadScreenShot("/storage/emulated/0/screenShot.png", DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_CODE), time); + }else if(code == 65350){ + login(""); } } });