[WEEX-506][Android] try fix report defaultUrl in mutilThread case

apache · Jul 16, 2018 · c281b56 · c281b56
1 parent 5ca1f00
commit c281b56
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -1342,7 +1342,6 @@ private void destroyView(View rootView) {
 
   public synchronized void destroy() {
     if(!isDestroy()) {
-      WXSDKManager.getInstance().getAllInstanceMap().remove(mInstanceId);
       if(mRendered) {
         WXSDKManager.getInstance().destroyInstance(mInstanceId);
       }
@@ -1400,6 +1399,16 @@ public void run() {
           inactiveAddElementAction.clear();
         }
       });
+
+      //when report error in @WXExceptionUtils
+      // instance may had destroy and remove,
+      // so we delay remove from allInstanceMap
+      WXBridgeManager.getInstance().postDelay(new Runnable() {
+        @Override
+        public void run() {
+          WXSDKManager.getInstance().getAllInstanceMap().remove(mInstanceId);
+        }
+      },5000);
     }
   }
 

diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -396,6 +396,13 @@ public void post(Runnable r, Object token) {
     m.sendToTarget();
   }
 
+  public void postDelay(Runnable r,long delayMillis){
+    if (mJSHandler == null) {
+      return;
+    }
+    mJSHandler.postDelayed(WXThread.secure(r),delayMillis);
+  }
+
   void setTimeout(String callbackId, String time) {
     Message message = Message.obtain();
     message.what = WXJSBridgeMsgType.SET_TIMEOUT;