Fix YYModel Issue。

See <ibireme/YYModel#281>
Andy0570 · Jul 27, 2021 · 5a635dc · 5a635dc
1 parent d724d65
commit 5a635dc
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/YYKit/Model/NSObject+YYModel.m b/YYKit/Model/NSObject+YYModel.m
@@ -902,6 +902,29 @@ static void ModelSetValueForProperty(__unsafe_unretained id model,
                             for (id one in valueArr) {
                                 if ([one isKindOfClass:meta->_genericCls]) {
                                     [objectArr addObject:one];
+                                } else if (meta->_genericCls == [NSString class]) {
+                                    if ([one isKindOfClass:[NSNumber class]]) {
+                                        [objectArr addObject:((NSNumber *)one).stringValue];
+                                    }
+                                } else if (meta->_genericCls == [NSMutableString class]) {
+                                    if ([one isKindOfClass:[NSString class]]) {
+                                        [objectArr addObject:((NSString *)one).mutableCopy];
+                                    } else if ([one isKindOfClass:[NSNumber class]]) {
+                                        [objectArr addObject:((NSNumber *)one).stringValue.mutableCopy];
+                                    }
+                                } else if (meta->_genericCls == [NSNumber class]) {
+                                    [objectArr addObject:YYNSNumberCreateFromID(one)];
+                                } else if (meta->_genericCls == [NSURL class]) {
+                                    if ([one isKindOfClass:[NSURL class]]) {
+                                        [objectArr addObject:[NSURL URLWithString:one]];
+                                    } else if ([one isKindOfClass:[NSString class]]) {
+                                        NSCharacterSet *set = [NSCharacterSet whitespaceAndNewlineCharacterSet];
+                                        NSString *str = [one stringByTrimmingCharactersInSet:set];
+                                        if (str.length == 0) {
+                                        } else {
+                                            [objectArr addObject:[[NSURL alloc] initWithString:str]];
+                                        }
+                                    }
                                 } else if ([one isKindOfClass:[NSDictionary class]]) {
                                     Class cls = meta->_genericCls;
                                     if (meta->_hasCustomClassFromDictionary) {