diff --git a/app/build.gradle b/app/build.gradle index e3dd35d38..6128e1a26 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -126,7 +126,8 @@ android { buildTypes { release { - buildConfigField "String", "BASE_URL", "\"https://api.lecheng163.com/\"" +// buildConfigField "String", "BASE_URL", "\"https://api.lecheng163.com/\"" + buildConfigField "String", "BASE_URL", "\"https://beta.api.pekolive.com/\"" buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" buildConfigField "String", "BASE_URL_STAGING", "BASE_URL" buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL" diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java index 4ec23bd92..b355285b2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.ui.webview; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Activity; -import android.app.AlertDialog; import android.content.ActivityNotFoundException; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.net.http.SslError; @@ -27,6 +27,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.LayoutRes; +import androidx.appcompat.app.AlertDialog; import com.google.gson.Gson; import com.netease.nim.uikit.StatusBarUtil; @@ -296,10 +297,25 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O @Override public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { -// super.onReceivedSslError(view, handler, error); //一定要去掉 - // handler.cancel();// Android默认的处理方式 - handler.proceed();// 接受所有网站的证书 - // handleMessage(Message msg);// 进行其他处理 + // super.onReceivedSslError(view, handler, error); + androidx.appcompat.app.AlertDialog.Builder builder = new androidx.appcompat.app.AlertDialog.Builder(view.getContext()); + builder.setMessage("SSL认证失败,是否继续访问?"); + builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + handler.proceed();// 接受https所有网站的证书 + } + }); + + builder.setNegativeButton("取消", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + handler.cancel(); + } + }); + + AlertDialog dialog = builder.create(); + dialog.show(); } @Override diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewFragment.java b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewFragment.java index aa2afb35c..4bb3c644d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewFragment.java @@ -1,5 +1,6 @@ package com.yizhuan.erban.ui.webview; +import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.net.http.SslError; @@ -10,6 +11,8 @@ import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; +import androidx.appcompat.app.AlertDialog; + import com.orhanobut.logger.Logger; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseBindingFragment; @@ -73,10 +76,25 @@ public class CommonWebViewFragment extends BaseBindingFragment