fix: ci

app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java

@@ -376,7 +376,7 @@ public class UpdateFileActivity extends BaseActivity {
                 }
             });
         }catch (Exception e){
-
+            Log.e("TAG", "初始化灰度失败", e);
         }
     }
 

app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java

@@ -676,7 +676,7 @@ public class WebViewActivity extends BaseActivity {
      * */
     public void getHandWriting(String msg){
         if (webView != null) {
-            webView.evaluateJavascript(StringUtil.strSplice("javascript:handWriting("+ msg +");"));
+            binding.web.loadUrl(StringUtil.strSplice("javascript:handWriting("+ msg +");"));
         }
     }
 
@@ -745,7 +745,7 @@ public class WebViewActivity extends BaseActivity {
                     handler.removeMessages(TYPE_START_SERVER);
                     handler.sendEmptyMessageDelayed(TYPE_START_SERVER,1000);
                 }catch (Exception e){
-
+                    LoggerUtil.e(TAG,"重启导视失败");
                 }
                 break;
             case Constant.VOID_STOP:

app/src/main/java/qianmu/container/activity/device/ViewServerInfo.java

@@ -40,7 +40,7 @@ public class ViewServerInfo extends ViewBase<ViewServerInfoBinding> {
     @Override
     protected void setData() {
         binding.serverIp.setText(DeviceData.getDeviceInfo(DeviceData.HINT_SERVER_IP).isEmpty()?Constant.DEFAULT_SERVER_IP:DeviceData.getDeviceInfo(DeviceData.HINT_SERVER_IP));
-        binding.regKey.setText(DeviceData.getDeviceInfo(DeviceData.HINT_REG_KEY));
+        binding.regKey.setText(DeviceData.getDeviceInfo(DeviceData.HINT_REG_KEY).isEmpty()?Constant.DEFAULT_REG_KEY:DeviceData.getDeviceInfo(DeviceData.HINT_REG_KEY));
     }
 
     @Override

app/src/main/java/qianmu/container/activity/program/MyPresentation.java

@@ -562,7 +562,7 @@ class MyPresentation extends Presentation {
                             }
                         }
                     }catch (Exception e){
-
+                        LoggerUtil.e("（双面屏）TYPE_GET_NEXT_PROGRAMME_OTHER_IMG报错",e.getMessage());
                     }
 
                     break;
@@ -1162,7 +1162,7 @@ class MyPresentation extends Presentation {
                             }
                         };
                     }catch (Exception e){
-
+                        LoggerUtil.e("（双面屏）TYPE_UPDATE_WEATHER0报错",e.getMessage());
                     }
 
                     break;
@@ -2072,7 +2072,7 @@ class MyPresentation extends Presentation {
                     },duration);
                 }
             }catch (Exception e){
-
+                LoggerUtil.e("（双面屏）createView()定时上传节目单记录报错",e.getMessage());
             }
         }
 
@@ -2179,7 +2179,7 @@ class MyPresentation extends Presentation {
                 }
             }
         }catch (Exception e){
-
+            LoggerUtil.e("（双面屏）设置背景颜色报错",e.getMessage());
         }
 
         //获取下个节目的图片
@@ -3921,8 +3921,7 @@ class MyPresentation extends Presentation {
                     }
 
                 } catch (Throwable t) {
-
-
+                    LoggerUtil.e("（双面屏）地图组件资源列表数据解析错误", StringUtil.getThrowableStr(t));
                 }
                 if (finishListener != null) finishListener.onFinish();
             }

app/src/main/java/qianmu/container/app/Constant.java

@@ -23,13 +23,13 @@ public class Constant {
     public static String mqttState = ""; // 屏幕连接方式
     public static String TTSHome="sbc";   // 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";  //设备板子型号   视美泰
     // public static String androidBoardType = "ctf";  //创泰丰
@@ -47,6 +47,7 @@ public class Constant {
 
     // 接口地址
     public static final String DEFAULT_SERVER_IP = "https://iot.1000my.com";// 默认服务器ip
+    public static final String DEFAULT_REG_KEY = "";
 
     // 默认页面路径(注册、退出、更新、屏保)
     public static final String ROUTE_DEVICE_INFO = "/library/deviceInfo";

app/src/main/java/qianmu/container/data/PowerData.java

@@ -178,9 +178,22 @@ public class PowerData extends BaseData {
             Calendar cal= Calendar.getInstance();
             String format = new SimpleDateFormat("yyyy-MM-dd").format(cal.getTime());
             if(!DeviceData.getDeviceInfo(DeviceData.DEVICE_RESTART_TIME).equals(format) && Constant.androidBoardType.equals("ys")){
-                LoggerUtil.e("亿晟防止定时开机黑屏:", "当天开机，重启设备");
-                DeviceData.saveDeviceInfo((DeviceData.DEVICE_RESTART_TIME),format);
-                SignWayUtil.reboot();
+                try{
+                    MyManager manager = MyManager.getInstance(MyApplication.getInstance());
+                    manager.turnOnHDMI();
+                    LoggerUtil.e("亿晟防止定时开机黑屏:", "当天开机，重启设备");
+                    DeviceData.saveDeviceInfo((DeviceData.DEVICE_RESTART_TIME),format);
+                    new Thread(() -> {
+                        try {
+                            Thread.sleep(5000); 
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        SignWayUtil.reboot();
+                    }).start();
+                }catch (Exception e){
+                    LoggerUtil.e("亿晟防止定时开机黑屏", "开启HDMI或保存数据失败", e);
+                }
                 return;
             }
 

app/src/main/java/qianmu/container/data/ScreenSaverData.java

@@ -241,6 +241,7 @@ public class ScreenSaverData extends BaseData {
 
             return true;
         }catch (Exception e){
+            LoggerUtil.e("isProgramList", e.getMessage());
             return false;
         }
 

app/src/main/java/qianmu/container/handler/ContainerHandler.java

@@ -336,7 +336,7 @@ public class ContainerHandler extends Handler {
             }
 
         }catch (Exception e){
-
+            LoggerUtil.e("mqttState", "判断MQTT状态失败", e);
         }
     }
 

app/src/main/java/qianmu/container/mqtt/MQTTService.java

@@ -417,7 +417,7 @@ public class MQTTService extends Service {
             String message = new Gson().toJson(closeMqttBean);
             publish(message);
         }catch (Exception e){
-
+            LoggerUtil.e(TAG, "发送在线消息失败", e);
         }
     }
 
@@ -435,7 +435,7 @@ public class MQTTService extends Service {
                 publish(message);
             }
         }catch (Exception e){
-
+            LoggerUtil.e(TAG, "发送心跳消息失败", e);
         }
     }
 
@@ -451,7 +451,7 @@ public class MQTTService extends Service {
             String message = new Gson().toJson(closeMqttBean);
             publish(message);
         }catch (Exception e){
-
+            LoggerUtil.e(TAG, "发送离线消息失败", e);
         }
 
     }
@@ -465,7 +465,7 @@ public class MQTTService extends Service {
 //                disconnectToken.waitForCompletion();
             }
         } catch (MqttException e) {
-            e.printStackTrace();
+            LoggerUtil.e(TAG, "断开MQTT连接失败", e);
         }
 
     }
@@ -535,7 +535,7 @@ public class MQTTService extends Service {
                     sendLog("");
                 }
             }catch (Exception e){
-
+                LoggerUtil.e(TAG, "生成日志失败", e);
             }
         }else if(closeMqttBean.getType().equals("device-edit")){
             //设备信息编辑

app/src/main/java/qianmu/container/service/ContainerService.java

@@ -406,7 +406,7 @@ public class ContainerService extends Service {
                 EventBus.getDefault().post(new MessageEvent(Constant.ACTION_UPDATE_WEBVIEW));//通知webview刷新
             }
         }catch (Exception e){
-
+            LoggerUtil.e("h5Update","更新H5失败",e);
         }
     }
 

app/src/main/java/qianmu/container/service/MusicService.java

@@ -96,7 +96,7 @@ public class MusicService extends Service {
             mPlayer.setDataSource(file.getPath()); //指定音频文件的路径
             mPlayer.prepareAsync(); //让MediaPlayer进入到准备状态
         }catch (Exception e){
-
+            Log.e("TAG","播放音乐失败",e);
         }
     }
 

app/src/main/java/qianmu/container/util/DeviceDataUtil.java

@@ -63,6 +63,7 @@ public class DeviceDataUtil {
                 return null;
             }
         }catch (Exception e){
+            LoggerUtil.e("DeviceDataUtil","读取txt文件失败",e);
             return null;
         }
     }
@@ -116,6 +117,7 @@ public class DeviceDataUtil {
                 DeviceData.saveDeviceInfo(DeviceData.DOWNLOAD_IP,deviceBean.getDownload_ip());
             }
         }catch (Exception e){
+            LoggerUtil.e("DeviceDataUtil","读取txt文本device数据失败",e);
         }
     }
 }

app/src/main/java/qianmu/container/util/SignWayUtil.java

@@ -330,7 +330,9 @@ public class SignWayUtil {
                 zcApi.setPowetOnOffTime(false,timeonArray,timeoffArray);
             }
 
-        }catch (Exception e){}
+        }catch (Exception e){
+            LoggerUtil.e("clearPowerOnOffTime", StringUtil.getThrowableStr(e));
+        }
     }
 
     //截屏