瀏覽代碼

优化代码

Pq 4 月之前
父節點
當前提交
d1d757ed42

+ 22 - 0
student/src/main/java/com/cooleshow/student/ui/main/MallFragment.java

@@ -11,6 +11,7 @@ import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.Uri;
+import android.net.http.SslError;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -20,7 +21,9 @@ import android.util.Base64;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.ClientCertRequest;
 import android.webkit.GeolocationPermissions;
+import android.webkit.SslErrorHandler;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceError;
@@ -45,6 +48,7 @@ import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.constanst.ErrorConstants;
 import com.cooleshow.base.constanst.ErrorType;
+import com.cooleshow.base.data.auth.Https;
 import com.cooleshow.base.data.net.RetrofitClientNoToken;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.AppUtils;
@@ -894,6 +898,24 @@ public class MallFragment extends BaseMVPFragment<FragmentMallBinding, ShopMallP
                 }
             }
         }
+
+        @Override
+        public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+            LOG.i("onReceivedSslError:");
+            if (error != null) {
+                LOG.i("onReceivedSslError:" + error.getUrl());
+                LOG.i("onReceivedSslError:" + error.getPrimaryError());
+                LOG.i("onReceivedSslError:" + error.getCertificate());
+            }
+        }
+
+        @Override
+        public void onReceivedClientCertRequest(WebView view, ClientCertRequest request) {
+            LOG.i("onReceivedClientCertRequest");
+            Https.proceed(getContext().getApplicationContext(), request);
+//            request.proceed(Https.getSSLCertifcation(HtmlActivity.this.getApplicationContext()), null);
+
+        }
     }
 
 

+ 23 - 0
teacher/src/main/java/com/cooleshow/teacher/ui/main/MallFragment.java

@@ -11,6 +11,7 @@ import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.Uri;
+import android.net.http.SslError;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -20,7 +21,9 @@ import android.util.Base64;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.ClientCertRequest;
 import android.webkit.GeolocationPermissions;
+import android.webkit.SslErrorHandler;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceError;
@@ -46,6 +49,7 @@ import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.constanst.ErrorConstants;
 import com.cooleshow.base.constanst.ErrorType;
 import com.cooleshow.base.constanst.StyleConfig;
+import com.cooleshow.base.data.auth.Https;
 import com.cooleshow.base.data.net.RetrofitClientNoToken;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.AppUtils;
@@ -68,6 +72,7 @@ import com.cooleshow.teacher.bean.weixinpay.WeixinPayInfo;
 import com.cooleshow.teacher.databinding.FragmentMallBinding;
 import com.cooleshow.teacher.presenter.main.ShopMallPresenter;
 import com.cooleshow.base.utils.MyFileUtils;
+import com.cooleshow.teacher.ui.web.HtmlActivity;
 import com.cooleshow.teacher.widgets.LollipopFixedWebView;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceUtils;
 import com.cooleshow.usercenter.helper.UserHelper;
@@ -900,6 +905,24 @@ public class MallFragment extends BaseMVPFragment<FragmentMallBinding, ShopMallP
                 }
             }
         }
+
+        @Override
+        public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+            LOG.i("onReceivedSslError:");
+            if (error != null) {
+                LOG.i("onReceivedSslError:" + error.getUrl());
+                LOG.i("onReceivedSslError:" + error.getPrimaryError());
+                LOG.i("onReceivedSslError:" + error.getCertificate());
+            }
+        }
+
+        @Override
+        public void onReceivedClientCertRequest(WebView view, ClientCertRequest request) {
+            LOG.i("onReceivedClientCertRequest");
+            Https.proceed(getContext().getApplicationContext(), request);
+//            request.proceed(Https.getSSLCertifcation(HtmlActivity.this.getApplicationContext()), null);
+
+        }
     }