Browse Source

fix: ci

master
高志龙 7 months ago
parent
commit
7011dd233f
  1. 4
      app/src/main/java/qianmu/container/app/Constant.java
  2. 1
      app/src/main/java/qianmu/container/app/MyApplication.java
  3. 2
      app/src/main/java/qianmu/container/mqtt/MQTTService.java

4
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(卓策主板——王府井喜悦、杨浦中心医院)

1
app/src/main/java/qianmu/container/app/MyApplication.java

@ -76,7 +76,6 @@ public class MyApplication extends Application {
}
@Override
public void onCreate() {
super.onCreate();

2
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;
}

Loading…
Cancel
Save