From 7011dd233f4d437d3e3e00d35510e8e1410e2882 Mon Sep 17 00:00:00 2001 From: gaozl Date: Mon, 24 Nov 2025 14:36:20 +0800 Subject: [PATCH] fix: ci --- app/src/main/java/qianmu/container/app/Constant.java | 4 ++-- app/src/main/java/qianmu/container/app/MyApplication.java | 1 - app/src/main/java/qianmu/container/mqtt/MQTTService.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 82253df..7b2dba6 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -23,8 +23,8 @@ public class Constant { public static boolean newGuide = false; // 指路机类型,true:新版指路机 false:老板指路机(流花) 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 = ""; //设备板子型号 无固定版 + 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(卓策主板——王府井喜悦、杨浦中心医院) diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java index c4f1330..04cff04 100644 --- a/app/src/main/java/qianmu/container/app/MyApplication.java +++ b/app/src/main/java/qianmu/container/app/MyApplication.java @@ -76,7 +76,6 @@ public class MyApplication extends Application { } - @Override public void onCreate() { super.onCreate(); diff --git a/app/src/main/java/qianmu/container/mqtt/MQTTService.java b/app/src/main/java/qianmu/container/mqtt/MQTTService.java index fd3b0e1..5aec978 100644 --- a/app/src/main/java/qianmu/container/mqtt/MQTTService.java +++ b/app/src/main/java/qianmu/container/mqtt/MQTTService.java @@ -685,7 +685,7 @@ public class MQTTService extends Service { }); } - if (!screenshotFuture.get(10, TimeUnit.SECONDS)) { // 添加超时时间 + if (!screenshotFuture.get(12, TimeUnit.SECONDS)) { // 添加超时时间 LoggerUtil.e("screenShot","截屏失败"); return; }