- Fix
This commit is contained in:
parent
520b729123
commit
13801d0aa3
@ -33,7 +33,7 @@ PODS:
|
||||
- FBSDKShareKit (4.18.0):
|
||||
- FBSDKCoreKit
|
||||
- NSDataAES (0.2.2)
|
||||
- NSDate_Utils (1.0.0)
|
||||
- NSDate_Utils (1.0.1)
|
||||
- NSString-Helper (1.0.5)
|
||||
- nv-ios-http-status (0.0.1)
|
||||
- PEAR-FileManager-iOS (1.3.1)
|
||||
@ -80,7 +80,7 @@ SPEC CHECKSUMS:
|
||||
FBSDKLoginKit: 6773073e970b2b15fb12e451ce7f11da0532b880
|
||||
FBSDKShareKit: 0b8d6cc3f103c75297eb3c62caec284a2ccf1b9e
|
||||
NSDataAES: 967ea3337476a80e9838a533c25d570a06855ed0
|
||||
NSDate_Utils: 45d47afab329001ccafe056308d0cc05460e5298
|
||||
NSDate_Utils: b451375dcbf9099a444c32de029c4498a5e7d58e
|
||||
NSString-Helper: 459e1b6a62b3bf7db10f01b0d102548608e945c4
|
||||
nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f
|
||||
PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3
|
||||
|
||||
4
Example/Pods/Manifest.lock
generated
4
Example/Pods/Manifest.lock
generated
@ -33,7 +33,7 @@ PODS:
|
||||
- FBSDKShareKit (4.18.0):
|
||||
- FBSDKCoreKit
|
||||
- NSDataAES (0.2.2)
|
||||
- NSDate_Utils (1.0.0)
|
||||
- NSDate_Utils (1.0.1)
|
||||
- NSString-Helper (1.0.5)
|
||||
- nv-ios-http-status (0.0.1)
|
||||
- PEAR-FileManager-iOS (1.3.1)
|
||||
@ -80,7 +80,7 @@ SPEC CHECKSUMS:
|
||||
FBSDKLoginKit: 6773073e970b2b15fb12e451ce7f11da0532b880
|
||||
FBSDKShareKit: 0b8d6cc3f103c75297eb3c62caec284a2ccf1b9e
|
||||
NSDataAES: 967ea3337476a80e9838a533c25d570a06855ed0
|
||||
NSDate_Utils: 45d47afab329001ccafe056308d0cc05460e5298
|
||||
NSDate_Utils: b451375dcbf9099a444c32de029c4498a5e7d58e
|
||||
NSString-Helper: 459e1b6a62b3bf7db10f01b0d102548608e945c4
|
||||
nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f
|
||||
PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3
|
||||
|
||||
@ -523,12 +523,10 @@ static NSDateFormatter *_displayFormatter = nil;
|
||||
|
||||
[dateFormatter setDateFormat:dateFormat];
|
||||
|
||||
NSDate *theDate = nil;
|
||||
NSError *error = nil;
|
||||
if (![dateFormatter getObjectValue:&theDate forString:dateString range:nil error:&error]) {
|
||||
NSLog(@"Date '%@' could not be parsed: %@", dateString, error);
|
||||
}
|
||||
else {
|
||||
NSDate *theDate = [NSDate dateFromString:dateString withFormat:dateFormat];
|
||||
|
||||
if (theDate) {
|
||||
|
||||
return dateFormat;
|
||||
}
|
||||
}
|
||||
|
||||
@ -432,9 +432,21 @@ NSString * const PNObjectMappingSelector = @"selector";
|
||||
[JSONFormObject setValue:@(val) forKey:propertyName];
|
||||
},
|
||||
@"NSDate" : ^{
|
||||
NSString *val = [[value toLocalTime] stringWithFormat:kNSDateHelperFormatSQLDateWithTime];
|
||||
if (![self isObjNull:val]) {
|
||||
[JSONFormObject setValue:val forKey:propertyName];
|
||||
NSDate *val;
|
||||
|
||||
if ([value isKindOfClass:[NSString class]]) {
|
||||
|
||||
NSString *str = [NSString stringWithFormat:@"%@", value];
|
||||
NSString *dateFormat = [NSDate parseDateFormatFromString:str];
|
||||
|
||||
if (dateFormat == nil) {
|
||||
dateFormat = kNSDateHelperFormatSQLDateWithTime;
|
||||
}
|
||||
|
||||
val = [[NSDate dateFromString:str withFormat:dateFormat] toLocalTime];
|
||||
}
|
||||
else {
|
||||
val = [value toLocalTime];
|
||||
}
|
||||
},
|
||||
@"NSArray" : ^{
|
||||
|
||||
@ -145,7 +145,7 @@ typedef NS_ENUM(NSInteger, OAuthMode) {
|
||||
- (void) setClientID:(NSString * _Nonnull) clientID clientSecret:(NSString* _Nonnull) clientSecret forEnv:(NSString * _Nonnull) environment;
|
||||
|
||||
|
||||
- (void) setOauthUserName:(NSString * _Nonnull)oauthUserName oauthPassword:(NSString* _Nonnull) oauthPassword forEnv:(NSString *) environment;
|
||||
- (void) setOauthUserName:(NSString * _Nonnull)oauthUserName oauthPassword:(NSString* _Nonnull) oauthPassword forEnv:(NSString * _Nonnull) environment;
|
||||
|
||||
/**
|
||||
* <#Description#>
|
||||
|
||||
@ -146,8 +146,6 @@ static bool isFirstAccess = YES;
|
||||
|
||||
if ([_fileManager checkPath:className]) {
|
||||
|
||||
NSError *error = nil;
|
||||
|
||||
NSData *data = [[_fileManager fetchFileDataWithPath:className] aes_decrypt:[DDDKeychainWrapper dataForKey: PNObjectEncryptionKey]];
|
||||
|
||||
return [NSKeyedUnarchiver unarchiveObjectWithData:data];
|
||||
@ -162,8 +160,6 @@ static bool isFirstAccess = YES;
|
||||
|
||||
BOOL isPNObjectSubclass = [[object class] isSubclassOfClass:[PNObject class]];
|
||||
|
||||
NSError *error = nil;
|
||||
|
||||
if(isPNObjectSubclass) {
|
||||
|
||||
if ([[object class] conformsToProtocol:@protocol(PNObjectSubclassing)]) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user