feat:remove Context instance before js destory

doric-android/doric/src/main/java/pub/doric/DoricContext.java

@@ -162,31 +162,17 @@ public class DoricContext {
 
     public void teardown() {
         callEntity(DoricConstant.DORIC_ENTITY_DESTROY);
-        DoricContextManager.getInstance().destroyContext(this).setCallback(new AsyncResult.Callback<Boolean>() {
+        getDriver().asyncCall(new Callable<Object>() {
             @Override
-            public void onResult(Boolean result) {
+            public Object call() {
-
+                for (DoricJavaPlugin javaPlugin : mPluginMap.values()) {
+                    javaPlugin.onTearDown();
+                }
+                mPluginMap.clear();
+                return null;
             }
-
+        }, ThreadMode.UI);
-            @Override
+        DoricContextManager.getInstance().destroyContext(this);
-            public void onError(Throwable t) {
-
-            }
-
-            @Override
-            public void onFinish() {
-                getDriver().asyncCall(new Callable<Object>() {
-                    @Override
-                    public Object call() {
-                        for (DoricJavaPlugin javaPlugin : mPluginMap.values()) {
-                            javaPlugin.onTearDown();
-                        }
-                        mPluginMap.clear();
-                        return null;
-                    }
-                }, ThreadMode.UI);
-            }
-        });
     }
 
     public DoricJavaPlugin obtainPlugin(DoricMetaInfo<DoricJavaPlugin> doricMetaInfo) {

doric-android/doric/src/main/java/pub/doric/DoricContextManager.java

@@ -57,6 +57,7 @@ public class DoricContextManager {
     }
 
     AsyncResult<Boolean> destroyContext(final DoricContext context) {
+        doricContextMap.remove(context.getContextId());
         final AsyncResult<Boolean> result = new AsyncResult<>();
         context.getDriver().destroyContext(context.getContextId()).setCallback(new AsyncResult.Callback<Boolean>() {
             @Override
@@ -71,7 +72,6 @@ public class DoricContextManager {
 
             @Override
             public void onFinish() {
-                doricContextMap.remove(context.getContextId());
             }
         });
         return result;

doric-iOS/Pod/Classes/DoricContextManager.m

@@ -70,11 +70,10 @@ - (DoricContext *)getContext:(NSString *)contextId {
 
 - (void)destroyContext:(DoricContext *)context {
     NSString *contextId = context.contextId;
-    [context.driver destroyContext:contextId].finishCallback = ^{
+    dispatch_sync(self.mapQueue, ^() {
-        dispatch_sync(self.mapQueue, ^() {
+        [self.doricContextMap removeObjectForKey:contextId];
-            [self.doricContextMap removeObjectForKey:contextId];
+    });
-        });
+    [context.driver destroyContext:contextId];
-    };
 }
 
 - (NSArray *)aliveContexts {