From 9b6ff40159c342edfd4a5e90c14bb3d7a3293317 Mon Sep 17 00:00:00 2001 From: gaozl Date: Fri, 15 May 2026 18:33:30 +0800 Subject: [PATCH] fix: ci --- app/build.gradle | 2 +- .../container/activity/program/MyPresentation.java | 7 +++---- .../container/activity/program/ViewScreenSaver.java | 1 - app/src/main/java/qianmu/container/app/Constant.java | 4 ++-- .../java/qianmu/container/app/MyApplication.java | 12 ++++++------ .../qianmu/container/http/retrofit/RetrofitUtil.java | 2 +- .../main/java/qianmu/container/mqtt/MQTTService.java | 8 ++++---- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c7cb55f..47f0fbd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 24 targetSdkVersion 30 versionCode 6 - versionName "V2.0.8.26" + versionName "V2.0.8.27" // 2.0.8.2 修改网络连接证书设置、定时开关机设置 // 2.0.8.3 获取mac修改 // V2.0.8.5 同屏优化 diff --git a/app/src/main/java/qianmu/container/activity/program/MyPresentation.java b/app/src/main/java/qianmu/container/activity/program/MyPresentation.java index 36a6edc..07d4840 100644 --- a/app/src/main/java/qianmu/container/activity/program/MyPresentation.java +++ b/app/src/main/java/qianmu/container/activity/program/MyPresentation.java @@ -1146,11 +1146,10 @@ class MyPresentation extends Presentation { break; + // case TYPE_TIME_UPDATE_DATA://定时获取数据，有变化则更新 + // handler.sendEmptyMessageDelayed(TYPE_TIME_UPDATE_DATA,5*60*1000); - case TYPE_TIME_UPDATE_DATA://定时获取数据，有变化则更新 - handler.sendEmptyMessageDelayed(TYPE_TIME_UPDATE_DATA,5*60*1000); - - break; + // break; case TYPE_UPDATE_WEATHER0://天气更新 try { 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 3f1d194..7e923e7 100644 --- a/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java +++ b/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java @@ -1150,7 +1150,6 @@ public class ViewScreenSaver extends ViewBase { break; - case TYPE_TIME_UPDATE_DATA://定时获取数据，有变化则更新 handler.sendEmptyMessageDelayed(TYPE_TIME_UPDATE_DATA,600*1000); getProgData(true); diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index acb2870..96b84eb 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -24,7 +24,7 @@ public class Constant { public static String TTSHome="sbc"; // sbc-思必驰 kdxf-科大讯飞 (有语音的项目需要配置） // public static String androidBoardType = ""; //设备板子型号 无固定版 // public static String androidBoardType = "ys"; // 设备板子型号 ys（亿晟） 北京颐堤港定制touch - // public static String androidBoardType = "xwst"; //设备板子型号 xwst（欣威视通3399） + 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（视想） @@ -33,7 +33,7 @@ public class Constant { // public static String androidBoardType = "bv"; //设备板子型号 Bv-3588M // public static String androidBoardType = "smt"; //设备板子型号 视美泰 // public static String androidBoardType = "ctf"; //创泰丰 - public static String androidBoardType = "tcl"; //TCL 982 + // public static String androidBoardType = "tcl"; //TCL 982 public static final String VOID_STOP = "void_stop";// public static final String VOID_ERROR = "void_error"; diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java index 8af7370..bd1e67c 100644 --- a/app/src/main/java/qianmu/container/app/MyApplication.java +++ b/app/src/main/java/qianmu/container/app/MyApplication.java @@ -205,9 +205,9 @@ public class MyApplication extends Application { sslContext.init(null, trustAllCerts, new SecureRandom()); OkHttpClient.Builder builder = new OkHttpClient.Builder(); - builder.readTimeout(10, TimeUnit.SECONDS); - builder.writeTimeout(10, TimeUnit.SECONDS); - builder.connectTimeout(10, TimeUnit.SECONDS); + builder.readTimeout(30, TimeUnit.SECONDS); + builder.writeTimeout(30, TimeUnit.SECONDS); + builder.connectTimeout(30, TimeUnit.SECONDS); builder.sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0]); builder.hostnameVerifier(SSLSocketClient.getHostnameVerifier()); OkHttpClient client = builder.build(); @@ -215,9 +215,9 @@ public class MyApplication extends Application { } catch (Throwable t) { LoggerUtil.e("initOkGo", StringUtil.getThrowableStr(t)); OkHttpClient.Builder builder = new OkHttpClient.Builder(); - builder.readTimeout(10, TimeUnit.SECONDS); - builder.writeTimeout(10, TimeUnit.SECONDS); - builder.connectTimeout(10, TimeUnit.SECONDS); + builder.readTimeout(30, TimeUnit.SECONDS); + builder.writeTimeout(30, TimeUnit.SECONDS); + builder.connectTimeout(30, TimeUnit.SECONDS); //builder.sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager()); builder.hostnameVerifier(SSLSocketClient.getHostnameVerifier()); OkHttpClient client = builder.build(); diff --git a/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java b/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java index 59ef500..25b3ea1 100644 --- a/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java +++ b/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java @@ -30,7 +30,7 @@ public class RetrofitUtil { private static OkHttpClient initOkHttpClient() { - return initOkHttpClient(20); + return initOkHttpClient(40); } private static OkHttpClient initOkHttpClient(int timeout) { diff --git a/app/src/main/java/qianmu/container/mqtt/MQTTService.java b/app/src/main/java/qianmu/container/mqtt/MQTTService.java index b05f1d3..630bae6 100644 --- a/app/src/main/java/qianmu/container/mqtt/MQTTService.java +++ b/app/src/main/java/qianmu/container/mqtt/MQTTService.java @@ -686,9 +686,9 @@ public class MQTTService extends Service { } else if (!"".equals(Constant.androidBoardType)) { SignWayUtil.takeScreenshot(path); int retryCount = 0; - final int MAX_RETRY = 15; - final long SLEEP_MS = 300; - long lastSize = 0; + final int MAX_RETRY = 16; + final long SLEEP_MS = 1000; + long lastSize = -1; while (retryCount < MAX_RETRY) { File f = new File(path); if (f.exists()) { @@ -702,12 +702,12 @@ public class MQTTService extends Service { } lastSize = currentSize; } + retryCount++; try { Thread.sleep(SLEEP_MS); } catch (InterruptedException e) { break; } - retryCount++; } } else { LoggerUtil.e("screenShot", "root截屏");