fix(ios): improve stability

Tencent · Nov 16, 2021 · ec2686f · ec2686f
1 parent 72c0879
commit ec2686f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/ios/sdk/base/HippyBatchedBridge.mm b/ios/sdk/base/HippyBatchedBridge.mm
@@ -1047,12 +1047,12 @@ - (id)callNativeModule:(NSUInteger)moduleID method:(NSUInteger)methodID params:(
     //    if (!_valid) {
     //        return nil;
     //    }
-
-    if (moduleID >= [_moduleDataByID count]) {
-        HippyLogError(@"moduleID %lu exceed range of _moduleDataByID %lu, bridge is valid %ld", moduleID, [_moduleDataByID count], (long)_valid);
+    NSArray<HippyModuleData *> *moduleDataByID = [_moduleDataByID copy];
+    if (moduleID >= [moduleDataByID count]) {
+        HippyLogError(@"moduleID %lu exceed range of moduleDataByID %lu, bridge is valid %ld", moduleID, [moduleDataByID count], (long)_valid);
         return nil;
     }
-    HippyModuleData *moduleData = _moduleDataByID[moduleID];
+    HippyModuleData *moduleData = moduleDataByID[moduleID];
     if (HIPPY_DEBUG && !moduleData) {
         HippyLogError(@"No module found for id '%lu'", (unsigned long)moduleID);
         return nil;

diff --git a/ios/sdk/base/HippyTouchHandler.m b/ios/sdk/base/HippyTouchHandler.m
@@ -355,7 +355,9 @@ - (BOOL)checkViewBelongToTouchHandler:(UIView *)view {
     if (!checkView) {
         NSNumber *viewRootTag = [view rootTag];
         NSNumber *rootViewTag = [_rootView hippyTag];
-        return [viewRootTag isEqualToNumber:rootViewTag];
+        if (rootViewTag) {
+            return [viewRootTag isEqualToNumber:rootViewTag];
+        }
     }
     return checkView == view;
 }