Skip to content
This repository was archived by the owner on Jun 3, 2021. It is now read-only.

Commit 1e40e9c

Browse files
hpop1994YorkShen
authored andcommitted
* [Android] Move initialization of PlatformBridge to JNI_Load(#2715)
1 parent c371398 commit 1e40e9c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

weex_core/Source/android/utils/jni_load.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
*/
1919

2020
#include <jni.h>
21+
#include "core/bridge/platform_bridge.h"
22+
#include "android/bridge/platform/android_bridge.h"
23+
#include "core/manager/weex_core_manager.h"
2124
#include "android/utils/so_utils.h"
2225
#include "android/wrap/content_box_measurement_impl_android.h"
2326
#include "android/wrap/hash_set.h"
@@ -51,7 +54,8 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
5154
WeexCore::SoUtils::Init(env);
5255
WeexCore::WMLBridge::RegisterJNIUtils(env);
5356
}
54-
57+
PlatformBridge* bridge = new AndroidBridgeInSimple;
58+
WeexCoreManager::Instance()->set_platform_bridge(bridge);
5559
return result ? JNI_VERSION_1_4 : JNI_FALSE;
5660
}
5761

weex_core/Source/android/wrap/wx_bridge.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,7 @@ static jint InitFramework(JNIEnv* env, jobject object, jstring script,
298298
->platform_side()
299299
->ReportNativeInitStatus(status_code, error_msg);
300300
});
301-
// Init platform bridge
302-
PlatformBridge* bridge = new AndroidBridgeInSimple;
303-
WeexCoreManager::Instance()->set_platform_bridge(bridge);
301+
PlatformBridge* bridge = WeexCoreManager::Instance()->getPlatformBridge();
304302
// Init params
305303
std::vector<INIT_FRAMEWORK_PARAMS*> params_vector = initFromParam(
306304
env, params, [](const char* status_code, const char* error_msg) {

0 commit comments

Comments
 (0)