From 55fe6cfc8ebdf393676a0a06cee526daa2e718f6 Mon Sep 17 00:00:00 2001
From: gaozl <gaozl@1000mu.com>
Date: Fri, 19 Dec 2025 14:00:08 +0800
Subject: [PATCH] fix: ci

---
 .../container/activity/H5/WebViewActivity.java   | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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 e0608d9..1f94cc7 100644
--- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java
+++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java
@@ -1,6 +1,7 @@
 package qianmu.container.activity.H5;
 
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
@@ -209,17 +210,13 @@ public class WebViewActivity extends BaseActivity {
         webSettings.setDefaultTextEncodingName("utf-8");
         webSettings.setUserAgentString("");
         webSettings.setMediaPlaybackRequiresUserGesture(false); // 允许自动播放
-        //webSettings.setAllowFileAccessFromFileURLs(true);
-        //webSettings.setAllowUniversalAccessFromFileURLs(true);
 
         // 启用硬件加速
         binding.web.setLayerType(View.LAYER_TYPE_HARDWARE, null);
 
         // 适配HTTPS/HTTP混合内容
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            //webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
-            webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
-            CookieManager.getInstance().setAcceptThirdPartyCookies(binding.web, true);
+            webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
         }
 
         //加载web
@@ -238,7 +235,16 @@ public class WebViewActivity extends BaseActivity {
             }
 
             @Override
+            @TargetApi(Build.VERSION_CODES.N)
             public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                String url = request.getUrl().toString();
+                view.loadUrl(url);
+                return true; // 表示已处理，WebView 不执行默认操作
+            }
+            // 兼容旧版本的回调方法
+            @Override
+            @SuppressWarnings("deprecation")
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 view.loadUrl(url);
                 return true;
             }