加入了对数组的处理

wcxdell · Jun 21, 2016 · 9c2a4d5 · 9c2a4d5
1 parent ebfcf4c
commit 9c2a4d5
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 6 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/...odeproj/project.xcworkspace/xcuserdata/wcxdell.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/wcxdell.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/CXModelExample/CXProperty.h b/CXModelExample/CXProperty.h
@@ -14,6 +14,7 @@ typedef NS_ENUM(NSUInteger,CXPropertyType){
     CXPropertyTypeNumber = 0,
     CXPropertyTypeSystem,
     CXPropertyTypeDate,
+    CXPropertyTypeArray,
     CXPropertyTypeCustom
 };
 

diff --git a/CXModelExample/CXProperty.m b/CXModelExample/CXProperty.m
@@ -35,6 +35,8 @@ + (instancetype) initWithProperty:(objc_property_t) property{
         NSString *tmp = [typeString substringWithRange:NSMakeRange(2, typeString.length - 3)];
         if ([tmp isEqualToString:@"NSDate"]) {
             cxProperty.type = CXPropertyTypeDate;
+        }else if([tmp isEqualToString:@"NSArray"]){
+            cxProperty.type = CXPropertyTypeArray;
         }else if ([systemClass containsObject:NSClassFromString(tmp)]){
             cxProperty.type = CXPropertyTypeSystem;
         }else{

diff --git a/CXModelExample/NSObject+CXModel.h b/CXModelExample/NSObject+CXModel.h
@@ -10,4 +10,5 @@
 
 @interface NSObject (CXModel)
 + (instancetype) objectWithJSON:(id) json;
++ (NSArray*) arrayWithJSON:(id) json;
 @end
diff --git a/CXModelExample/NSObject+CXModel.m b/CXModelExample/NSObject+CXModel.m
@@ -23,6 +23,22 @@ + (instancetype) objectWithJSON:(id) json{
     return [object setProperties:json];
 }
 
++ (NSArray *)arrayWithJSON:(id)json{
+    json = [json getDic];
+    if (!json || json == [NSNull null]) return nil;
+
+    NSMutableArray *array = [NSMutableArray array];
+
+    for (NSDictionary *dic in json) {
+        if ([dic isKindOfClass:[NSArray class]]) {
+            [array addObject:[self arrayWithJSON:dic]];
+        }else{
+            [array addObject:[self objectWithJSON:dic]];
+        }
+    }
+    return array;
+}
+
 - (instancetype) setProperties:(NSDictionary*)dic{
 
     //获取属性列表
@@ -35,10 +51,10 @@ - (instancetype) setProperties:(NSDictionary*)dic{
 
         if (property.type == CXPropertyTypeDate) {
             value = CXNSDateFromString(value);
-        }
-
-        if (property.type == CXPropertyTypeCustom) {
+        }else if (property.type == CXPropertyTypeCustom) {
             value = [property.typeClass objectWithJSON:value];
+        }else if (property.type == CXPropertyTypeArray){
+            //TODO:字典中的数组需要用户自己指定类型，用协议实现
         }
 
         if (!value || value == [NSNull null]) {

diff --git a/CXModelExample/Student.h b/CXModelExample/Student.h
@@ -15,4 +15,5 @@
 @property (nonatomic, assign) double doubleProperty;
 @property (nonatomic, strong) NSDate *date;
 @property (nonatomic, strong) Student *smallStudent;
+@property (nonatomic, strong) NSArray *studentArray;
 @end
diff --git a/CXModelExample/ViewController.m b/CXModelExample/ViewController.m
@@ -29,12 +29,40 @@ - (void)viewDidLoad {
                           @"smallStudent":@{
                                   @"name":@"changxu",
                                   @"age":@24
-                                  }
+                                  },
+                          @"studentArray":@[
+                                  @{
+                                      @"name":@"changxu",
+                                      @"studentId":@"2015"
+                                      },
+                                  @{
+                                      @"age":@14,
+                                      @"date":@"1992-02-18"
+                                      }
+                                  ]
                           };
-    Student *student = [Student objectWithJSON:dic];
 
-    NSLog(@"%g",student.doubleProperty);
 
+        Student *student = [Student objectWithJSON:dic];
+
+
+        NSLog(@"%g",student.doubleProperty);
+
+//    NSArray *array = @[
+//                       @{
+//                           @"name":@"changxu",
+//                           @"studentId":@"2015"
+//                           },
+//                       @{
+//                           @"age":@14,
+//                           @"date":@"1992-02-18"
+//                           }
+//                       ];
+//    
+//
+//    
+//    NSArray *studentArray = [Student arrayWithJSON:array];
+//    NSLog(@"%@",studentArray);
 }
 
 - (void)didReceiveMemoryWarning {