- Fix
This commit is contained in:
1 parent
520b729123
commit
13801d0aa3
6 files changed
+24
-18
No files matched your search
@@ -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)]) {
|
||||
|
||||
Reference in new issue
Block a user