From f680396dab3af88b31e01ccf936bf49595026121 Mon Sep 17 00:00:00 2001
From: sufulu <1760473022@qq.com>
Date: Wed, 16 May 2018 16:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=85=A5js=E5=92=8C=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?js=E6=96=B9=E6=B3=95=E5=AE=8C=E6=88=90=20=E4=BB=A5=E5=8F=8Awebv?=
 =?UTF-8?q?iew=E7=9A=84=E5=AE=89=E5=85=A8=E6=BC=8F=E6=B4=9E=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   8 ++
 .idea/misc.xml                                |  67 ----------
 README.md                                     |   3 +-
 app/proguard-rules.pro                        |   2 +-
 .../main/java/com/prim/web/MainActivity.java  |  48 +++++--
 primweb-core/proguard-rules.pro               |   2 +-
 .../java/com/prim/primweb/core/PrimWeb.java   |  91 +++++++++----
 .../core/client/MyAndroidWebChromeClient.java | 120 ++++++++++++++++++
 .../core/client/MyX5WebChromeClient.java      |  89 +++++++++++++
 .../core/jsinterface/SafeJsInterface.java     |  40 +++++-
 .../core/setting/DefaultWebSetting.java       |   7 +
 .../prim/primweb/core/utils/PrimWebUtils.java |   7 +
 .../primweb/core/webview/IAgentWebView.java   |  10 ++
 .../core/webview/PrimAgentWebView.java        | 112 +++++++++++++---
 .../primweb/core/webview/X5AgentWebView.java  |  40 ++++++
 15 files changed, 523 insertions(+), 123 deletions(-)
 create mode 100644 primweb-core/src/main/java/com/prim/primweb/core/client/MyAndroidWebChromeClient.java
 create mode 100644 primweb-core/src/main/java/com/prim/primweb/core/client/MyX5WebChromeClient.java

diff --git a/.gitignore b/.gitignore
index 39fb081..e54a36f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,17 @@
 *.iml
+*.apk
 .gradle
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
+/.idea/compiler.xml
+/.idea/gradle.xml
+/.idea/runConfigurations.xml
+/.idea/misc.xml
+/.idea/modules.xml
+
 .DS_Store
 /build
 /captures
 .externalNativeBuild
+/.idea/markdown-navigator.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5e16501..3963879 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,72 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="MarkdownProjectSettings">
-    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true">
-      <PanelProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings>
-      <PegdownExtensions>
-        <option name="ABBREVIATIONS" value="false" />
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ASIDE" value="false" />
-        <option name="ATXHEADERSPACE" value="true" />
-        <option name="AUTOLINKS" value="true" />
-        <option name="DEFINITIONS" value="false" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="FOOTNOTES" value="false" />
-        <option name="HARDWRAPS" value="false" />
-        <option name="INSERTED" value="false" />
-        <option name="QUOTES" value="false" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="SMARTS" value="false" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="SUBSCRIPT" value="false" />
-        <option name="SUPERSCRIPT" value="false" />
-        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
-        <option name="SUPPRESS_INLINE_HTML" value="false" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-        <option name="TOC" value="false" />
-        <option name="WIKILINKS" value="true" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="COMMONMARK_LISTS" value="false" />
-        <option name="DUMMY" value="false" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="FLEXMARK_FRONT_MATTER" value="false" />
-        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="true" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="GITBOOK_URL_ENCODING" value="false" />
-        <option name="GITHUB_EMOJI_URL" value="false" />
-        <option name="GITHUB_LISTS" value="true" />
-        <option name="GITHUB_WIKI_LINKS" value="true" />
-        <option name="JEKYLL_FRONT_MATTER" value="false" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-    </CssSettings>
-    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/README.md b/README.md
index d95a389..77cb11b 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,8 @@ PrimWeb primWeb = PrimWeb.with(this)
 ### API 详解
 1. 动态切换X5和Android 的webview
 ```
-
+动态的设置webview的父view
+.setWebParent(frameLayout, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
  public enum WebViewType {
         Android, X5
     }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b4245..ccb9f7f 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in buildWeb.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/main/java/com/prim/web/MainActivity.java b/app/src/main/java/com/prim/web/MainActivity.java
index 2b6464c..87a660e 100644
--- a/app/src/main/java/com/prim/web/MainActivity.java
+++ b/app/src/main/java/com/prim/web/MainActivity.java
@@ -7,8 +7,10 @@
 import android.view.ViewGroup;
 import android.webkit.JavascriptInterface;
 import android.widget.FrameLayout;
+import android.widget.Toast;
 
 import com.prim.primweb.core.PrimWeb;
+import com.prim.primweb.core.client.MyX5WebChromeClient;
 import com.prim.primweb.core.client.WebViewClient;
 import com.prim.primweb.core.webview.IAgentWebView;
 
@@ -18,22 +20,23 @@ public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "MainActivity";
 
+    private PrimWeb primWeb;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         frameLayout = (FrameLayout) findViewById(R.id.fl_web);
-        PrimWeb primWeb = PrimWeb.with(this)
+        primWeb = PrimWeb.with(this)
                 .setWebParent(frameLayout, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
-                .setWebViewType(PrimWeb.WebViewType.Android)
-                .addJavascriptInterface("jsAgent", new MyJavaObject())
+                .setWebViewType(PrimWeb.WebViewType.X5)
                 .setModeType(PrimWeb.ModeType.Normal)
                 .setAgentWebViewClient(new MyWebViewClient(this))
-                .build()
+                .setX5WebChromeClient(new MyX5WebChromeClient())
+                .addJavascriptInterface("nativeBridge", new MyJavaObject())
+                .buildWeb()
                 .ready()
-                .launch("https://blog.csdn.net/yy1300326388/article/details/43965493");
-
-        primWeb.callJsLoader().callJS("jsMethod");
+                .launch("http://front.52yingzheng.com/test/shiluTest/h5-standard/h5-standard.html");
     }
 
     /** 使用代理的WebViewClient */
@@ -53,12 +56,39 @@ public boolean shouldOverrideUrlLoading(IAgentWebView view, String url) {
     public class MyJavaObject {
 
         @JavascriptInterface
-        public void login(String data) {
+        public void closeWebView(String data) {
+            finish();
+        }
+
+        @JavascriptInterface
+        public void signIn(String data) {
+            primWeb.getCallJsLoader().callJS("nativeBridgeCallback['networkRequestCallback']", "'测试调用h5端的Js方法'");
+            Toast.makeText(MainActivity.this, "登录", Toast.LENGTH_LONG).show();
+        }
+
+        @JavascriptInterface
+        public void bindTel(String data) {
+            Toast.makeText(MainActivity.this, "绑定手机号", Toast.LENGTH_LONG).show();
+        }
+
+        @JavascriptInterface
+        public void camera(String data) {
+            Toast.makeText(MainActivity.this, "调取摄像头", Toast.LENGTH_LONG).show();
+        }
 
+        @JavascriptInterface
+        public void photos(String data) {
+            Toast.makeText(MainActivity.this, "调取相册", Toast.LENGTH_LONG).show();
         }
 
-        public void medth() {
+        @JavascriptInterface
+        public void geographicPosition(String data) {
+            Toast.makeText(MainActivity.this, "获取地理位置", Toast.LENGTH_LONG).show();
+        }
 
+        @JavascriptInterface
+        public void copyText(String data) {
+            Toast.makeText(MainActivity.this, "复制文本", Toast.LENGTH_LONG).show();
         }
 
     }
diff --git a/primweb-core/proguard-rules.pro b/primweb-core/proguard-rules.pro
index f1b4245..ccb9f7f 100644
--- a/primweb-core/proguard-rules.pro
+++ b/primweb-core/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in buildWeb.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/primweb-core/src/main/java/com/prim/primweb/core/PrimWeb.java b/primweb-core/src/main/java/com/prim/primweb/core/PrimWeb.java
index f5798be..185c20f 100644
--- a/primweb-core/src/main/java/com/prim/primweb/core/PrimWeb.java
+++ b/primweb-core/src/main/java/com/prim/primweb/core/PrimWeb.java
@@ -43,6 +43,8 @@ public class PrimWeb {
 
     private ICallJsLoader callJsLoader;
 
+    public static boolean DEBUG = false;
+
     private IAgentWebView webView;
     private ViewGroup mViewGroup;
     private ViewGroup.LayoutParams mLayoutParams;
@@ -121,14 +123,15 @@ public static void init(Application application) {
 
     /** webview 安全检查 */
     private void doCheckSafe() {
-        if (null == webView) {
+        if (null == webView) {//webview 不能为空
             webView = new PrimAgentWebView(context.get());
             mView = webView.getAgentWebView();
         }
+        webView.removeRiskJavascriptInterface();
     }
 
-    /** 调用js方法 */
-    public ICallJsLoader callJsLoader() {
+    /** 获取调用js方法 */
+    public ICallJsLoader getCallJsLoader() {
         if (null == webView) {
             throw new NullPointerException("webView most not be null,please check your code!");
         }
@@ -138,7 +141,7 @@ public ICallJsLoader callJsLoader() {
         return callJsLoader;
     }
 
-    /** 注入js脚本 */
+    /** 获取注入js脚本方法 */
     public IJsInterface getJsInterface() {
         if (null == webView) {
             throw new NullPointerException("webView most not be null,please check your code!");
@@ -149,9 +152,8 @@ public IJsInterface getJsInterface() {
         return mJsInterface;
     }
 
-    /** 准备阶段 */
-    void ready() {
-        // 加载设置
+    /** 获取websettings， Object具体的是android webSetting 还是x5 webSetting 自己判断强转*/
+    public Object getWebSettings() {
         if (null == setting) {
             if (webViewType == WebViewType.Android) {
                 setting = new DefaultWebSetting(context.get());
@@ -159,20 +161,35 @@ void ready() {
                 setting = new X5DefaultWebSetting(context.get());
             }
         }
-        setting.setSetting(webView);
+        return setting.getWebSetting();
+    }
 
-        // 加载url加载器
+    /** 获取url加载器 加载URL和刷新url操作 */
+    public IUrlLoader getUrlLoader() {
+        if (null == webView) {
+            throw new NullPointerException("webView most not be null,please check your code!");
+        }
         if (null == urlLoader) {
             urlLoader = new UrlLoader(webView);
         }
+        return urlLoader;
+    }
 
-        // 加载js脚本注入
-        if (null == mJsInterface) {
-            mJsInterface = SafeJsInterface.getInstance(webView, modeType);
+    /** 准备阶段 */
+    void ready() {
+        // 加载webview设置
+        if (null == setting) {
+            if (webViewType == WebViewType.Android) {
+                setting = new DefaultWebSetting(context.get());
+            } else {
+                setting = new X5DefaultWebSetting(context.get());
+            }
         }
+        setting.setSetting(webView);
 
-        if (mJavaObject != null && !mJavaObject.isEmpty()) {
-            mJsInterface.addJavaObjects(mJavaObject);
+        // 加载url加载器
+        if (null == urlLoader) {
+            urlLoader = new UrlLoader(webView);
         }
 
         // 加载webViewClient 系统设置的优先
@@ -191,7 +208,7 @@ void ready() {
             webView.setAgentWebViewClient(agentWebViewClient);
         }
 
-        //加载webChromeClient
+        //加载webChromeClient 系统设置的优先
         if (webChromeClient != null || x5WebChromeClient != null) {
             if (webChromeClient != null) {
                 webView.setAndroidWebChromeClient(webChromeClient);
@@ -199,8 +216,19 @@ void ready() {
             if (x5WebChromeClient != null) {
                 webView.setX5WebChromeClient(x5WebChromeClient);
             }
+        } else {
+            //加载代理的webChromeClient
+
         }
 
+        // 加载js脚本注入
+        if (null == mJsInterface) {
+            mJsInterface = SafeJsInterface.getInstance(webView, modeType);
+        }
+
+        if (mJavaObject != null && !mJavaObject.isEmpty()) {
+            mJsInterface.addJavaObjects(mJavaObject);
+        }
     }
 
     /** 发起阶段 */
@@ -331,12 +359,6 @@ public CommonBuilder setModeType(ModeType modeType) {
             return this;
         }
 
-        /** 注入js */
-        public CommonBuilder addJavascriptInterface(@NonNull String name, @NonNull Object o) {
-            primBuilder.addJavaObject(name, o);
-            return this;
-        }
-
         /** 设置WebView的类型 如果设置了setAgentWebView 此方法最好不要调用 */
         public CommonBuilder setWebViewType(WebViewType webViewType) {
             primBuilder.setWebViewType(webViewType);
@@ -370,12 +392,37 @@ public CommonBuilder setX5WebChromeClient(com.tencent.smtt.sdk.WebChromeClient w
             return this;
         }
 
+        /** 注入js脚本 */
+        public JsInterfaceBuilder addJavascriptInterface(@NonNull String name, @NonNull Object o) {
+            return new JsInterfaceBuilder(primBuilder).addJavascriptInterface(name, o);
+        }
+
         /** 设置完成开始建造 */
-        public PerBuilder build() {
+        public PerBuilder buildWeb() {
             return primBuilder.build();
         }
     }
 
+    public static class JsInterfaceBuilder {
+        private PrimBuilder primBuilder;
+
+        public JsInterfaceBuilder(PrimBuilder primBuilder) {
+            this.primBuilder = primBuilder;
+        }
+
+        /** 注入js脚本 */
+        public JsInterfaceBuilder addJavascriptInterface(@NonNull String name, @NonNull Object o) {
+            primBuilder.addJavaObject(name, o);
+            return this;
+        }
+
+        /** 设置完成开始建造 */
+        public PerBuilder buildWeb() {
+            return primBuilder.build();
+        }
+
+    }
+
     /** 设置完成准备发射 */
     public static class PerBuilder {
         private PrimWeb primWeb;
diff --git a/primweb-core/src/main/java/com/prim/primweb/core/client/MyAndroidWebChromeClient.java b/primweb-core/src/main/java/com/prim/primweb/core/client/MyAndroidWebChromeClient.java
new file mode 100644
index 0000000..a103774
--- /dev/null
+++ b/primweb-core/src/main/java/com/prim/primweb/core/client/MyAndroidWebChromeClient.java
@@ -0,0 +1,120 @@
+package com.prim.primweb.core.client;
+
+import android.net.Uri;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
+import android.view.View;
+import android.webkit.GeolocationPermissions;
+import android.webkit.JsPromptResult;
+import android.webkit.JsResult;
+import android.webkit.ValueCallback;
+import android.webkit.WebChromeClient;
+import android.webkit.WebView;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+
+/**
+ * ================================================
+ * 作    者：linksus
+ * 版    本：1.0
+ * 创建日期：5/16 0016
+ * 描    述：
+ * 修订历史：
+ * ================================================
+ */
+public class MyAndroidWebChromeClient extends WebChromeClient {
+    @Override
+    public void onReceivedTitle(WebView webView, String s) {
+        super.onReceivedTitle(webView, s);
+    }
+
+    @Override
+    public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) {
+        super.onGeolocationPermissionsShowPrompt(origin, callback);
+    }
+
+    @Override
+    public void onGeolocationPermissionsHidePrompt() {
+        super.onGeolocationPermissionsHidePrompt();
+    }
+
+    //  Android < 3.0
+    public void openFileChooser(ValueCallback<Uri> valueCallback) {
+        invokeMethod(this, "openFileChooser", new Object[]{valueCallback}, ValueCallback.class);
+    }
+
+    //  Android  >= 3.0
+    public void openFileChooser(ValueCallback<Uri> valueCallback, String acceptType) {
+        invokeMethod(this, "openFileChooser", new Object[]{valueCallback, acceptType}, ValueCallback.class, String.class);
+    }
+
+    // Android  >= 4.1
+    public void openFileChooser(ValueCallback<Uri> valueCallback, String acceptType, String capture) {
+        invokeMethod(this, "openFileChooser", new Object[]{valueCallback, acceptType, capture}, ValueCallback.class, String.class, String.class);
+    }
+
+    @Override
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> valueCallback, FileChooserParams fileChooserParams) {
+        return super.onShowFileChooser(webView, valueCallback, fileChooserParams);
+    }
+
+    @Override
+    public void onProgressChanged(WebView webView, int i) {
+        super.onProgressChanged(webView, i);
+    }
+
+    @Override
+    public boolean onJsAlert(WebView webView, String s, String s1, JsResult jsResult) {
+        return super.onJsAlert(webView, s, s1, jsResult);
+    }
+
+    @Override
+    public boolean onJsConfirm(WebView webView, String s, String s1, JsResult jsResult) {
+        return super.onJsConfirm(webView, s, s1, jsResult);
+    }
+
+    @Override
+    public boolean onJsPrompt(WebView webView, String s, String s1, String s2, JsPromptResult jsPromptResult) {
+        return super.onJsPrompt(webView, s, s1, s2, jsPromptResult);
+    }
+
+    @Override
+    public boolean onJsBeforeUnload(WebView webView, String s, String s1, JsResult jsResult) {
+        return super.onJsBeforeUnload(webView, s, s1, jsResult);
+    }
+
+    @Override
+    public boolean onJsTimeout() {
+        return super.onJsTimeout();
+    }
+
+    @Override
+    public void onHideCustomView() {
+        super.onHideCustomView();
+    }
+
+    @Override
+    public void onShowCustomView(View view, int requestedOrientation, CustomViewCallback callback) {
+        super.onShowCustomView(view, requestedOrientation, callback);
+    }
+
+    public void invokeMethod(WebChromeClient chromeClient, String method, Object[] os, Class... clz) {
+        if (chromeClient == null) {
+            return;
+        }
+        try {
+            Class<? extends WebChromeClient> aClass = chromeClient.getClass();
+            Method method1 = aClass.getMethod(method, clz);
+            method1.invoke(chromeClient, os);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/primweb-core/src/main/java/com/prim/primweb/core/client/MyX5WebChromeClient.java b/primweb-core/src/main/java/com/prim/primweb/core/client/MyX5WebChromeClient.java
new file mode 100644
index 0000000..c5d809d
--- /dev/null
+++ b/primweb-core/src/main/java/com/prim/primweb/core/client/MyX5WebChromeClient.java
@@ -0,0 +1,89 @@
+package com.prim.primweb.core.client;
+
+import android.net.Uri;
+import android.view.View;
+
+import com.tencent.smtt.export.external.interfaces.GeolocationPermissionsCallback;
+import com.tencent.smtt.export.external.interfaces.IX5WebChromeClient;
+import com.tencent.smtt.export.external.interfaces.JsPromptResult;
+import com.tencent.smtt.export.external.interfaces.JsResult;
+import com.tencent.smtt.sdk.ValueCallback;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebView;
+
+
+/**
+ * ================================================
+ * 作    者：linksus
+ * 版    本：1.0
+ * 创建日期：5/16 0016
+ * 描    述：
+ * 修订历史：
+ * ================================================
+ */
+public class MyX5WebChromeClient extends WebChromeClient {
+    @Override
+    public void onReceivedTitle(WebView webView, String s) {
+        super.onReceivedTitle(webView, s);
+    }
+
+    @Override
+    public void onGeolocationPermissionsShowPrompt(String s, GeolocationPermissionsCallback geolocationPermissionsCallback) {
+        super.onGeolocationPermissionsShowPrompt(s, geolocationPermissionsCallback);
+    }
+
+    @Override
+    public void onGeolocationPermissionsHidePrompt() {
+        super.onGeolocationPermissionsHidePrompt();
+    }
+
+    @Override
+    public void openFileChooser(ValueCallback<Uri> valueCallback, String s, String s1) {
+        super.openFileChooser(valueCallback, s, s1);
+    }
+
+    @Override
+    public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> valueCallback, FileChooserParams fileChooserParams) {
+        return super.onShowFileChooser(webView, valueCallback, fileChooserParams);
+    }
+
+    @Override
+    public void onProgressChanged(WebView webView, int i) {
+        super.onProgressChanged(webView, i);
+    }
+
+    @Override
+    public boolean onJsAlert(WebView webView, String s, String s1, JsResult jsResult) {
+        return super.onJsAlert(webView, s, s1, jsResult);
+    }
+
+    @Override
+    public boolean onJsConfirm(WebView webView, String s, String s1, JsResult jsResult) {
+        return super.onJsConfirm(webView, s, s1, jsResult);
+    }
+
+    @Override
+    public boolean onJsPrompt(WebView webView, String s, String s1, String s2, JsPromptResult jsPromptResult) {
+        return super.onJsPrompt(webView, s, s1, s2, jsPromptResult);
+    }
+
+    @Override
+    public boolean onJsBeforeUnload(WebView webView, String s, String s1, JsResult jsResult) {
+        return super.onJsBeforeUnload(webView, s, s1, jsResult);
+    }
+
+    @Override
+    public boolean onJsTimeout() {
+        return super.onJsTimeout();
+    }
+
+    @Override
+    public void onHideCustomView() {
+        super.onHideCustomView();
+    }
+
+    @Override
+    public void onShowCustomView(View view, int i, IX5WebChromeClient.CustomViewCallback customViewCallback) {
+        super.onShowCustomView(view, i, customViewCallback);
+    }
+}
diff --git a/primweb-core/src/main/java/com/prim/primweb/core/jsinterface/SafeJsInterface.java b/primweb-core/src/main/java/com/prim/primweb/core/jsinterface/SafeJsInterface.java
index 2d02c93..c92d4aa 100644
--- a/primweb-core/src/main/java/com/prim/primweb/core/jsinterface/SafeJsInterface.java
+++ b/primweb-core/src/main/java/com/prim/primweb/core/jsinterface/SafeJsInterface.java
@@ -40,10 +40,10 @@ public IJsInterface addJavaObjects(Map<String, Object> maps) {
         for (Map.Entry<String, Object> entry : entries) {
             Object value = entry.getValue();
             boolean checkJsInterface = checkJsInterface(value);
-            Log.e(TAG, "addJavaObjects: modeType --> " + modeType + "| checkJsInterface --> " + checkJsInterface);
             if (!checkJsInterface) {
                 throw new RuntimeException("This object has not offer method javascript to call ,please check addJavascriptInterface annotation was be added");
             } else {
+                Log.e(TAG, "addJavaObjects: object --> " + value.getClass().getSimpleName() + "| name --> " + entry.getKey());
                 webView.addJavascriptInterfaceAgent(value, entry.getKey());
             }
         }
@@ -60,4 +60,42 @@ public IJsInterface addJavaObject(Object o, String name) {
         }
         return this;
     }
+
+    /**
+     * 构建一个“不会重复注入”的js脚本；
+     *
+     * @param key
+     * @param js
+     *
+     * @return
+     */
+    public String buildNotRepeatInjectJS(String key, String js) {
+        String obj = String.format("__injectFlag_%1$s__", key);
+        StringBuilder sb = new StringBuilder();
+        sb.append("javascript:try{(function(){if(window.");
+        sb.append(obj);
+        sb.append("){console.log('");
+        sb.append(obj);
+        sb.append(" has been injected');return;}window.");
+        sb.append(obj);
+        sb.append("=true;");
+        sb.append(js);
+        sb.append("}())}catch(e){console.warn(e)}");
+        return sb.toString();
+    }
+
+    /**
+     * 构建一个“带try catch”的js脚本；
+     *
+     * @param js
+     *
+     * @return
+     */
+    public String buildTryCatchInjectJS(String js) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("javascript:try{");
+        sb.append(js);
+        sb.append("}catch(e){console.warn(e)}");
+        return sb.toString();
+    }
 }
diff --git a/primweb-core/src/main/java/com/prim/primweb/core/setting/DefaultWebSetting.java b/primweb-core/src/main/java/com/prim/primweb/core/setting/DefaultWebSetting.java
index 37baed8..3f32bd2 100644
--- a/primweb-core/src/main/java/com/prim/primweb/core/setting/DefaultWebSetting.java
+++ b/primweb-core/src/main/java/com/prim/primweb/core/setting/DefaultWebSetting.java
@@ -27,6 +27,7 @@ public DefaultWebSetting(Context context) {
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     protected void toSetting(WebSettings webSetting) {
+
         webSetting.setJavaScriptEnabled(true);
         webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
@@ -42,9 +43,14 @@ protected void toSetting(WebSettings webSetting) {
         } else {
             webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NORMAL);
         }
+        //设置自适应屏幕
         webSetting.setUseWideViewPort(true);
+        // 缩放至屏幕的大小
         webSetting.setLoadWithOverviewMode(true);
+        //设置是否支持缩放，false，默认为true。
         webSetting.setSupportZoom(false);
+        //设置是否显示缩放工具，默认为false
+        webSetting.setBuiltInZoomControls(false);
         //异步加载图片
         webSetting.setLoadsImagesAutomatically(true);
         // 是否阻塞加载网络图片  协议http or https
@@ -59,6 +65,7 @@ protected void toSetting(WebSettings webSetting) {
         webSetting.setAppCachePath(context.getCacheDir().getAbsolutePath() + APP_CACAHE_DIRNAME);
         //设置定位的数据库路径
         webSetting.setGeolocationDatabasePath(context.getCacheDir().getAbsolutePath() + APP_CACAHE_DIRNAME);
+        //false 禁止webview上面控件获取焦点(黄色边框)
         webSetting.setNeedInitialFocus(true);
         webSetting.setDefaultTextEncodingName("utf-8");//设置编码格式
 //        webSetting.setDefaultFontSize(16);
diff --git a/primweb-core/src/main/java/com/prim/primweb/core/utils/PrimWebUtils.java b/primweb-core/src/main/java/com/prim/primweb/core/utils/PrimWebUtils.java
index a8d769e..2de7f5e 100644
--- a/primweb-core/src/main/java/com/prim/primweb/core/utils/PrimWebUtils.java
+++ b/primweb-core/src/main/java/com/prim/primweb/core/utils/PrimWebUtils.java
@@ -10,6 +10,8 @@
 import android.os.Looper;
 import android.text.TextUtils;
 
+import com.prim.primweb.core.PrimWeb;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -44,6 +46,11 @@ public static boolean isJson(String target) {
         return tag;
     }
 
+    public static boolean isDebug() {
+        return PrimWeb.DEBUG;
+    }
+
+
     private static Handler mHandler = new Handler(Looper.getMainLooper());
 
     public static boolean isUIThread() {
diff --git a/primweb-core/src/main/java/com/prim/primweb/core/webview/IAgentWebView.java b/primweb-core/src/main/java/com/prim/primweb/core/webview/IAgentWebView.java
index bc5d1e7..12f1bec 100644
--- a/primweb-core/src/main/java/com/prim/primweb/core/webview/IAgentWebView.java
+++ b/primweb-core/src/main/java/com/prim/primweb/core/webview/IAgentWebView.java
@@ -23,6 +23,16 @@
  */
 public interface IAgentWebView<T, M> {
 
+    /** 移除有风险的 Webview 系统隐藏接口 */
+    void removeRiskJavascriptInterface();
+
+    /**
+     * Android 4.4 KitKat 使用Chrome DevTools 远程调试WebView
+     * WebView.setWebContentsDebuggingEnabled(true);
+     * http://blog.csdn.net/t12x3456/article/details/14225235
+     */
+    void setWebChromeDebuggingEnabled();
+
     /** 获取代理的webview */
     View getAgentWebView();
 
diff --git a/primweb-core/src/main/java/com/prim/primweb/core/webview/PrimAgentWebView.java b/primweb-core/src/main/java/com/prim/primweb/core/webview/PrimAgentWebView.java
index ff44301..1616b42 100644
--- a/primweb-core/src/main/java/com/prim/primweb/core/webview/PrimAgentWebView.java
+++ b/primweb-core/src/main/java/com/prim/primweb/core/webview/PrimAgentWebView.java
@@ -1,28 +1,26 @@
 package com.prim.primweb.core.webview;
 
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.util.AttributeSet;
-import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
-import android.webkit.WebResourceError;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-
 import com.prim.primweb.core.client.IAgentWebViewClient;
 import com.prim.primweb.core.client.MyAndroidWebViewClient;
 import com.prim.primweb.core.jsloader.AgentValueCallback;
+import com.prim.primweb.core.utils.PrimWebUtils;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Map;
 
 
@@ -39,6 +37,7 @@ public class PrimAgentWebView extends WebView implements IAgentWebView<WebSettin
 
     private static final String TAG = "PrimAgentWebView";
     public com.prim.primweb.core.listener.OnScrollChangeListener listener;
+    private IAgentWebViewClient webViewClient;
 
     public PrimAgentWebView(Context context) {
         this(context, null);
@@ -61,6 +60,33 @@ public void setOnScrollChangeListener(com.prim.primweb.core.listener.OnScrollCha
         this.listener = listener;
     }
 
+    @Override
+    public void removeRiskJavascriptInterface() {
+        //显式移除有风险的 Webview 系统隐藏接口
+        this.removeJavascriptInterface("searchBoxJavaBridge_");
+        this.removeJavascriptInterface("accessibility");
+        this.removeJavascriptInterface("accessibilityTraversal");
+    }
+
+    /**
+     * 使用Chrome DevTools 远程调试WebView
+     */
+    @TargetApi(19)
+    @Override
+    public void setWebChromeDebuggingEnabled() {
+        if (PrimWebUtils.isDebug() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            try {
+                Class<?> clazz = WebView.class;
+                Method method = clazz.getMethod("setWebContentsDebuggingEnabled", boolean.class);
+                method.invoke(null, true);
+            } catch (Throwable e) {
+                if (PrimWebUtils.isDebug()) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
     @Override
     public View getAgentWebView() {
         return this;
@@ -76,7 +102,7 @@ public void loadAgentJs(String js) {
         this.loadUrl(js);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+    @TargetApi(Build.VERSION_CODES.KITKAT)
     @Override
     public void loadAgentJs(String js, final AgentValueCallback<String> callback) {
         ValueCallback<String> valueCallback = new ValueCallback<String>() {
@@ -125,12 +151,6 @@ public void loadDataWithBaseURLAgent(String baseUrl, String data, String mimeTyp
         this.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
     }
 
-    @Override
-    public void addJavascriptInterfaceAgent(Object object, String name) {
-        this.addJavascriptInterface(object, name);
-    }
-
-    private IAgentWebViewClient webViewClient;
 
     @Override
     public void setAgentWebViewClient(IAgentWebViewClient webViewClient) {
@@ -163,12 +183,6 @@ public void setX5WebChromeClient(com.tencent.smtt.sdk.WebChromeClient webChromeC
 
     }
 
-    @SuppressLint("JavascriptInterface")
-    @Override
-    public void addJavascriptInterface(Object object, String name) {
-        super.addJavascriptInterface(object, name);
-    }
-
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
@@ -177,12 +191,68 @@ protected void onDetachedFromWindow() {
     @Override
     public void destroy() {
         removeAllViewsInLayout();
+        ViewParent parent = getParent();
+        if (parent instanceof ViewGroup) {//从父容器中移除webview
+            ((ViewGroup) parent).removeAllViewsInLayout();
+        }
+        releaseConfigCallback();
         super.destroy();
     }
 
+    @Override
+    public void clearHistory() {
+        super.clearHistory();
+    }
 
     @Override
     public void setWebViewClient(WebViewClient client) {
         super.setWebViewClient(client);
     }
+
+    @SuppressLint("JavascriptInterface")
+    @Override
+    public void addJavascriptInterfaceAgent(Object object, String name) {
+        this.addJavascriptInterface(object, name);
+    }
+
+    // 解决WebView内存泄漏问题；参考AgentWeb X5 webview 解决了此问题，具体看x5webview源码
+    private void releaseConfigCallback() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) { // JELLY_BEAN
+            try {
+                Field field = WebView.class.getDeclaredField("mWebViewCore");
+                field = field.getType().getDeclaredField("mBrowserFrame");
+                field = field.getType().getDeclaredField("sConfigCallback");
+                field.setAccessible(true);
+                field.set(null, null);
+            } catch (NoSuchFieldException e) {
+                if (PrimWebUtils.isDebug()) {
+                    e.printStackTrace();
+                }
+            } catch (IllegalAccessException e) {
+                if (PrimWebUtils.isDebug()) {
+                    e.printStackTrace();
+                }
+            }
+        } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { // KITKAT
+            try {
+                Field sConfigCallback = Class.forName("android.webkit.BrowserFrame").getDeclaredField("sConfigCallback");
+                if (sConfigCallback != null) {
+                    sConfigCallback.setAccessible(true);
+                    sConfigCallback.set(null, null);
+                }
+            } catch (NoSuchFieldException e) {
+                if (PrimWebUtils.isDebug()) {
+                    e.printStackTrace();
+                }
+            } catch (ClassNotFoundException e) {
+                if (PrimWebUtils.isDebug()) {
+                    e.printStackTrace();
+                }
+            } catch (IllegalAccessException e) {
+                if (PrimWebUtils.isDebug()) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
 }
diff --git a/primweb-core/src/main/java/com/prim/primweb/core/webview/X5AgentWebView.java b/primweb-core/src/main/java/com/prim/primweb/core/webview/X5AgentWebView.java
index 3e9d2c4..c42512e 100644
--- a/primweb-core/src/main/java/com/prim/primweb/core/webview/X5AgentWebView.java
+++ b/primweb-core/src/main/java/com/prim/primweb/core/webview/X5AgentWebView.java
@@ -1,16 +1,21 @@
 package com.prim.primweb.core.webview;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
 
 import com.prim.primweb.core.client.IAgentWebViewClient;
 import com.prim.primweb.core.client.MyX5WebViewClient;
 import com.prim.primweb.core.jsloader.AgentValueCallback;
+import com.prim.primweb.core.utils.PrimWebUtils;
 import com.tencent.smtt.export.external.interfaces.WebResourceResponse;
 import com.tencent.smtt.sdk.ValueCallback;
 import com.tencent.smtt.sdk.WebChromeClient;
@@ -18,6 +23,7 @@
 import com.tencent.smtt.sdk.WebView;
 import com.tencent.smtt.sdk.WebViewClient;
 
+import java.lang.reflect.Method;
 import java.util.Map;
 
 
@@ -35,6 +41,8 @@ public class X5AgentWebView extends WebView implements IAgentWebView<WebSettings
 
     private IAgentWebViewClient webViewClient;
 
+    private static final String TAG = "X5AgentWebView";
+
     public X5AgentWebView(Context context) {
         this(context, null);
     }
@@ -43,6 +51,33 @@ public X5AgentWebView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
     }
 
+    @Override
+    public void removeRiskJavascriptInterface() {
+        //显式移除有风险的 Webview 系统隐藏接口
+        this.removeJavascriptInterface("searchBoxJavaBridge_");
+        this.removeJavascriptInterface("accessibility");
+        this.removeJavascriptInterface("accessibilityTraversal");
+    }
+
+    /**
+     * 使用Chrome DevTools 远程调试WebView
+     */
+    @TargetApi(19)
+    @Override
+    public void setWebChromeDebuggingEnabled() {
+        if (PrimWebUtils.isDebug() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            try {
+                Class<?> clazz = WebView.class;
+                Method method = clazz.getMethod("setWebContentsDebuggingEnabled", boolean.class);
+                method.invoke(null, true);
+            } catch (Throwable e) {
+                if (PrimWebUtils.isDebug()) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
     @Override
     public View getAgentWebView() {
         return this;
@@ -104,6 +139,7 @@ public void loadDataWithBaseURLAgent(String baseUrl, String data, String mimeTyp
 
     @Override
     public void addJavascriptInterfaceAgent(Object object, String name) {
+        Log.e(TAG, "addJavascriptInterfaceAgent: name --> " + name + "| object --> " + object.getClass().getSimpleName());
         this.addJavascriptInterface(object, name);
     }
 
@@ -164,6 +200,10 @@ protected void onDetachedFromWindow() {
     @Override
     public void destroy() {
         removeAllViewsInLayout();
+        ViewParent parent = getParent();
+        if (parent instanceof ViewGroup) {//从父容器中移除webview
+            ((ViewGroup) parent).removeAllViewsInLayout();
+        }
         super.destroy();
     }
 }