diff --git a/app/build.gradle b/app/build.gradle index d76bf22..dc6b42b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,6 +18,7 @@ android { // V2.0.8.5 同屏优化 // 2.0.8.6 视频播放器切换 // 2.0.8.12 固件更新 + //V2.0.8.14 和义大道开机5分钟后重启应用 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' diff --git a/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java b/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java index 19dc38a..b28ecdc 100644 --- a/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java +++ b/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java @@ -2093,6 +2093,9 @@ public class ViewScreenSaver extends ViewBase { public void startProgram(){ screenSaverList = ScreenSaverData.getScreenSaverList(ScreenSaverData.TYPE_SCREEN_SAVER); + if(screenSaverList == null){ + return; + } //获取当天时间段 for(NewProgramBean newProgramBean: screenSaverList){ if(newProgramBean.date.equals(TimeUtil.stampToDate(System.currentTimeMillis()))){ diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 2f07a01..9fff6e2 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -24,13 +24,13 @@ public class Constant { public static String mqttState = ""; // 屏幕连接方式 public static String TTSHome=""; // sbc-思必驰 kdxf-科大讯飞 (有语音的项目需要配置） //public static String androidBoardType = ""; //设备板子型号 无固定版 - public static String androidBoardType = "ys"; // 设备板子型号 ys（亿晟） 北京颐堤港定制touch + // public static String androidBoardType = "ys"; // 设备板子型号 ys（亿晟） 北京颐堤港定制touch // public static String androidBoardType = "xwst"; //设备板子型号 xwst（欣威视通3399） // public static String androidBoardType = "xwst2"; //设备板子型号 xwst2（欣威视通3588、T982、3576） // public static String androidBoardType = "zc"; //设备板子型号 zc（卓策主板——王府井喜悦、杨浦中心医院） // public static String androidBoardType = "sx"; //设备板子型号 sx（视想） // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED - // public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机 + public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机 // public static String androidBoardType = "bv"; //设备板子型号 Bv-3588M // public static String androidBoardType = "smt"; //设备板子型号 视美泰 diff --git a/app/src/main/java/qianmu/container/handler/ContainerHandler.java b/app/src/main/java/qianmu/container/handler/ContainerHandler.java index 89a54c3..be4f146 100644 --- a/app/src/main/java/qianmu/container/handler/ContainerHandler.java +++ b/app/src/main/java/qianmu/container/handler/ContainerHandler.java @@ -63,7 +63,7 @@ import qianmu.container.util.ViplexCore; public class ContainerHandler extends Handler { - public static final int HEART_BEAT_DELAY_TIME = 60 * 1000; //心跳包时间间隔 + public static final int HEART_BEAT_DELAY_TIME = 70 * 1000; //心跳包时间间隔 public static final int DELAY_TIME = 1000; //handler延时时间 public static final int CONNECT_LOCAL_SOCKET = 3; //连接本地socket public static final int CLOSE_LOCAL_SOCKET = 4; //关闭本地socket @@ -131,6 +131,7 @@ public class ContainerHandler extends Handler { public void onSuccess() { //检查,MQTT状态 mqttState(); + removeMessages(MQTT_ALIVE); printDisplayStatus(); sendEmptyMessageDelayed(MQTT_ALIVE,15000); sendEmptyMessageDelayed(MQTT_ALIVE,35000); @@ -145,10 +146,6 @@ public class ContainerHandler extends Handler { } ); getMemory(); - if("nova".equals(Constant.androidBoardType) && isExactlyNineClock()){ - LoggerUtil.e("reboot: ","设备重启"); - SignWayUtil.reboot(); - } // watchDog(); getCoreServiceState(); // DeviceData.getPrimaryMachine(null, this::updateClientStateByIP); @@ -158,14 +155,7 @@ public class ContainerHandler extends Handler { LoggerUtil.e("heartBeatDelayTime", StringUtil.getThrowableStr(t)); } } - // nova 设备每天两点重启一次 - public boolean isExactlyNineClock() { - // 获取系统当前的日历时间对象（包含年月日时分秒） - Calendar calendar = Calendar.getInstance(); - int hour = calendar.get(Calendar.HOUR_OF_DAY); - int minute = calendar.get(Calendar.MINUTE); - return hour == 2 && minute <2; - } + //获取屏幕状态 private static void printDisplayStatus() { DisplayManager dm = (DisplayManager) MyApplication.getInstance().getSystemService(Context.DISPLAY_SERVICE); @@ -226,17 +216,17 @@ public class ContainerHandler extends Handler { // if(cpuUsage>50){ // LoggerUtil.e("ContainerHandler","cpu使用率："+cpuUsage+"%"); // } -// - if(totalPss/1024>1000 && DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_TYPE).equals("导视") && !Constant.whoActivity.equals(Constant.ROUTE_WEB_VIEW)){ - //内存超过了1G会出现卡顿 - long currentTime = System.currentTimeMillis(); - if(currentTime-goNavTime>360000){ - LoggerUtil.e("getMemory()","内存超过1000 进入导视释放内存"); - ARouter.getInstance().build(Constant.ROUTE_WEB_VIEW).withBoolean(Constant.KEY_LOAD_H5_URL, true).navigation(); - goNavTime = currentTime; - } - } - if(totalPss/1024>1400){ + +// if(totalPss/1024>1400 && DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_TYPE).equals("导视") && !Constant.whoActivity.equals(Constant.ROUTE_WEB_VIEW)){ +// //内存超过了1G会出现卡顿 +// long currentTime = System.currentTimeMillis(); +// if(currentTime-goNavTime>360000){ +// LoggerUtil.e("getMemory()","内存超过1000 进入导视释放内存"); +// ARouter.getInstance().build(Constant.ROUTE_WEB_VIEW).withBoolean(Constant.KEY_LOAD_H5_URL, true).navigation(); +// goNavTime = currentTime; +// } +// } + if(totalPss/1024>1200){ //内存超过了1G会出现卡顿，内存溢出问题。重启设备。 LoggerUtil.e("getMemory()","内存溢出重启软件"); EventBus.getDefault().post(new MessageEvent(Constant.ACTION_RESTART_APP));