更改jsbridge注入的时机，在页面加载25%以上的时候开始注入

lemon · lemon · commit 7dc834f3d945 · 2018-04-02T17:07:01.000+08:00
diff --git a/app/src/main/assets/demo.html b/app/src/main/assets/demo.html
@@ -1,18 +1,31 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Page Title</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <script src="easybridge.js"></script>
     <script type="text/javascript">
-    
-        function toast(param='toast'){
-            easyBridge.callHandler('toast',param)
+
+        document.addEventListener('WebViewJavascriptBridgeReady',
+            function () {
+                toast('inject finished');
+            }, false);
+
+        function toast(params = 'toast data') {
+            window['easyBridge'].callHandler('toast', 'toast with:'+params+'at '+new Date().toLocaleString());
         }
     </script>
 </head>
+
 <body>
-<a href="javascript:toast()"><h3>toast通知</h3></a>
+
+<a href="javascript:toast('click toast')">
+    <h3>测试Toast</h3>
+</a>
+
 </body>
+
 </html>
diff --git a/app/src/main/java/easily/tech/easybridge/MainActivity.kt b/app/src/main/java/easily/tech/easybridge/MainActivity.kt
@@ -3,8 +3,11 @@ package easily.tech.easybridge
 import android.os.Build
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import android.webkit.WebChromeClient
 import android.webkit.WebView
 import easily.tech.easybridge.handler.ToastHandler
+import easily.tech.easybridge.lib.EasyBridgeWebChromeClient
+import easily.tech.easybridge.lib.SecurityPolicyChecker
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
@@ -15,6 +18,16 @@ class MainActivity : AppCompatActivity() {
             WebView.setWebContentsDebuggingEnabled(true)
         }
         setContentView(R.layout.activity_main)
+        webView.webChromeClient = object : EasyBridgeWebChromeClient(webView) {
+            override fun onProgressChanged(view: WebView?, newProgress: Int) {
+                super.onProgressChanged(view, newProgress)
+                val script = String.format("%s.callHandler('toast','current progress:%s')", webView.bridgeName, newProgress)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                    webView.evaluateJavascript(script) {
+                    }
+                }
+            }
+        }
         webView.registerHandler(ToastHandler(this))
         webView.loadUrl("file:///android_asset/demo.html")
     }
diff --git a/app/src/main/java/easily/tech/easybridge/handler/ToastHandler.kt b/app/src/main/java/easily/tech/easybridge/handler/ToastHandler.kt
@@ -1,6 +1,7 @@
 package easily.tech.easybridge.handler
 
 import android.content.Context
+import android.util.Log
 import android.widget.Toast
 import easily.tech.easybridge.lib.ResultCallBack
 import easily.tech.easybridge.lib.handler.BaseBridgeHandler
@@ -10,6 +11,7 @@ import easily.tech.easybridge.lib.handler.BaseBridgeHandler
  */
 class ToastHandler(private val context: Context) : BaseBridgeHandler("toast") {
     override fun onCall(parameters: String?, callBack: ResultCallBack?) {
+        Log.d("Toast",parameters)
         Toast.makeText(context, parameters, Toast.LENGTH_SHORT).show()
         callBack?.onResult(null)
     }
diff --git a/easybridge/src/main/java/easily/tech/easybridge/lib/EasyBridgeWebChromeClient.java b/easybridge/src/main/java/easily/tech/easybridge/lib/EasyBridgeWebChromeClient.java
@@ -0,0 +1,40 @@
+package easily.tech.easybridge.lib;
+
+import android.webkit.WebChromeClient;
+import android.webkit.WebView;
+
+/**
+ * Created by hzyangjiehao on 2018/4/2.
+ */
+public class EasyBridgeWebChromeClient extends WebChromeClient {
+
+    private static final String BRIDGE_SCRIPT_PATH = "easybridge.js";
+    private static final String JAVA_SCRIPT_PROTOCOL = "javascript:";
+
+
+    protected SecurityPolicyChecker securityPolicyChecker;
+
+    private boolean isInjected;
+    private EasyBridgeWebView easyBridgeWebView;
+
+    public EasyBridgeWebChromeClient(EasyBridgeWebView webView) {
+        this.easyBridgeWebView = webView;
+        this.securityPolicyChecker = webView.getPolicyChecker();
+    }
+
+    @Override
+    public void onProgressChanged(WebView view, int newProgress) {
+        super.onProgressChanged(view, newProgress);
+        // inject the bridge code when the progress above 25% to make sure it worked
+        if (newProgress <= 25) {
+            isInjected = false;
+        } else if (!isInjected) {
+            if (securityPolicyChecker == null || securityPolicyChecker.check(view.getUrl(), "")) {
+                isInjected = true;
+                String bridgeScript = Utils.readAssetFile(view.getContext(), BRIDGE_SCRIPT_PATH);
+                String executeScript = "var bridgeName = " + "\"" + easyBridgeWebView.getBridgeName() + "\"" + ";" + bridgeScript;
+                view.loadUrl(String.format("%s%s", JAVA_SCRIPT_PROTOCOL, executeScript));
+            }
+        }
+    }
+}
diff --git a/easybridge/src/main/java/easily/tech/easybridge/lib/EasyBridgeWebView.java b/easybridge/src/main/java/easily/tech/easybridge/lib/EasyBridgeWebView.java
@@ -18,6 +18,7 @@ public class EasyBridgeWebView extends WebView {
     private static final String DEFAULT_BRIDGE_NAME = "easyBridge";
     private final EasyBridge easyBridge;
     private String bridgeName = DEFAULT_BRIDGE_NAME;
+    protected SecurityPolicyChecker policyChecker;
 
     public EasyBridgeWebView(Context context, String bridgeName) {
         this(context, (AttributeSet) null);
@@ -45,14 +46,8 @@ private void initWebView() {
             webSettings.setJavaScriptEnabled(true);
         }
         addJavascriptInterface(easyBridge, MAPPING_JS_INTERFACE_NAME);
-        EasyBridgeWebViewClient webViewClient = new EasyBridgeWebViewClient(bridgeName, new SecurityPolicyChecker() {
-            @Override
-            public boolean check(String url, String parameters) {
-                // no security check default
-                return true;
-            }
-        });
-        setWebViewClient(webViewClient);
+        EasyBridgeWebChromeClient webChromeClient = new EasyBridgeWebChromeClient(this);
+        setWebChromeClient(webChromeClient);
     }
 
     public void registerHandler(BridgeHandler handler) {
@@ -72,4 +67,16 @@ public void clear() {
             easyBridge.clear();
         }
     }
+
+    public String getBridgeName() {
+        return bridgeName;
+    }
+
+    public SecurityPolicyChecker getPolicyChecker() {
+        return policyChecker;
+    }
+
+    public void setPolicyChecker(SecurityPolicyChecker policyChecker) {
+        this.policyChecker = policyChecker;
+    }
 }
