Commit c4142127 authored by jianglx's avatar jianglx

旅游详情页面恢复2019-8-19日晚上

parent a741e884
...@@ -5,14 +5,12 @@ import android.content.ClipData; ...@@ -5,14 +5,12 @@ import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.net.http.SslError;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.webkit.JavascriptInterface; import android.webkit.JavascriptInterface;
import android.webkit.SslErrorHandler;
import android.webkit.WebChromeClient; import android.webkit.WebChromeClient;
import android.webkit.WebResourceRequest; import android.webkit.WebResourceRequest;
import android.webkit.WebSettings; import android.webkit.WebSettings;
...@@ -161,7 +159,6 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> { ...@@ -161,7 +159,6 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
// webSettings.setSavePassword(false); // webSettings.setSavePassword(false);
// 支持缩放 // 支持缩放
webSettings.setSupportZoom(true); webSettings.setSupportZoom(true);
// 设置 UserAgent 属性 // 设置 UserAgent 属性
webSettings.setUserAgentString(""); webSettings.setUserAgentString("");
// 允许加载本地 html 文件/false // 允许加载本地 html 文件/false
...@@ -172,24 +169,12 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> { ...@@ -172,24 +169,12 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
// Android 4.1 之前默认是true,在 Android 4.1 及以后默认是false,也就是禁止 // Android 4.1 之前默认是true,在 Android 4.1 及以后默认是false,也就是禁止
// 如果此设置是允许,则 setAllowFileAccessFromFileURLs 不起做用 // 如果此设置是允许,则 setAllowFileAccessFromFileURLs 不起做用
webSettings.setAllowUniversalAccessFromFileURLs(true); webSettings.setAllowUniversalAccessFromFileURLs(true);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
}
mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs"); mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
mWebView.setWebViewClient(new WebViewClient() { mWebView.setWebViewClient(new WebViewClient() {
@Override @Override
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) { public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
return super.shouldOverrideUrlLoading(view, request); return super.shouldOverrideUrlLoading(view, request);
} }
@Override
public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
// super.onReceivedSslError(view, handler, error);
handler.proceed();
}
}); });
mWebView.loadUrl(webUrl); mWebView.loadUrl(webUrl);
mWebView.setWebChromeClient(new WebChromeClient() { mWebView.setWebChromeClient(new WebChromeClient() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment