[iOS] suuport instance use backup js thread run

apache · Jun 10, 2019 · ee34a46 · ee34a46
1 parent 0baa6a7
commit ee34a46
Show file tree

Hide file tree

Showing 12 changed files with 207 additions and 60 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -754,9 +754,9 @@ - (void)destroyInstance:(NSString *)instance
         if (_dataRenderHandler) {
             WXPerformBlockOnComponentThread(^{
                 [_dataRenderHandler destroyDataRenderInstance:instance];
-                WXPerformBlockOnBridgeThread(^{
+                WXPerformBlockOnBridgeThreadForInstance(^{
                     [self callJSMethod:@"destroyInstance" args:@[instance]];
-                });
+                }, instance);
             });
         }
         else {

diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
@@ -80,9 +80,9 @@ - (void)dealloc
 {
     _jsContext.instanceId = nil;
     __block JSContext* theContext = _jsContext;
-    WXPerformBlockOnBridgeThread(^{
-        theContext = nil; // release the context in js thread to avoid main-thread deadlock
-    });
+    WXPerformBlockOnBridgeThreadForInstance(^{
+         theContext = nil; // release the context in js thread to avoid main-thread deadlock
+    }, _weexInstanceId);
 }
 
 - (void)setJSContext:(JSContext *)context

diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
@@ -28,6 +28,10 @@ extern "C" {
 #endif
     void WXPerformBlockOnBridgeThread(void (^block)(void));
     void WXPerformBlockSyncOnBridgeThread(void (^block) (void));
+    void WXPerformBlockOnBackupBridgeThread(void (^block)(void));
+
+    void WXPerformBlockOnBridgeThreadForInstance(void (^block)(void), NSString* instance);
+    void WXPerformBlockSyncOnBridgeThreadForInstance(void (^block) (void), NSString* instance);
 #ifdef __cplusplus
 }
 #endif