support long type under 32bit

CoderMJLee · CoderMJLee · commit d4c815d8f43b · 2015-09-11T14:26:28.000+08:00
diff --git a/MJExtension.podspec b/MJExtension.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MJExtension"
-  s.version      = "2.5.8"
+  s.version      = "2.5.10"
   s.ios.deployment_target = '6.0'
   s.osx.deployment_target = '10.8'
   s.summary      = "The fastest and most convenient conversion between JSON and model"
diff --git a/MJExtension/MJExtensionConst.m b/MJExtension/MJExtensionConst.m
@@ -10,7 +10,8 @@
 NSString *const MJPropertyTypeShort = @"s";
 NSString *const MJPropertyTypeFloat = @"f";
 NSString *const MJPropertyTypeDouble = @"d";
-NSString *const MJPropertyTypeLong = @"q";
+NSString *const MJPropertyTypeLong = @"l";
+NSString *const MJPropertyTypeLongLong = @"q";
 NSString *const MJPropertyTypeChar = @"c";
 NSString *const MJPropertyTypeBOOL1 = @"c";
 NSString *const MJPropertyTypeBOOL2 = @"b";
diff --git a/MJExtension/MJPropertyType.m b/MJExtension/MJPropertyType.m
@@ -54,7 +54,7 @@ - (void)setCode:(NSString *)code
     
     // 是否为数字类型
     NSString *lowerCode = _code.lowercaseString;
-    NSArray *numberTypes = @[MJPropertyTypeInt, MJPropertyTypeShort, MJPropertyTypeBOOL1, MJPropertyTypeBOOL2, MJPropertyTypeFloat, MJPropertyTypeDouble, MJPropertyTypeLong, MJPropertyTypeChar];
+    NSArray *numberTypes = @[MJPropertyTypeInt, MJPropertyTypeShort, MJPropertyTypeBOOL1, MJPropertyTypeBOOL2, MJPropertyTypeFloat, MJPropertyTypeDouble, MJPropertyTypeLong, MJPropertyTypeLongLong, MJPropertyTypeChar];
     if ([numberTypes containsObject:lowerCode]) {
         _numberType = YES;
         
diff --git a/MJExtensionExample/MJExtensionExample.xcodeproj/project.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate b/MJExtensionExample/MJExtensionExample.xcodeproj/project.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MJExtensionExample/MJExtensionExample/Classes/User.h b/MJExtensionExample/MJExtensionExample/Classes/User.h
@@ -21,7 +21,7 @@ typedef enum {
 /** 年龄 */
 @property (assign, nonatomic) unsigned int age;
 /** 身高 */
-@property (copy, nonatomic) NSString *height;
+@property (assign, nonatomic) float height;
 /** 财富 */
 @property (strong, nonatomic) NSNumber *money;
 /** 性别 */
diff --git a/MJExtensionExample/MJExtensionExample/main.m b/MJExtensionExample/MJExtensionExample/main.m
@@ -77,7 +77,7 @@ void keyValues2object()
     User *user = [User objectWithKeyValues:dict];
 
     // 3.打印User模型的属性
-    NSLog(@"name=%@, icon=%@, age=%zd, height=%@, money=%@, sex=%d, gay=%d", user.name, user.icon, user.age, user.height, user.money, user.sex, user.gay);
+    NSLog(@"name=%@, icon=%@, age=%zd, height=%f, money=%@, sex=%d, gay=%d", user.name, user.icon, user.age, user.height, user.money, user.sex, user.gay);
 }
 
 /**
@@ -349,7 +349,7 @@ void coreData()
         // 利用CoreData保存模型
         [context save:nil];
         
-        NSLog(@"name=%@, icon=%@, age=%zd, height=%@, money=%@, sex=%d, gay=%d", user.name, user.icon, user.age, user.height, user.money, user.sex, user.gay);
+        NSLog(@"name=%@, icon=%@, age=%zd, height=%f, money=%@, sex=%d, gay=%d", user.name, user.icon, user.age, user.height, user.money, user.sex, user.gay);
     } @catch (NSException *e) {
     
     }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ void keyValues2object()`
`77`	`77`	`User *user = [User objectWithKeyValues:dict];`
`78`	`78`
`79`	`79`	`// 3.打印User模型的属性`
`80`		`- NSLog(@"name=%@, icon=%@, age=%zd, height=%@, money=%@, sex=%d, gay=%d", user.name, user.icon, user.age, user.height, user.money, user.sex, user.gay);`
	`80`	`+ NSLog(@"name=%@, icon=%@, age=%zd, height=%f, money=%@, sex=%d, gay=%d", user.name, user.icon, user.age, user.height, user.money, user.sex, user.gay);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/**`
`@@ -349,7 +349,7 @@ void coreData()`
`349`	`349`	`// 利用CoreData保存模型`
`350`	`350`	`[context save:nil];`
`351`	`351`
`352`		`- NSLog(@"name=%@, icon=%@, age=%zd, height=%@, money=%@, sex=%d, gay=%d", user.name, user.icon, user.age, user.height, user.money, user.sex, user.gay);`
	`352`	`+ NSLog(@"name=%@, icon=%@, age=%zd, height=%f, money=%@, sex=%d, gay=%d", user.name, user.icon, user.age, user.height, user.money, user.sex, user.gay);`
`353`	`353`	`} @catch (NSException *e) {`
`354`	`354`
`355`	`355`	`}`