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

iOS: fix blend viewModel error

Browse Source
This commit is contained in:
pengfei.zhou 2021-09-30 13:57:52 +08:00 committed by osborn
parent 46609aee4c
commit 9757a6e8c6
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
doric-iOS/Pod/Classes/Shader/DoricSuperNode.m
View File

@ -69,25 +69,24 @@ - (void)recursiveMixin:(NSDictionary *)srcModel to:(NSMutableDictionary *)target
NSDictionary *srcProp = srcModel[@"props"];
NSMutableDictionary *targetProp = targetModel[@"props"];
NSMutableArray *targetOri = targetProp[@"subviews"];
[srcProp enumerateKeysAndObjectsUsingBlock:^(NSString *key, id obj, BOOL *stop) {
if ([@"subviews" isEqualToString:key]) {
NSArray *subviews = obj;
if (subviews) {
for (NSDictionary *subview in subviews) {
NSString *viewId = subview[@"id"];
NSMutableArray *mutableTargetOri = [targetProp[@"subviews"] mutableCopy];
[mutableTargetOri enumerateObjectsUsingBlock:^(NSDictionary *obj, NSUInteger idx, BOOL *stop) {
if ([viewId isEqualToString:obj[@"id"]]) {
NSMutableDictionary *mutableDictionary = [obj mutableCopy];
[self recursiveMixin:subview to:mutableDictionary];
targetOri[idx] = [mutableDictionary copy];
*stop = YES;
}
}];
NSArray *srcSubviews = srcProp[@"subviews"];
if (srcSubviews && srcSubviews.count > 0) {
for (NSDictionary *subview in srcSubviews) {
NSString *viewId = subview[@"id"];
__block NSMutableDictionary *viewModel = nil;
[targetOri enumerateObjectsUsingBlock:^(NSMutableDictionary *obj, NSUInteger idx, BOOL *stop) {
if ([viewId isEqualToString:obj[@"id"]]) {
viewModel = obj;
*stop = YES;
}
}];
if (viewModel) {
[self recursiveMixin:subview to:viewModel];
}
} else {
}
}
[srcProp enumerateKeysAndObjectsUsingBlock:^(NSString *key, id obj, BOOL *stop) {
if (![@"subviews" isEqualToString:key]) {
targetProp[key] = obj;
}
}];