日期解析 fix

Author: wanghengheng

Coding_iOS/Coding_Enterprise_iOS-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.9.7</string>
+	<string>2.9.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -28,7 +28,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.9.7.20181022.3</string>
+	<string>2.9.8.20181031.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

Coding_iOS/Coding_iOS-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.4.2</string>
+	<string>5.4.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5.4.2.20181022.3</string>
+	<string>5.4.3.20181031.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

Coding_iOS/Util/OC_Category/NSObject+ObjectMap.h

@@ -11,6 +11,7 @@
 
 #define OMDateFormat @"yyyy-MM-dd'T'HH:mm:ss.SSS"
 #define OMTimeZone @"UTC"
+#define EADateFormat @"yyyy-MM-dd HH:mm:ss"
 
 @interface NSObject (ObjectMap)
 
@@ -52,4 +53,4 @@
 @interface SOAPObject : NSObject
 @property (nonatomic, retain) id Header;
 @property (nonatomic, retain) id Body;
-@end
+@end

Coding_iOS/Util/OC_Category/NSObject+ObjectMap.m

@@ -187,6 +187,27 @@ -(id)getNodeValue:(NSString *)node fromXML:(NSString *)xml {
 }
 
 #pragma mark - Dictionary to Object
++ (NSDate *)p_dateFromObj:(id)obj{
+    NSDate *date;
+    if ([obj isKindOfClass:[NSNumber class]]) {
+        //                1970年的long型数字
+        NSNumber *timeSince1970 = (NSNumber *)obj;
+        NSTimeInterval timeSince1970TimeInterval = timeSince1970.doubleValue/1000;
+        date = [NSDate dateWithTimeIntervalSince1970:timeSince1970TimeInterval];
+    }else if ([obj isKindOfClass:[NSString class]]){
+        //                            日期字符串
+        NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+        [formatter setDateFormat:OMDateFormat];
+        [formatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:OMTimeZone]];
+        date = [formatter dateFromString:(NSString *)obj];
+        if (!date) {
+            [formatter setDateFormat:EADateFormat];
+            date = [formatter dateFromString:(NSString *)obj];
+        }
+    }
+    return date;
+}
+
 +(id)objectOfClass:(NSString *)object fromJSON:(NSDictionary *)dict {
     if (!dict || ![dict isKindOfClass:[NSDictionary class]]) {
         return nil;
@@ -231,21 +252,7 @@ +(id)objectOfClass:(NSString *)object fromJSON:(NSDictionary *)dict {
 
             // check if NSDate or not
             if ([classType isEqualToString:@"T@\"NSDate\""]) {
-//                1970年的long型数字
-                NSObject *obj = [dict objectForKey:key];
-                if ([obj isKindOfClass:[NSNumber class]]) {
-                    NSNumber *timeSince1970 = (NSNumber *)obj;
-                    NSTimeInterval timeSince1970TimeInterval = timeSince1970.doubleValue/1000;
-                    NSDate *date = [NSDate dateWithTimeIntervalSince1970:timeSince1970TimeInterval];
-                    [newObject setValue:date forKey:propertyName];
-                }else{
-//                            日期字符串
-                    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
-                    [formatter setDateFormat:OMDateFormat];
-                    [formatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:OMTimeZone]];
-                    NSString *dateString = [[dict objectForKey:key] stringByReplacingOccurrencesOfString:@"T" withString:@" "];
-                    [newObject setValue:[formatter dateFromString:dateString] forKey:propertyName];
-                }
+                [newObject setValue:[self p_dateFromObj:[dict objectForKey:key]] forKey:propertyName];
             }
             else {
                 if ([dict objectForKey:key] != [NSNull null]) {
@@ -370,22 +377,7 @@ +(NSMutableArray *)arrayMapFromArray:(NSArray *)nestedArray forPropertyName:(NSS
                     NSString *classType = [self typeFromProperty:property];
                     // check if NSDate or not
                     if ([classType isEqualToString:@"T@\"NSDate\""]) {
-//                        1970年的long型数字
-                        NSObject *obj = [nestedArray[xx] objectForKey:newKey];
-                        if ([obj isKindOfClass:[NSNumber class]]) {
-                            NSNumber *timeSince1970 = (NSNumber *)obj;
-                            NSTimeInterval timeSince1970TimeInterval = timeSince1970.doubleValue/1000;
-                            NSDate *date = [NSDate dateWithTimeIntervalSince1970:timeSince1970TimeInterval];
-                            [nestedObj setValue:date forKey:tempNewKey];
-                        }else{
-//                            日期字符串
-                            NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
-                            [formatter setDateFormat:OMDateFormat];
-                            [formatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:OMTimeZone]];
-                            
-                            NSString *dateString = [[nestedArray[xx] objectForKey:newKey] stringByReplacingOccurrencesOfString:@"T" withString:@" "];
-                            [nestedObj setValue:[formatter dateFromString:dateString] forKey:tempNewKey];
-                        }
+                        [nestedObj setValue:[self p_dateFromObj:[nestedArray[xx] objectForKey:newKey]] forKey:tempNewKey];
                     }
                     else {
                         [nestedObj setValue:[nestedArray[xx] objectForKey:newKey] forKey:tempNewKey];