From 381ebd0dddc88bb4dafb9e92958a83772152216c Mon Sep 17 00:00:00 2001 From: gaozl Date: Fri, 17 Oct 2025 13:20:52 +0800 Subject: [PATCH] fix: ci --- app/build.gradle | 2 +- .../activity/H5/InternalWebsite.java | 1 + .../activity/H5/WebViewActivity.java | 25 ++++++++++++++++++- .../java/qianmu/container/app/Constant.java | 4 +-- .../qianmu/container/app/MyApplication.java | 14 +++++------ 5 files changed, 35 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a0dec4d..801e30c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.7.30" + versionName "V2.0.7.33" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' diff --git a/app/src/main/java/qianmu/container/activity/H5/InternalWebsite.java b/app/src/main/java/qianmu/container/activity/H5/InternalWebsite.java index 60a9771..4b6b107 100644 --- a/app/src/main/java/qianmu/container/activity/H5/InternalWebsite.java +++ b/app/src/main/java/qianmu/container/activity/H5/InternalWebsite.java @@ -17,5 +17,6 @@ public class InternalWebsite extends StorageWebsite { public InternalWebsite() { super("/mnt/sdcard/QMContainer/dist"); } + } diff --git a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java index 8c8aa35..bf95006 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.app.ActivityManager; import android.content.Context; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.os.Debug; import android.os.Handler; @@ -16,6 +17,8 @@ import android.view.WindowManager; import android.webkit.ConsoleMessage; import android.webkit.JavascriptInterface; import android.webkit.WebChromeClient; +import android.webkit.WebResourceRequest; +import android.webkit.WebResourceResponse; import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; @@ -42,6 +45,8 @@ import com.shockman.sm.vendor.TargetVo; import org.greenrobot.eventbus.EventBus; import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.List; import java.util.Scanner; @@ -216,12 +221,30 @@ public class WebViewActivity extends BaseActivity { @Override protected void setListener() { binding.web.setWebViewClient(new WebViewClient() { + @Override + public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) { + Uri uri = request.getUrl(); + if (uri.toString().endsWith(".js")) { // 拦截 JS 文件请求 + try { + // 读取本地 JS 文件（以 assets 为例） + InputStream is = getAssets().open(uri.getPath().substring(1)); // 处理路径 + // 设置正确的 MIME 类型 + return new WebResourceResponse( + "text/javascript", // MIME 类型 + "UTF-8", // 编码 + is + ); + } catch (IOException e) { + e.printStackTrace(); + } + } + return super.shouldInterceptRequest(view, request); + } @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { view.loadUrl(url); return true; } - }); binding.web.setOnLongClickListener((View v) -> { diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index d072e21..4e4ec0e 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -28,9 +28,9 @@ public class Constant { // public static String androidBoardType = "xwst2"; //设备板子型号 xwst2（欣威视通3588、T982、3576） // public static String androidBoardType = "zc"; //设备板子型号 zc（卓策主板——王府井喜悦、杨浦中心医院） // public static String androidBoardType = "sx"; //设备板子型号 sx（视想） - public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED + // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED // public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机 - // public static String androidBoardType = "bv"; //设备板子型号 Bv-3588M + public static String androidBoardType = "bv"; //设备板子型号 Bv-3588M // public static String androidBoardType = "smt"; //设备板子型号 视美泰 public static String whoActivity = ""; // 哪个activity页面 diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java index ea50b7b..c919ce8 100644 --- a/app/src/main/java/qianmu/container/app/MyApplication.java +++ b/app/src/main/java/qianmu/container/app/MyApplication.java @@ -120,19 +120,19 @@ public class MyApplication extends Application { int currentApiVersion = android.os.Build.VERSION.SDK_INT; OkHttpClient client; //3576 http 协议 - //if (currentApiVersion <= 30) { + if (currentApiVersion <= 34) { // 当前系统版本是Android 12 OkHttpClient.Builder builder = new OkHttpClient.Builder(); builder.readTimeout(10, TimeUnit.SECONDS); builder.writeTimeout(10, TimeUnit.SECONDS); builder.connectTimeout(10, TimeUnit.SECONDS); - // builder.sslSocketFactory(SSLSocketClient.getSSLSocketFactory());// 过滤https证书 - // builder.hostnameVerifier(SSLSocketClient.getHostnameVerifier()); + builder.sslSocketFactory(SSLSocketClient.getSSLSocketFactory());// 过滤https证书 + builder.hostnameVerifier(SSLSocketClient.getHostnameVerifier()); client = builder.build(); -// } else { -// // 当前系统版本是Android 14 -// client = createOkHttpClient(this); -// } + } else { + // 当前系统版本是Android 14 + client = createOkHttpClient(this); + } OkGo.getInstance().init(this).setOkHttpClient(client).setRetryCount(0); } catch (Throwable t) { LoggerUtil.e("initOkGo", StringUtil.getThrowableStr(t));