From 4ee1cdb6b2aa0ccd3af7e6086b5a27965bf12762 Mon Sep 17 00:00:00 2001
From: xieyangxuejun <xieyangxuejun@gmail.com>
Date: Fri, 4 May 2018 22:06:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95Android=E8=83=BD=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84=E6=96=B9=E6=B3=95;=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Example Apps/ExampleApp.html                  | 56 +++++++++++++++++++
 .../WKWebViewJavascriptBridge.h               |  3 +
 .../WebViewJavascriptBridge.h                 |  3 +
 .../WebViewJavascriptBridge_JS.m              | 26 +++++++++
 4 files changed, 88 insertions(+)
diff --git a/Example Apps/ExampleApp.html b/Example Apps/ExampleApp.html
index 06e7dc8a..41fa54a0 100644
--- a/Example Apps/ExampleApp.html	
+++ b/Example Apps/ExampleApp.html	
@@ -7,15 +7,71 @@
 		button { margin:0 3px 10px; font-size:12px; }
 		.logLine { border-bottom:1px solid #ccc; padding:4px 2px; font-family:courier; font-size:11px; }
 	</style>
+    <script type="text/javascript"
+        src="https://res.wx.qq.com/mmbizwap/zh_CN/htmledition/js/vconsole/3.0.0/vconsole.min.js"></script>
+    <script>
+        var vConsole = new VConsole();
+    </script>
 </head><body>
 	<h1>WebViewJavascriptBridge Demo</h1>
+    <!--测试-->
+    <p>
+    <input type="text" id="text1" value="用户名(username)"/>
+    </p>
+    <p>
+    <input type="text" id="text2" value="password"/>
+    </p>
+    <p>
+    <xmp id="show">
+    </xmp>
+    </p>
+    <p>
+    <input type="button" id="enter" value="发消息给Native" onclick="testClick();"
+    />
+    </p>
+    <p>
+    <input type="button" id="enter1" value="调用Native方法" onclick="testClick1();"
+    />
+    </p>
+    
 	<script>
 	window.onerror = function(err) {
 		log('window.onerror: ' + err)
 	}
+    
+    <!--发送消息给native-->
+    function testClick() {
+        var str1 = document.getElementById("text1").value;
+        var str2 = document.getElementById("text2").value;
+        
+        //send message to native
+        var data = {id: 1, content: "js 发送handleName=nil的方法"};
+        window.WebViewJavascriptBridge
+            .send(data, function(responseData) {
+                document.getElementById("show").innerHTML = "repsonseData from java, data " + responseData
+            });
+    }
+    
+    <!--调用Native的方法-->
+    function testClick1() {
+        var str1 = document.getElementById("text1").value;
+        var str2 = document.getElementById("text2").value;
+        
+        //调用Native方法
+        window.WebViewJavascriptBridge.callHandler('testObjcCallback', {'param': '中文测试'}, function(responseData) {
+                                                   document.getElementById("show").innerHTML = "send get responseData from java, data = " + responseData
+                                                   });
+    }
 
     function setupWebViewJavascriptBridge(callback) {
         if (window.WebViewJavascriptBridge) { return callback(WebViewJavascriptBridge); }
+        document.addEventListener(
+                                  'WebViewJavascriptBridgeReady'
+                                  , function() {
+                                  callback(WebViewJavascriptBridge)
+                                  },
+                                  false
+                                  );
         if (window.WVJBCallbacks) { return window.WVJBCallbacks.push(callback); }
         window.WVJBCallbacks = [callback];
         var WVJBIframe = document.createElement('iframe');
diff --git a/WebViewJavascriptBridge/WKWebViewJavascriptBridge.h b/WebViewJavascriptBridge/WKWebViewJavascriptBridge.h
index 4e3404fc..75198c9d 100644
--- a/WebViewJavascriptBridge/WKWebViewJavascriptBridge.h
+++ b/WebViewJavascriptBridge/WKWebViewJavascriptBridge.h
@@ -20,6 +20,9 @@
 + (instancetype)bridgeForWebView:(WKWebView*)webView;
 + (void)enableLogging;
 
+- (void)send:(id)data;
+- (void)send:(id)data responseCallback:(WVJBResponseCallback)responseCallback;
+
 - (void)registerHandler:(NSString*)handlerName handler:(WVJBHandler)handler;
 - (void)removeHandler:(NSString*)handlerName;
 - (void)callHandler:(NSString*)handlerName;
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.h b/WebViewJavascriptBridge/WebViewJavascriptBridge.h
index 1b64bb4e..80af6216 100755
--- a/WebViewJavascriptBridge/WebViewJavascriptBridge.h
+++ b/WebViewJavascriptBridge/WebViewJavascriptBridge.h
@@ -39,6 +39,9 @@
 + (void)enableLogging;
 + (void)setLogMaxLength:(int)length;
 
+- (void)send:(id)data;
+- (void)send:(id)data responseCallback:(WVJBResponseCallback)responseCallback;
+
 - (void)registerHandler:(NSString*)handlerName handler:(WVJBHandler)handler;
 - (void)removeHandler:(NSString*)handlerName;
 - (void)callHandler:(NSString*)handlerName;
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge_JS.m b/WebViewJavascriptBridge/WebViewJavascriptBridge_JS.m
index 670a552f..602d47a2 100644
--- a/WebViewJavascriptBridge/WebViewJavascriptBridge_JS.m
+++ b/WebViewJavascriptBridge/WebViewJavascriptBridge_JS.m
@@ -26,6 +26,8 @@
 		}
 	}
 	window.WebViewJavascriptBridge = {
+        init:init,
+        send:send,
 		registerHandler: registerHandler,
 		callHandler: callHandler,
 		disableJavscriptAlertBoxSafetyTimeout: disableJavscriptAlertBoxSafetyTimeout,
@@ -35,6 +37,8 @@
 
 	var messagingIframe;
 	var sendMessageQueue = [];
+    //接收消息队列
+    var receiveMessageQueue = [];
 	var messageHandlers = {};
 	
 	var CUSTOM_PROTOCOL_SCHEME = 'https';
@@ -58,6 +62,23 @@ function callHandler(handlerName, data, responseCallback) {
 	function disableJavscriptAlertBoxSafetyTimeout() {
 		dispatchMessagesWithTimeoutSafety = false;
 	}
+    //    设置默认消息线程
+    function init(messageHandler) {
+        if (window.WebViewJavascriptBridge) {
+            throw new error('WebViewJavascriptBridge.init called twice');
+        }
+        window.WebViewJavascriptBridge._messageHandler = messageHandler;
+        var receiveMessages = receiveMessageQueue;
+        receiveMessageQueue = null;
+        for (var i = 0; i < receiveMessages.length; i++) {
+            _handleMessageFromObjC(receiveMessages[i]);
+        }
+    }
+    
+    //    发送默认消息
+    function send(message, responseCallback) {
+        _doSend({data: message}, responseCallback);
+    }
 	
 	function _doSend(message, responseCallback) {
 		if (responseCallback) {
@@ -113,6 +134,11 @@ function _doDispatchMessageFromObjC() {
 	}
 	
 	function _handleMessageFromObjC(messageJSON) {
+        //加入接收消息队列
+        console.log(messageJSON);
+        if (receiveMessageQueue) {
+            receiveMessageQueue.push(messageJSON);
+        }
         _dispatchMessageFromObjC(messageJSON);
 	}
 
