Browse Source

fix: 11

master
高志龙 9 months ago
parent
commit
3629c09f2b
  1. 2
      app/build.gradle
  2. BIN
      app/release/app_andorid14_V2_亿晟3576iot分屏容器_V2.0.7.30.apk
  3. BIN
      app/release/app_andorid_V2_亿晟3576iot分屏容器_V2.0.7.31.apk
  4. 18
      app/release/output-metadata.json
  5. 2
      app/src/main/AndroidManifest.xml
  6. 4
      app/src/main/java/qianmu/container/app/Constant.java
  7. 12
      app/src/main/java/qianmu/container/app/MyApplication.java

2
app/build.gradle

@ -17,7 +17,7 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
ndk { abiFilters "armeabi-v7a", "arm64-v8a" }
ndk { abiFilters "armeabi-v7a" }
javaCompileOptions {
annotationProcessorOptions {

BIN
app/release/app_andorid_V2_亿晟3576iot分屏容器_V2.0.7.30.apk → app/release/app_andorid14_V2_亿晟3576iot分屏容器_V2.0.7.30.apk

Binary file not shown.

BIN
app/release/app_andorid_V2_亿晟3576iot分屏容器_V2.0.7.31.apk

Binary file not shown.

18
app/release/output-metadata.json

@ -0,0 +1,18 @@
{
"version": 2,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "qianmu.container",
"variantName": "processReleaseResources",
"elements": [
{
"type": "SINGLE",
"filters": [],
"versionCode": 6,
"versionName": "V2.0.7.30",
"outputFile": "app-release.apk"
}
]
}

2
app/src/main/AndroidManifest.xml

@ -57,7 +57,7 @@
android:largeHeap="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:networkSecurityConfig="@xml/network_security_config"
android:usesCleartextTraffic="true"
android:theme="@style/AppTheme">
<provider

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

@ -23,10 +23,10 @@ public class Constant {
public static boolean newGuide = false; // 指路机类型,true:新版指路机 false:老板指路机(流花)
public static String mqttState = ""; // 屏幕连接方式
// 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 = "zc"; //设备板子型号 zc(卓策主板——王府井喜悦、杨浦中心医院)
// public static String androidBoardType = "sx"; //设备板子型号 sx(视想)
// public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED
// public static String androidBoardType = "huidu"; //设备板子型号 huidu(灰度主板) 罗湖寻车机

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

@ -118,17 +118,18 @@ public class MyApplication extends Application {
try {
int currentApiVersion = android.os.Build.VERSION.SDK_INT;
OkHttpClient client;
//3576 http 协议
if (currentApiVersion <= 32) {
// 当前系统版本是Android 12
OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.readTimeout(5, TimeUnit.SECONDS);
builder.writeTimeout(5, TimeUnit.SECONDS);
builder.connectTimeout(5, TimeUnit.SECONDS);
builder.readTimeout(10, TimeUnit.SECONDS);
builder.writeTimeout(10, TimeUnit.SECONDS);
builder.connectTimeout(10, TimeUnit.SECONDS);
builder.sslSocketFactory(SSLSocketClient.getSSLSocketFactory());// 过滤https证书
builder.hostnameVerifier(SSLSocketClient.getHostnameVerifier());
client = builder.build();
} else {
// 当前系统版本是Android 14
// 当前系统版本是Android 14
client = createOkHttpClient(this);
}
OkGo.getInstance().init(this).setOkHttpClient(client).setRetryCount(0);
@ -159,6 +160,9 @@ public class MyApplication extends Application {
javax.net.ssl.SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
// 4. 配置 OkHttpClient
return new OkHttpClient.Builder()
.readTimeout(10, TimeUnit.SECONDS)
.writeTimeout(10, TimeUnit.SECONDS)
.connectTimeout(10, TimeUnit.SECONDS)
.sslSocketFactory(sslSocketFactory, trustManager) // 同时传入 TrustManager
.build();
} catch (Exception e) {

Loading…
Cancel
Save