Skip to content

Commit 69e11e4

Browse files
committed
分开处理NSDecimalNumber和NSNumber
1 parent e796518 commit 69e11e4

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

MJExtension.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MJExtension"
3-
s.version = "3.0.8"
3+
s.version = "3.0.9"
44
s.ios.deployment_target = '6.0'
55
s.osx.deployment_target = '10.8'
66
s.summary = "A fast and convenient conversion between JSON and model"

MJExtension/NSObject+MJKeyValue.m

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ + (BOOL)mj_isReferenceReplacedKeyWhenCreatingKeyValues
5353
}
5454

5555
#pragma mark - --常用的对象--
56+
static NSNumberFormatter *numberFormatter_;
5657
+ (void)load
5758
{
59+
numberFormatter_ = [[NSNumberFormatter alloc] init];
60+
5861
// 默认设置
5962
[self mj_referenceReplacedKeyWhenCreatingKeyValues:YES];
6063
}
@@ -156,7 +159,11 @@ - (instancetype)mj_setKeyValues:(id)keyValues context:(NSManagedObjectContext *)
156159
NSString *oldValue = value;
157160

158161
// NSString -> NSNumber
159-
value = [NSDecimalNumber decimalNumberWithString:oldValue];
162+
if (type.class == [NSDecimalNumber class]) {
163+
value = [NSDecimalNumber decimalNumberWithString:oldValue];
164+
} else {
165+
value = [numberFormatter_ numberFromString:oldValue];
166+
}
160167

161168
// 如果是BOOL
162169
if (type.isBoolType) {

0 commit comments

Comments
 (0)