From 605fd2565e45676e15fad6662bc1fe8c94176c4b Mon Sep 17 00:00:00 2001 From: YorkShen Date: Tue, 15 Nov 2016 11:44:23 +0800 Subject: [PATCH] * [android] Fix https://github.com/alibaba/weex/issues/1200 . Revert commit https://github.com/sospartan/weex/commit/2b54731dd8606e509aa41aebdb2dbe7bf5d6c87a --- .../taobao/weex/bridge/WXBridgeManager.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java index 2852e9003..ba998b786 100755 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java +++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java @@ -435,13 +435,9 @@ public void post(Runnable r, Object token) { return; } - if (isJSThread() && r != null) { - r.run(); - } else { - Message m = Message.obtain(mJSHandler, WXThread.secure(r)); - m.obj = token; - m.sendToTarget(); - } + Message m = Message.obtain(mJSHandler, WXThread.secure(r)); + m.obj = token; + m.sendToTarget(); } void setTimeout(String callbackId, String time) { @@ -1132,16 +1128,19 @@ private void execRegisterFailTask() { */ public void registerModules(final Map modules) { - if ( mJSHandler == null || modules == null - || modules.size() == 0) { - return; - } - post(new Runnable() { - @Override - public void run() { + if (modules != null && modules.size() != 0) { + if(isJSThread()){ invokeRegisterModules(modules); } - }, null); + else{ + post(new Runnable() { + @Override + public void run() { + invokeRegisterModules(modules); + } + }, null); + } + } } /**