* [android] Fix windmill container to debug weex page (#2077)

* * [android] Rename WMLBridge to WeexBridge * * [android] Fix windmill container to debug weex page
apache · Jan 24, 2019 · f20382a · f20382a
1 parent 709e948
commit f20382a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 23 deletions.
diff --git a/android/sdk/libs/armeabi/libweexcore.so b/android/sdk/libs/armeabi/libweexcore.so
diff --git a/android/sdk/libs/armeabi/libweexjss.so b/android/sdk/libs/armeabi/libweexjss.so
diff --git a/weex_core/Source/android/wrap/wml_bridge.cpp b/weex_core/Source/android/wrap/wml_bridge.cpp
@@ -184,7 +184,7 @@ namespace WeexCore {
 
 WMLBridge* WMLBridge::g_instance = nullptr;
 
-const char kWMLBridgeClassPath[] = "com/taobao/windmill/bridge/WMLBridge";
+const char kWMLBridgeClassPath[] =  "com/taobao/windmill/bundle/bridge/WeexBridge";
 jclass g_WMLBridge_clazz = nullptr;
 
 static JNINativeMethod gWMMethods[] = {

diff --git a/weex_core/Source/core/bridge/script/core_side_in_script.cpp b/weex_core/Source/core/bridge/script/core_side_in_script.cpp
@@ -50,32 +50,18 @@ void CoreSideInScript::CallNative(const char *page_id, const char *task,
                                   const char *callback) {
   if (page_id == nullptr || task == nullptr) return;
 
-  //  WeexCoreManager::Instance()->script_thread()->message_loop()->PostTask(
-  //      weex::base::MakeCopyable(
-  //          [pageId = std::unique_ptr<char[]>(copyStr(page_id)),
-  //           taskS = std::unique_ptr<char[]>(copyStr(task)),
-  //           callbackS = std::unique_ptr<char[]>(copyStr(callback))] {
-  //            if (strcmp(taskS.get(),
-  //                       "[{\"module\":\"dom\",\"method\":\"createFinish\","
-  //                       "\"args\":[]}]") == 0) {
-  //              RenderManager::GetInstance()->CreateFinish(pageId.get()) ? 0 :
-  //              -1;
-  //            } else {
-  //              WeexCoreManager::Instance()
-  //                  ->getPlatformBridge()
-  //                  ->platform_side()
-  //                  ->CallNative(pageId.get(), taskS.get(), callbackS.get());
-  //            }
-  //          }));
-  if (strcmp(task,
-             "[{\"module\":\"dom\",\"method\":\"createFinish\","
-             "\"args\":[]}]") == 0) {
-    RenderManager::GetInstance()->CreateFinish(page_id);
-  } else {
+  std::string task_str(task);
+  std::string target_str("[{\"module\":\"dom\",\"method\":\"createFinish\","
+                         "\"args\":[]}]");
+  std::string::size_type idx = task_str.find(target_str);
+
+  if(idx == std::string::npos) {
     WeexCoreManager::Instance()
         ->getPlatformBridge()
         ->platform_side()
         ->CallNative(page_id, task, callback);
+  } else {
+    RenderManager::GetInstance()->CreateFinish(page_id);
   }
 }