Browse Source

fix: ci

master
高志龙 4 weeks ago
parent
commit
9b6ff40159
  1. 2
      app/build.gradle
  2. 7
      app/src/main/java/qianmu/container/activity/program/MyPresentation.java
  3. 1
      app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java
  4. 4
      app/src/main/java/qianmu/container/app/Constant.java
  5. 12
      app/src/main/java/qianmu/container/app/MyApplication.java
  6. 2
      app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java
  7. 8
      app/src/main/java/qianmu/container/mqtt/MQTTService.java

2
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

7
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 {

1
app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java

@ -1150,7 +1150,6 @@ public class ViewScreenSaver extends ViewBase<ViewScreenSaverBinding> {
break;
case TYPE_TIME_UPDATE_DATA://定时获取数据,有变化则更新
handler.sendEmptyMessageDelayed(TYPE_TIME_UPDATE_DATA,600*1000);
getProgData(true);

4
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";

12
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();

2
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) {

8
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截屏");

Loading…
Cancel
Save