tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat:avoid iOS dealloc JSValue in main thread,this may cause crash in JavaScriptCore

Browse Source
This commit is contained in:
pengfeizhou 2021-01-06 11:56:30 +08:00 committed by osborn
parent 967ad27a22
commit 2100eff054
7 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doric-iOS/Example/Example/ViewController.m
View File

@ -23,6 +23,7 @@ @implementation ViewController
- (void)viewDidLoad {
[super viewDidLoad];
self.title = @"Doric Demo";
[self.navigationController.navigationBar setBackgroundImage:UIImageWithColor(UIColor.whiteColor) forBarMetrics:UIBarMetricsDefault];
NSString *path = [[NSBundle mainBundle] bundlePath];
NSString *demoPath = [path stringByAppendingPathComponent:@"src"];
NSFileManager *mgr = [NSFileManager defaultManager];

2
doric-iOS/Pod/Classes/Plugin/DoricNavigatorPlugin.m
View File

@ -62,4 +62,4 @@ - (void)openUrl:(NSString *)urlString withPromise:(DoricPromise *)promise {
}];
});
}
@end
@end

5
doric-iOS/Pod/Classes/Shader/DoricFlowLayoutNode.m
View File

@ -237,8 +237,9 @@ - (NSDictionary *)itemModelAt:(NSUInteger)position {
return [self subModelOf:viewId];
} else {
DoricAsyncResult *result = [self callJSResponse:@"renderBunchedItems", @(position), @(self.batchCount), nil];
JSValue *models = [result waitUntilResult];
NSArray *array = [models toArray];
NSArray *array = [result waitUntilResult:^(JSValue *models) {
return [models toArray];
}];
[array enumerateObjectsUsingBlock:^(NSDictionary *obj, NSUInteger idx, BOOL *stop) {
NSString *thisViewId = obj[@"id"];
[self setSubModel:obj in:thisViewId];

5
doric-iOS/Pod/Classes/Shader/DoricListNode.m
View File

@ -178,8 +178,9 @@ - (NSDictionary *)itemModelAt:(NSUInteger)position {
batchCount++;
}
DoricAsyncResult *result = [self callJSResponse:@"renderBunchedItems", @(start), @(batchCount), nil];
JSValue *models = [result waitUntilResult];
NSArray *array = [models toArray];
NSArray *array = [result waitUntilResult:^(JSValue *models) {
return [models toArray];
}];
[array enumerateObjectsUsingBlock:^(NSDictionary *obj, NSUInteger idx, BOOL *stop) {
NSString *thisViewId = obj[@"id"];
[self setSubModel:obj in:thisViewId];

5
doric-iOS/Pod/Classes/Shader/DoricSliderNode.m
View File

@ -164,8 +164,9 @@ - (NSDictionary *)itemModelAt:(NSUInteger)position {
return [self subModelOf:viewId];
} else {
DoricAsyncResult *result = [self callJSResponse:@"renderBunchedItems", @(index), @(self.batchCount), nil];
JSValue *models = [result waitUntilResult];
NSArray *array = [models toArray];
NSArray *array = [result waitUntilResult:^(JSValue *models) {
return [models toArray];
}];
[array enumerateObjectsUsingBlock:^(NSDictionary *obj, NSUInteger idx, BOOL *stop) {
NSString *thisViewId = obj[@"id"];
[self setSubModel:obj in:thisViewId];

4
doric-iOS/Pod/Classes/Util/DoricAsyncResult.h
View File

@ -24,7 +24,6 @@
NS_ASSUME_NONNULL_BEGIN
@interface DoricAsyncResult <R> : NSObject
@property(nonatomic, strong) void (^resultCallback)(R result);
@property(nonatomic, strong) void (^exceptionCallback)(NSException *e);
@ -39,6 +38,9 @@ NS_ASSUME_NONNULL_BEGIN
- (R)getResult;
- (R)waitUntilResult;
- (id)waitUntilResult:(id (^)(R result))transformer;
@end
NS_ASSUME_NONNULL_END

15
doric-iOS/Pod/Classes/Util/DoricAsyncResult.m
View File

@ -89,4 +89,19 @@ - (id)waitUntilResult {
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
return self.result;
}
- (id)waitUntilResult:(id (^)(id result))transformer {
if (self.result) {
return transformer(self.result);
}
__block id ret = nil;
dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
self.resultCallback = ^(id r) {
ret = transformer(r);
dispatch_semaphore_signal(semaphore);
};
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
return ret;
}
@end