diff --git a/assetsJsBridge/WebViewJavascriptBridge.js b/assetsJsBridge/WebViewJavascriptBridge.js
new file mode 100755
index 0000000..a92f183
--- /dev/null
+++ b/assetsJsBridge/WebViewJavascriptBridge.js
@@ -0,0 +1,132 @@
+//NOTES: the comments will be removed
+(function(win,doc,PROTOCOL_SCHEME){
+	if (win.WebViewJavascriptBridge) {
+		//in case of already init-ed.
+		return;
+	}
+	//o2s/s2o
+	function o2s(o){
+		if(null==o)return "null";
+		f=arguments.callee;
+		t=typeof o;
+		if('object'==t){if(Array==o.constructor)t='array';else if(RegExp==o.constructor)t='regexp';}
+		switch(t){
+			case 'undefined':case 'unknown':return;
+			case 'function':return !('prototype' in o)?"function(){}":(""+o);break;
+			case 'boolean':case 'regexp':return o.toString(); break;
+			case 'number':return isFinite(o)?o.toString():'null';break;
+			case 'string':return '"'+o.replace(/(\\|\")/g,"\\$1").replace(/\n/g,"\\n").replace(/\r/g,"\\r")+'"';break;
+			case 'object':var r=[];try{for(var p in o){v=f(o[p]);if(v!==undefined)r.push('"'+p+'":'+v);}}catch(e){};
+				return '{'+r.join(',')+'}';break;
+			case 'array':var r=[];
+				if(o.length>=0){
+					for(var i=0;i<o.length;i++){var v=f(o[i]);if (v!==undefined)r.push(v);};return '['+r.join(',')+']';
+				}
+				else{
+					for(var k in o){var v=f(o[k]);if(v!==undefined)r.push('"'+k+'":'+v);};return '{'+r.join(',')+'}';
+				}
+		}
+	};
+	function s2o(s){ try{ return (new Function('return '+s))(); }catch(ex){} };
+
+	var msgIfrm;
+	var send_Q = [];
+	var msgHandlerSet = {};
+
+	var responseCallbacks = {};
+	var msgId = 1;
+
+	//NOTES: can't remove yet, old bridge codes might use it... will remove in future...
+	function init() {
+		console.log('deprecated WebViewJavascriptBridge.init() is called.');
+	}
+
+	function _js2app(msg, cb) {
+		if (cb) {
+			msgId=(msgId + 1) % 1000000;
+			var callbackId = 'cb_' + msgId + '_' + new Date().getTime();
+			responseCallbacks[callbackId] = cb;
+			msg.callbackId = callbackId;
+		}
+		send_Q.push(msg);
+
+		//notify app a msg is Q-ed
+		msgIfrm.src = PROTOCOL_SCHEME + '://__QUEUE_MESSAGE__/';
+		//the __QUEUE_MESSAGE__ is just a what-ever word, @ref to shouldOverrideUrlLoading
+	}
+
+	function _fetchQueue() {
+		var messageQueueString = o2s(send_Q);
+		send_Q = [];
+		//TODO to improve the mechanism
+		//reload iframe src to communicate with java
+		msgIfrm.src = PROTOCOL_SCHEME + '://return/_fetchQueue/' + encodeURIComponent(messageQueueString);
+	}
+
+	function _app2js(msg) {
+		setTimeout(function(){
+			//console.log("_app2js", msg);
+			var callback=null;
+			//java call finished, now need to call js callback function
+			if (msg.responseId) {
+				callback = responseCallbacks[msg.responseId];
+				if (!callback) {
+					return;
+				}
+				callback(msg.responseData);
+				delete responseCallbacks[msg.responseId];
+			} else {
+				var handler = null;
+				if (msg.handlerName) {
+					//find the handler
+					handler = msgHandlerSet[msg.handlerName];
+					if(handler==null){
+						console.log("WebViewJavascriptBridge: not found handler name="+msg.handlerName);
+					}
+				}
+				try {
+					if(handler!=null){
+						if (msg.callbackId) {
+							var callbackResponseId = msg.callbackId;
+							callback = function(responseData) {
+								_js2app({
+									responseId: callbackResponseId,
+									responseData: responseData
+								});
+							};
+						}
+						handler(msg.data, callback);
+					}
+				} catch (exception) {
+					console.log("WebViewJavascriptBridge: WARNING: javascript handler threw.", message, exception);
+				}
+			}
+		},1);
+	}
+
+	function registerHandler(handlerName, handler) {
+		msgHandlerSet[handlerName] = handler;
+	}
+
+	function callHandler(handlerName, data, cb) {
+		_js2app({
+			handlerName: handlerName,
+			data: data
+		}, cb);
+	}
+	//init msg iframe:
+	msgIfrm = doc.createElement('iframe');
+	msgIfrm.style.display = 'none';
+	doc.documentElement.appendChild(msgIfrm);
+
+	win.WebViewJavascriptBridge = {
+		_fetchQueue: _fetchQueue,
+		_js2app: _js2app,
+		_app2js: _app2js,
+
+		init: init,
+
+		registerHandler: registerHandler,
+		callHandler: callHandler
+	};
+})(window,document,'jsb1');
diff --git a/lib-android/szu.bdi.hybrid.core/build.gradle b/lib-android/szu.bdi.hybrid.core/build.gradle
index 09529f7..dac07af 100644
--- a/lib-android/szu.bdi.hybrid.core/build.gradle
+++ b/lib-android/szu.bdi.hybrid.core/build.gradle
@@ -11,7 +11,7 @@ org.gradle.daemon=true
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
     buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
-    //useLibrary 'org.apache.http.legacy'
+    useLibrary 'org.apache.http.legacy'
     defaultConfig {
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
@@ -21,7 +21,18 @@ android {
 //        sourceCompatibility JavaVersion.VERSION_1_7
 //        targetCompatibility JavaVersion.VERSION_1_7
 //    }
-
+    sourceSets {
+        main {
+            //java.srcDirs = ['src/main/java', 'src/main/java/NewStylePassword', 'src/main/java/Fragment', 'src/main/java/MyImageButton', 'src/main/java/com.bignerdranch.android.mfailab/Receivers', 'src/main/java/2', 'src/main/java/com.bignerdranch.android.mfailab/GestruePassword', 'src/main/java/com.bignerdranch.android.mfailab/Fragments', 'src/main/java/com.bignerdranch.android.mfailab/ButtonStyles', 'src/main/java/com.bignerdranch.android.mfailab/ActivitiesForExtends', 'src/main/java/com.bignerdranch.android.mfailab/InternetClassesAndThreads', 'src/main/java/com.bignerdranch.android.mfailab/SharedPreference', 'src/main/java/com.bignerdranch.android.mfailab/ExitApplication', 'src/main/java/com.bignerdranch.android.mfailab/Keyboard', 'src/main/java/com.bignerdranch.android.mfailab/setting']
+            //res.srcDirs = ['src/main/res', 'src/main/res/drawable/Function', 'src/main/res/xml']
+            //java.srcDirs = ['src']
+            //assets.srcDirs = ['assets']
+            //res.srcDirs = ['res']
+            //manifest.srcFile 'AndroidManifest.xml'
+            //wanjo: important, we need the folders as assets:
+            assets.srcDirs = ['../../assetsJsBridge']
+        }
+    }
 }
 
 dependencies {
diff --git a/lib-android/szu.bdi.hybrid.core/src/main/assets/WebViewJavascriptBridge.js b/lib-android/szu.bdi.hybrid.core/src/main/assets/WebViewJavascriptBridge.js
deleted file mode 100644
index bc14cee..0000000
--- a/lib-android/szu.bdi.hybrid.core/src/main/assets/WebViewJavascriptBridge.js
+++ /dev/null
@@ -1,139 +0,0 @@
-(function() {
-	if (window.WebViewJavascriptBridge) {
-		return;
-	}
-
-	var messagingIframe;
-	var sendMessageQueue = [];
-	//var receiveMessageQueue = null;
-	var messageHandlers = {};
-
-	var CUSTOM_PROTOCOL_SCHEME = 'jsb1';
-
-	var responseCallbacks = {};
-	var uniqueId = 1;
-
-	function o2s(o){
-		if(null==o)return "null";
-		f=arguments.callee;
-		t=typeof o;
-		if('object'==t){if(Array==o.constructor)t='array';else if(RegExp==o.constructor)t='regexp';}
-		switch(t){
-			case 'undefined':case 'unknown':return;
-			case 'function':return !('prototype' in o)?"function(){}":(""+o);break;
-			case 'boolean':case 'regexp':return o.toString(); break;
-			case 'number':return isFinite(o)?o.toString():'null';break;
-			case 'string':return '"'+o.replace(/(\\|\")/g,"\\$1").replace(/\n/g,"\\n").replace(/\r/g,"\\r")+'"';break;
-			case 'object':var r=[];try{for(var p in o){v=f(o[p]);if(v!==undefined)r.push('"'+p+'":'+v);}}catch(e){};
-				return '{'+r.join(',')+'}';break;
-			case 'array':var r=[];
-				if(o.length>=0){
-					for(var i=0;i<o.length;i++){var v=f(o[i]);if (v!==undefined)r.push(v);};return '['+r.join(',')+']';
-				}
-				else{
-					for(var k in o){var v=f(o[k]);if(v!==undefined)r.push('"'+k+'":'+v);};return '{'+r.join(',')+'}';
-				}
-		}
-	};
-	function s2o(s){ try{ return (new Function('return '+s))(); }catch(ex){} };
-
-	function _createQueueReadyIframe(doc) {
-		messagingIframe = doc.createElement('iframe');
-		messagingIframe.style.display = 'none';
-		doc.documentElement.appendChild(messagingIframe);
-	}
-
-	//can't remove yet, old cmp bridge might use it... will remove in future...
-	function init() {
-		console.log('deprecated WebViewJavascriptBridge.init() is called.');
-	}
-
-	//function send(data, responseCallback) {
-		//	_js2java({
-			//		data: data
-//	}, responseCallback);
-			//}
-
-			function _js2java(message, responseCallback) {
-				if (responseCallback) {
-					var callbackId = 'cb_' + (uniqueId++) + '_' + new Date().getTime();
-					responseCallbacks[callbackId] = responseCallback;
-					message.callbackId = callbackId;
-				}
-
-				sendMessageQueue.push(message);
-
-				//just a notification to the java that "hey, you got message, come get them"
-				messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://__QUEUE_MESSAGE__/';
-				//so the __QUEUE_MESSAGE__ is just a what-ever word, @ref to shouldOverrideUrlLoading
-			}
-
-			function _fetchQueue() {
-				//        var messageQueueString = JSON.stringify(sendMessageQueue);
-				var messageQueueString = o2s(sendMessageQueue);
-				sendMessageQueue = [];
-				//reload iframe src to communicate with java
-				messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://return/_fetchQueue/' + encodeURIComponent(messageQueueString);
-			}
-
-			function _java2js(message) {
-				setTimeout(function(){
-					console.log("_java2js", message);
-					//            var message = JSON.parse(messageJSON);
-					var responseCallback;
-					//java call finished, now need to call js callback function
-					if (message.responseId) {
-						responseCallback = responseCallbacks[message.responseId];
-						if (!responseCallback) {
-							return;
-						}
-						responseCallback(message.responseData);
-						delete responseCallbacks[message.responseId];
-					} else {
-						if (message.callbackId) {
-							var callbackResponseId = message.callbackId;
-							responseCallback = function(responseData) {
-								_js2java({
-									responseId: callbackResponseId,
-									responseData: responseData
-								});
-							};
-						}
-
-						var handler = null;
-						if (message.handlerName) {
-							handler = messageHandlers[message.handlerName];
-						}
-						try {
-							if(handler!=null)
-								handler(message.data, responseCallback);
-						} catch (exception) {
-							console.log("WebViewJavascriptBridge: WARNING: javascript handler threw.", message, exception);
-						}
-					}
-				});
-			}
-
-			function registerHandler(handlerName, handler) {
-				messageHandlers[handlerName] = handler;
-			}
-
-			function callHandler(handlerName, data, responseCallback) {
-				_js2java({
-					handlerName: handlerName,
-					data: data
-				}, responseCallback);
-			}
-
-			var WebViewJavascriptBridge = window.WebViewJavascriptBridge = {
-				init: init,
-				registerHandler: registerHandler,
-				callHandler: callHandler,
-				_fetchQueue: _fetchQueue,
-				_js2java: _js2java,
-				_java2js: _java2js
-			};
-
-			_createQueueReadyIframe(document);
-
-})();
diff --git a/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/HybridTools.java b/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/HybridTools.java
index 6780007..86ddd6b 100644
--- a/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/HybridTools.java
+++ b/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/HybridTools.java
@@ -447,7 +447,8 @@ public static void bindWebViewApi(JsBridgeWebView wv, final HybridUi callerAct)
         String address = optString(callerAct.getUiData("address"));
         JSONArray foundAuth = findSubAuth(authObj, address);
         if (foundAuth == null) {
-            HybridTools.quickShowMsgMain("ConfigError: not found match auth for address\n " + address + " !!!");
+            //TODO
+            HybridTools.quickShowMsgMain("ConfigError: not found match auth for address (" + address + ") !!!");
             return;
         }
         Log.v(LOGTAG, " foundAuth=" + foundAuth);
diff --git a/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/ICallBackFunction.java b/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/ICallBackFunction.java
old mode 100644
new mode 100755
index a369d49..9b623e2
--- a/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/ICallBackFunction.java
+++ b/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/ICallBackFunction.java
@@ -1,5 +1,6 @@
 package szu.bdi.hybrid.core;
 
 public interface ICallBackFunction {
-    void onCallBack(String cbStr);
-}
\ No newline at end of file
+	//NOTES:如果不override就什么都不做
+	void onCallBack(String cbStr);
+}
diff --git a/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/JsBridgeWebView.java b/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/JsBridgeWebView.java
old mode 100644
new mode 100755
index 12c23b3..c4a2779
--- a/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/JsBridgeWebView.java
+++ b/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/JsBridgeWebView.java
@@ -30,12 +30,13 @@
  * This just the v1 implementation,
  * soon will have a v2 version for a better protocol
  * <p/>
- * design : Q + Bi-direction-call + Protocol(enc/dec)
+ * design : Q + Bi-direction-call + Protocol
  * <p/>
  * NOTES:
  * <p/>
- * 1, using Queue and make sure runing in a same ui-thread.
- * 2, registerHandler and callHandler is the only protocol (default handler is removed)
+ * 1, using Q to make sure runing in a same ui-thread.
+ * 2, registerHandler() and callHandler() are the public protocol (default handler is removed)
+ * 3, the _app2js(), _js2app(), _fetchQueue() are the hidden protocol
  */
 
 @SuppressLint("SetJavaScriptEnabled")
@@ -48,7 +49,7 @@ public class JsBridgeWebView extends WebView {
 
     final static String WEB_VIEW_JAVASCRIPT_BRIDGE = "WebViewJavascriptBridge";//v1
     final static String JS_FETCH_QUEUE_FROM_JAVA = "javascript:" + WEB_VIEW_JAVASCRIPT_BRIDGE + "._fetchQueue();";
-    final static String JAVA_TO_JS = "javascript:" + WEB_VIEW_JAVASCRIPT_BRIDGE + "._java2js";
+    final static String JAVA_TO_JS = "javascript:" + WEB_VIEW_JAVASCRIPT_BRIDGE + "._app2js";
     final static String CALLBACK_ID_FORMAT = "JAVA_CB_%s";
 
     Map<String, ICallBackFunction> responseCallbacks = new HashMap<String, ICallBackFunction>();
@@ -167,7 +168,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 JsBridgeWebView webView = JsBridgeWebView.this;
 
                 if (url.startsWith(JSB1_RETURN_DATA)) {
-                    // java2js callback
+                    // app2js callback
                     webView.handlerReturnData(url);
                     return true;
                 } else if (url.startsWith(JSB1_OVERRIDE_SCHEMA)) {
@@ -194,9 +195,11 @@ public void onPageFinished(WebView view, String url) {
                 JsBridgeWebView webView = JsBridgeWebView.this;
 
                 if (webView.getStartupJsb1Msg() != null) {
+                    //if something is called before the page is loaded, do them now...
                     for (Jsb1Msg m : webView.getStartupJsb1Msg()) {
                         webView.dispatchMessage(m);
                     }
+                    //clear it
                     webView.setStartupJsb1Msg(null);
                 }
             }
@@ -214,7 +217,7 @@ void handlerReturnData(String url) {
         }
     }
 
-    private void _java2js(String handlerName, String data, ICallBackFunction responseCallback) {
+    private void _app2js(String handlerName, String data, ICallBackFunction responseCallback) {
         Jsb1Msg m = new Jsb1Msg();
         if (!TextUtils.isEmpty(data)) {
             m.setData(data);
@@ -241,7 +244,7 @@ private void queueMessage(Jsb1Msg m) {
     void dispatchMessage(Jsb1Msg m) {
         String s = m.toJson();
 
-        if ("".equals(s)) s = "null";//TMP HACK.
+        if ("".equals(s) || s == null) s = "null";
 
         //NOTES: run the js in the main thread of browser:
         if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
@@ -290,20 +293,26 @@ public void onCallBack(String data) {
                                         queueMessage(responseMsg);
                                     }
                                 };
-                            } else {
-                                responseFunction = new ICallBackFunction() {
-                                    @Override
-                                    public void onCallBack(String data) {
-                                        // do nothing
-                                    }
-                                };
                             }
+                            //else {
+                            //    responseFunction = new ICallBackFunction() {
+                            //        @Override
+                            //        public void onCallBack(String data) {
+                            //            // do nothing
+                            //        }
+                            //    };
+                            //}
                             ICallBackHandler handler = null;
                             if (!TextUtils.isEmpty(m.getHandlerName())) {
                                 handler = messageHandlers.get(m.getHandlerName());
-                            }
-                            if (handler != null) {
-                                handler.handler(m.getData(), responseFunction);
+                                if (handler != null) {
+                                    //TODO 这里要有个 auth-mapping check！！
+                                    handler.handler(m.getData(), responseFunction);
+                                } else {
+                                    //TODO debug下什么鬼
+                                }
+                            } else {
+                                //TODO debug下又什么鬼，连名字都没有，要干嘛?
                             }
                         }
                     }
@@ -323,9 +332,9 @@ public void registerHandler(String handlerName, ICallBackHandler handler) {
         }
     }
 
-    //    from java call js
+    //from java call js
     public void callHandler(String handlerName, String data, ICallBackFunction cb) {
-        _java2js(handlerName, data, cb);
+        _app2js(handlerName, data, cb);
     }
 
     //prototol(java,js)
diff --git a/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/WebViewUi.java b/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/SimpleWebViewUi.java
similarity index 91%
rename from lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/WebViewUi.java
rename to lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/SimpleWebViewUi.java
index b09be49..5563050 100644
--- a/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/WebViewUi.java
+++ b/lib-android/szu.bdi.hybrid.core/src/main/java/szu/bdi/hybrid/core/SimpleWebViewUi.java
@@ -1,5 +1,7 @@
 package szu.bdi.hybrid.core;
 
+//SimpleWebViewUi is a HybridUi with a full size "JBridgeWebView"
+
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -19,9 +21,9 @@
 
 //@ref http://stackoverflow.com/questions/20138434/alternate-solution-for-setjavascriptenabledtrue
 @SuppressLint({"SetJavaScriptEnabled", "JavascriptInterface"})
-public class WebViewUi extends HybridUi {
+public class SimpleWebViewUi extends HybridUi {
 
-    final private static String LOGTAG = "WebViewUi";
+    final private static String LOGTAG = "SimpleWebViewUi";
 
     @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
     @Override
@@ -29,10 +31,9 @@ protected void onCreate(Bundle savedInstanceState) {
         Log.v(LOGTAG, ".onCreate()");
         super.onCreate(savedInstanceState);
 
-        setTitle("TODO setTitle()");
+        //setTitle("setTitle()");
 
         final Context _ctx = this;
-        final Activity _activity = this;
 
         JsBridgeWebView _wv = new JsBridgeWebView(_ctx);
 
@@ -66,7 +67,7 @@ public void onClick(DialogInterface dialog, int which) {
             }
         });
 
-        String address = HybridTools.optString(getUiData("address"));
+        String address = HybridTools.optString(this.getUiData("address"));
         String url = "";
         if (address == null || "".equals(address)) {
             url = "file://" + HybridTools.localWebRoot + "error.htm";
@@ -80,7 +81,6 @@ public void onClick(DialogInterface dialog, int which) {
             }
         }
 
-        //IMPORTANT:
         HybridTools.bindWebViewApi(_wv, this);
 
         setContentView(_wv);
@@ -112,7 +112,9 @@ public void onBackPressed() {
 
         Intent rtIntent = new Intent();
         rtIntent.putExtra("rt", o.toString());
-        setResult(1, rtIntent);//@ref onActivityResult()
+
+        //@ref onActivityResult()
+        setResult(1, rtIntent);
         finish();
     }
 
diff --git a/lib-ios/szu-bdi-hybrid-core/JavascriptBridge/WebViewJavascriptBridgeBase.m b/lib-ios/szu-bdi-hybrid-core/JavascriptBridge/WebViewJavascriptBridgeBase.m
old mode 100644
new mode 100755
index e1b1e39..f21ec13
--- a/lib-ios/szu-bdi-hybrid-core/JavascriptBridge/WebViewJavascriptBridgeBase.m
+++ b/lib-ios/szu-bdi-hybrid-core/JavascriptBridge/WebViewJavascriptBridgeBase.m
@@ -170,18 +170,11 @@ - (void)_queueMessage:(WVJBMessage*)message {
 }
 
 - (void)_dispatchMessage:(WVJBMessage*)message {
-    NSString *messageJSON = [self _serializeMessage:message pretty:NO];
-    [self _log:@"SEND" json:messageJSON];
-    messageJSON = [messageJSON stringByReplacingOccurrencesOfString:@"\\" withString:@"\\\\"];
-    messageJSON = [messageJSON stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
-    messageJSON = [messageJSON stringByReplacingOccurrencesOfString:@"\'" withString:@"\\\'"];
-    messageJSON = [messageJSON stringByReplacingOccurrencesOfString:@"\n" withString:@"\\n"];
-    messageJSON = [messageJSON stringByReplacingOccurrencesOfString:@"\r" withString:@"\\r"];
-    messageJSON = [messageJSON stringByReplacingOccurrencesOfString:@"\f" withString:@"\\f"];
-    messageJSON = [messageJSON stringByReplacingOccurrencesOfString:@"\u2028" withString:@"\\u2028"];
-    messageJSON = [messageJSON stringByReplacingOccurrencesOfString:@"\u2029" withString:@"\\u2029"];
-    
-    NSString* javascriptCommand = [NSString stringWithFormat:@"WebViewJavascriptBridge._handleMessageFromObjC('%@');", messageJSON];
+    NSString *json_string = [self _serializeMessage:message pretty:NO];
+
+		//TODO if "" or null change to "null"...
+
+    NSString* javascriptCommand = [NSString stringWithFormat:@"WebViewJavascriptBridge._app2c(%@);", json_string];
     if ([[NSThread currentThread] isMainThread]) {
         [self _evaluateJavascript:javascriptCommand];
 
@@ -212,4 +205,4 @@ - (void)_log:(NSString *)action json:(id)json {
     }
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/lib-ios/szu-bdi-hybrid-core/JavascriptBridge/WebViewJavascriptBridge_JS.m b/lib-ios/szu-bdi-hybrid-core/JavascriptBridge/WebViewJavascriptBridge_JS.m
old mode 100644
new mode 100755
index 3a494dd..123da45
--- a/lib-ios/szu-bdi-hybrid-core/JavascriptBridge/WebViewJavascriptBridge_JS.m
+++ b/lib-ios/szu-bdi-hybrid-core/JavascriptBridge/WebViewJavascriptBridge_JS.m
@@ -13,6 +13,7 @@
 NSString * WebViewJavascriptBridge_js() {
 	#define __wvjb_js_func__(x) #x
 	
+	//TODO  不要这样写在oc里面，又不灵活又不好改，要从 assets 读进来..
 	// BEGIN preprocessorJSCode
 	static NSString * preprocessorJSCode = @__wvjb_js_func__(
 ;(function() {
@@ -23,7 +24,7 @@
 		registerHandler: registerHandler,
 		callHandler: callHandler,
 		_fetchQueue: _fetchQueue,
-		_handleMessageFromObjC: _handleMessageFromObjC
+		_app2js: _app2js
 	};
 
 	var messagingIframe;
@@ -45,10 +46,10 @@ function callHandler(handlerName, data, responseCallback) {
 			responseCallback = data;
 			data = null;
 		}
-		_doSend({ handlerName:handlerName, data:data }, responseCallback);
+		_js2app({ handlerName:handlerName, data:data }, responseCallback);
 	}
 	
-	function _doSend(message, responseCallback) {
+	function _js2app(message, responseCallback) {
 		if (responseCallback) {
 			var callbackId = 'cb_'+(uniqueId++)+'_'+new Date().getTime();
 			responseCallbacks[callbackId] = responseCallback;
@@ -64,9 +65,8 @@ function _fetchQueue() {
 		return messageQueueString;
 	}
 
-	function _dispatchMessageFromObjC(messageJSON) {
+	function _app2js(message) {
 		setTimeout(function _timeoutDispatchMessageFromObjC() {
-			var message = JSON.parse(messageJSON);
 			var messageHandler;
 			var responseCallback;
 
@@ -81,7 +81,7 @@ function _dispatchMessageFromObjC(messageJSON) {
 				if (message.callbackId) {
 					var callbackResponseId = message.callbackId;
 					responseCallback = function(responseData) {
-						_doSend({ responseId:callbackResponseId, responseData:responseData });
+						_js2app({ responseId:callbackResponseId, responseData:responseData });
 					};
 				}
 				
@@ -98,16 +98,12 @@ function _dispatchMessageFromObjC(messageJSON) {
 		});
 	}
 	
-	function _handleMessageFromObjC(messageJSON) {
-        _dispatchMessageFromObjC(messageJSON);
-	}
-
 	messagingIframe = document.createElement('iframe');
 	messagingIframe.style.display = 'none';
 	messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://' + QUEUE_HAS_MESSAGE;
 	document.documentElement.appendChild(messagingIframe);
 
-	setTimeout(_callWVJBCallbacks, 0);
+	setTimeout(_callWVJBCallbacks, 1);
 	function _callWVJBCallbacks() {
 		var callbacks = window.WVJBCallbacks;
 		delete window.WVJBCallbacks;
@@ -120,4 +116,4 @@ function _callWVJBCallbacks() {
 
 	#undef __wvjb_js_func__
 	return preprocessorJSCode;
-};
\ No newline at end of file
+};