* [Android] Move initialization of PlatformBridge to JNI_Load(#2715)

apache · Jul 16, 2019 · 1e40e9c · 1e40e9c
1 parent c371398
commit 1e40e9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/weex_core/Source/android/utils/jni_load.cc b/weex_core/Source/android/utils/jni_load.cc
@@ -18,6 +18,9 @@
  */
 
 #include <jni.h>
+#include "core/bridge/platform_bridge.h"
+#include "android/bridge/platform/android_bridge.h"
+#include "core/manager/weex_core_manager.h"
 #include "android/utils/so_utils.h"
 #include "android/wrap/content_box_measurement_impl_android.h"
 #include "android/wrap/hash_set.h"
@@ -51,7 +54,8 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     WeexCore::SoUtils::Init(env);
     WeexCore::WMLBridge::RegisterJNIUtils(env);
   }
-
+  PlatformBridge* bridge = new AndroidBridgeInSimple;
+  WeexCoreManager::Instance()->set_platform_bridge(bridge);
   return result ? JNI_VERSION_1_4 : JNI_FALSE;
 }
 

diff --git a/weex_core/Source/android/wrap/wx_bridge.cpp b/weex_core/Source/android/wrap/wx_bridge.cpp
@@ -298,9 +298,7 @@ static jint InitFramework(JNIEnv* env, jobject object, jstring script,
             ->platform_side()
             ->ReportNativeInitStatus(status_code, error_msg);
       });
-  // Init platform bridge
-  PlatformBridge* bridge = new AndroidBridgeInSimple;
-  WeexCoreManager::Instance()->set_platform_bridge(bridge);
+  PlatformBridge* bridge = WeexCoreManager::Instance()->getPlatformBridge();
   // Init params
   std::vector<INIT_FRAMEWORK_PARAMS*> params_vector = initFromParam(
       env, params, [](const char* status_code, const char* error_msg) {