* [android] bugfix init sdk

alibaba · May 19, 2016 · b6946ad · b6946ad
1 parent fc9b595
commit b6946ad
Showing 1 changed file with 9 additions and 24 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -284,30 +284,6 @@ public static void init(Application application, IWXUserTrackAdapter utAdapter,
 
       WXSDKManager.getInstance().initScriptsFramework(framework);
       register();
-    }
-  }
-
-  public static void init(Application application, String framework, IWXUserTrackAdapter utAdapter, IWXImgLoaderAdapter imgLoaderAdapter, IWXHttpAdapter httpAdapter) {
-    synchronized (mLock) {
-      if (init) {
-        return;
-      }
-      init = true;
-      WXEnvironment.sApplication = application;
-      WXEnvironment.JsFrameworkInit = false;
-      WXSoInstallMgrSdk.init(application);
-      WXEnvironment.sSupport = WXSoInstallMgrSdk.initSo(V8_SO_NAME, 1, utAdapter);
-      if (!WXEnvironment.sSupport) {
-        return;
-      }
-
-      WXSDKManager.getInstance().initScriptsFramework(framework);
-
-      WXSDKManager.getInstance().setIWXHttpAdapter(httpAdapter);
-      WXSDKManager.getInstance().setIWXImgLoaderAdapter(imgLoaderAdapter);
-      WXSDKManager.getInstance().setIWXUserTrackAdapter(utAdapter);
-
-      register();
 
       new AsyncTask<Application, Void, Void>() {
         @Override
@@ -325,6 +301,15 @@ protected Void doInBackground(Application... params) {
     }
   }
 
+  public static void init(Application application, String framework, IWXUserTrackAdapter utAdapter, IWXImgLoaderAdapter imgLoaderAdapter, IWXHttpAdapter httpAdapter) {
+
+    WXSDKManager.getInstance().setIWXHttpAdapter(httpAdapter);
+    WXSDKManager.getInstance().setIWXImgLoaderAdapter(imgLoaderAdapter);
+    WXSDKManager.getInstance().setIWXUserTrackAdapter(utAdapter);
+    init(application, utAdapter, framework);
+
+  }
+
   private static void register() {
     try {
       registerComponent(WXBasicComponentType.TEXT, WXText.class, false);