[WEEX-501][iOS] Try to fix insert table view cell exception abort on iOS

apache · Jul 12, 2018 · bedc6aa · bedc6aa
1 parent 44a3c41
commit bedc6aa
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.mm
@@ -31,6 +31,7 @@
 #import "WXRefreshComponent.h"
 #import "WXLoadingComponent.h"
 #import "WXScrollerComponent+Layout.h"
+#import "WXThreadSafeMutableArray.h"
 
 @interface WXTableView : UITableView
 
@@ -94,8 +95,11 @@ @implementation WXSectionComponent
 - (instancetype)init
 {
     if (self = [super init]) {
-        _rows = [NSMutableArray array];
-    }
+		if ([WXUtility listSectionRowThreadSafe]) {
+			_rows = [WXThreadSafeMutableArray array];
+		} else {
+			_rows = [NSMutableArray array];
+		}    }
 
     return self;
 }

diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -326,6 +326,9 @@ - (BOOL)_handleConfigCenter
         BOOL unregisterFontWhenCollision = [[configCenter configForKey:@"iOS_weex_ext_config.unregisterFontWhenCollision" defaultValue:@NO isDefault:NULL] boolValue];
         [WXUtility setUnregisterFontWhenCollision:unregisterFontWhenCollision];
 
+		BOOL listSectionRowThreadSafe = [[configCenter configForKey:@"iOS_weex_ext_config.listSectionRowThreadSafe" defaultValue:@(YES) isDefault:NULL] boolValue];
+		[WXUtility setListSectionRowThreadSafe:listSectionRowThreadSafe];
+
         //Reading config from orange for Release instance in Main Thread or not
         _bReleaseInstanceInMainThread = [[configCenter configForKey:@"iOS_weex_ext_config.releaseInstanceInMainThread" defaultValue:@(YES) isDefault:nil] boolValue];
 

diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h
@@ -489,4 +489,8 @@ BOOL WXFloatGreaterThanWithPrecision(CGFloat a,CGFloat b,double precision);
 
 + (void)setUnregisterFontWhenCollision:(BOOL)value;
 
++ (void)setListSectionRowThreadSafe:(BOOL)value;
+
++ (BOOL)listSectionRowThreadSafe;
+
 @end
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
@@ -43,6 +43,7 @@
 
 static BOOL threadSafeCollectionUsingLock = YES;
 static BOOL unregisterFontWhenCollision = NO;
+static BOOL listSectionRowThreadSafe = YES;
 
 void WXPerformBlockOnMainThread(void (^ _Nonnull block)(void))
 {
@@ -153,6 +154,16 @@ + (void)setUnregisterFontWhenCollision:(BOOL)value
     unregisterFontWhenCollision = value;
 }
 
++ (void)setListSectionRowThreadSafe:(BOOL)value
+{
+	listSectionRowThreadSafe = value;
+}
+
++ (BOOL)listSectionRowThreadSafe
+{
+	return listSectionRowThreadSafe;
+}
+
 + (void)performBlock:(void (^)(void))block onThread:(NSThread *)thread
 {
     if (!thread || !block) return;