From 9db4b16e24690c21071a9ecfd691cb7e1a0acfb0 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Tue, 23 Jul 2024 15:59:00 +0800
Subject: [PATCH] =?UTF-8?q?https=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/web/WebActivity.java                   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/web/WebActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/web/WebActivity.java
index d09b065..b841b0a 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/web/WebActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/web/WebActivity.java
@@ -5,9 +5,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.net.http.SslError;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.webkit.JavascriptInterface;
+import android.webkit.SslErrorHandler;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -81,6 +84,11 @@ public class WebActivity extends BaseActivity {
         webSettings.setJavaScriptEnabled(true);
         webSettings.setDomStorageEnabled(true);
         webSettings.setDefaultTextEncodingName("utf-8");
+        // 特别注意：5.1以上默认禁止了https和http混用，以下方式是开启
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+
         wv.addJavascriptInterface(new JavaScriptObject(con), "webObj");
         //PaxWebChromeClient chromeClient=new PaxWebChromeClient();
         //WebView加载web资源
@@ -111,6 +119,12 @@ public class WebActivity extends BaseActivity {
                 wv.loadUrl(url);
                 return  true;
             }
+
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+                super.onReceivedSslError(view, handler, error);
+                handler.proceed();
+            }
         });
         wv.setWebChromeClient(chromeClient);
         wv.loadUrl(url);
@@ -149,6 +163,12 @@ public class WebActivity extends BaseActivity {
                 view.loadUrl(url);
                 return true;
             }
+
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+                super.onReceivedSslError(view, handler, error);
+                handler.proceed();
+            }
         });
     }