[WEEX-498][Android] fix report url is bundleUrlDefault

apache · Jul 9, 2018 · 9877923 · 9877923
1 parent 402feab
commit 9877923
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -391,6 +391,8 @@ public void init(Context context) {
     mWXPerformance.JSLibInitTime = WXEnvironment.sJSLibInitTime;
 
     mUserTrackAdapter=WXSDKManager.getInstance().getIWXUserTrackAdapter();
+
+    WXSDKManager.getInstance().getAllInstanceMap().put(mInstanceId,this);
   }
 
   /**
@@ -1340,6 +1342,7 @@ private void destroyView(View rootView) {
 
   public synchronized void destroy() {
     if(!isDestroy()) {
+      WXSDKManager.getInstance().getAllInstanceMap().remove(mInstanceId);
       if(mRendered) {
         WXSDKManager.getInstance().destroyInstance(mInstanceId);
       }
@@ -1839,7 +1842,6 @@ public void onHttpFinish(WXResponse response) {
         WXLogUtils.e("user intercept: WX_DEGRAD_ERR_BUNDLE_CONTENTTYPE_ERROR");
         onRenderError(WXErrorCode.WX_DEGRAD_ERR_BUNDLE_CONTENTTYPE_ERROR.getErrorCode(),
                 "|response.errorMsg==" + response.errorMsg +
-                        "|instance.getTemplateInfo == \n" + instance.getTemplateInfo() +
                         "|instance bundleUrl = \n" + instance.getBundleUrl() +
                         "|instance requestUrl = \n" + Uri.decode(WXSDKInstance.requestUrl)
         );
@@ -1850,8 +1852,8 @@ public void onHttpFinish(WXResponse response) {
         onRenderError(
                 WXErrorCode.WX_DEGRAD_ERR_NETWORK_CHECK_CONTENT_LENGTH_FAILED.getErrorCode(),
                 WXErrorCode.WX_DEGRAD_ERR_NETWORK_CHECK_CONTENT_LENGTH_FAILED.getErrorCode() +
-                        "|response.errorMsg==" + response.errorMsg +
-                        "|instance.getTemplateInfo == \n" + instance.getTemplateInfo());
+                        "|response.errorMsg==" + response.errorMsg
+        );
       }
       else {
         onRenderError(WXErrorCode.WX_DEGRAD_ERR_NETWORK_BUNDLE_DOWNLOAD_FAILED.getErrorCode(),

diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
@@ -94,6 +94,9 @@ public class WXSDKManager {
   // Tell weexv8 to initialize v8, default is true.
   private boolean mNeedInitV8 = true;
 
+  //add when instance create,rm when instance destroy, not like WXRenderManager
+  private Map<String,WXSDKInstance> mAllInstanceMap;
+
   private List<InstanceLifeCycleCallbacks> mLifeCycleCallbacks;
 
   private static final int DEFAULT_VIEWPORT_WIDTH = 750;
@@ -107,6 +110,7 @@ private WXSDKManager(WXRenderManager renderManager) {
     mBridgeManager = WXBridgeManager.getInstance();
     mWXWorkThreadManager = new WXWorkThreadManager();
     mWXAnalyzerList = new ArrayList<>();
+    mAllInstanceMap = new HashMap<>();
   }
 
   /**
@@ -213,10 +217,15 @@ public void postOnUiThread(Runnable runnable, long delayMillis) {
     mWXRenderManager.postOnUiThread(WXThread.secure(runnable), delayMillis);
   }
 
+  public Map<String, WXSDKInstance> getAllInstanceMap() {
+    return mAllInstanceMap;
+  }
+
   public void destroy() {
     if (mWXWorkThreadManager != null) {
       mWXWorkThreadManager.destroy();
     }
+    mAllInstanceMap.clear();
   }
 
   @Deprecated

diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
@@ -75,7 +75,7 @@ public static void commitCriticalExceptionRT(@Nullable final String instanceId,
 
 		if (!TextUtils.isEmpty(instanceId)) {
 			instanceIdCommit = instanceId;
-			instance = WXSDKManager.getInstance().getSDKInstance(instanceId);
+			instance = WXSDKManager.getInstance().getAllInstanceMap().get(instanceId);
 
 			if (null != instance && instance.getContainerView() != null){
 				Context c = instance.getContainerView().getContext();