From dc0ba9a9f35bd434ae740900320ddfd3802d4045 Mon Sep 17 00:00:00 2001 From: gaozl Date: Thu, 18 Dec 2025 10:40:41 +0800 Subject: [PATCH] fix: ci --- app/src/main/AndroidManifest.xml | 1 + .../container/activity/H5/WebViewActivity.java | 14 +++++++++++--- .../main/java/qianmu/container/app/Constant.java | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 05b11ef..6da719b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -99,6 +99,7 @@ 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 15562e4..e44dba7 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -16,6 +16,7 @@ import android.view.KeyEvent; import android.view.View; import android.view.WindowManager; import android.webkit.ConsoleMessage; +import android.webkit.CookieManager; import android.webkit.JavascriptInterface; import android.webkit.WebChromeClient; import android.webkit.WebResourceRequest; @@ -97,8 +98,8 @@ public class WebViewActivity extends BaseActivity { static final int TYPE_HINT_PASSWORD = 3;//隐藏密码输入框 static final int TYPE_START_SERVER = 4;//重新启动web服务 static final int TYPE_SHENG_HTML_MAG = 5;//返回接口请求值给h5 - static String HtmlUrl = "http://127.0.0.1:8080/index.html";//webServer服务地址 - //static String HtmlUrl = "http://192.168.0.109:5173/"; + //static String HtmlUrl = "http://127.0.0.1:8080/index.html";//webServer服务地址 + static String HtmlUrl = "http://192.168.1.196:5501/index.html"; int time = 0; String interfaceRequestData=""; // 语音听写对象 @@ -197,7 +198,12 @@ public class WebViewActivity extends BaseActivity { webSettings.setBuiltInZoomControls(false); webSettings.setDisplayZoomControls(false); webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE); + // 启用 WebGL（关键设置） + webSettings.setDomStorageEnabled(true); + webSettings.setDatabaseEnabled(true); + webSettings.setAllowContentAccess(true); webSettings.setAllowFileAccess(true); + webSettings.setJavaScriptCanOpenWindowsAutomatically(true); webSettings.setLoadsImagesAutomatically(true); webSettings.setDefaultTextEncodingName("utf-8"); @@ -206,7 +212,9 @@ public class WebViewActivity extends BaseActivity { // 适配HTTPS/HTTP混合内容 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE); + //webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE); + webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); + CookieManager.getInstance().setAcceptThirdPartyCookies(binding.web, true); } //加载web diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 7b2dba6..3e436a5 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -24,10 +24,10 @@ public class Constant { 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 = "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（灰度主板） 罗湖寻车机