Merge branch 'develop' into 'master'

Develop



See merge request !3
This commit is contained in:
Giuseppe Nucifora committed 2016-01-29 09:27:46 +00:00
commit fe8725c444
4 files changed
+17 -2

No files matched your search

+2
View File
@@ -50,6 +50,8 @@
[user setLastName:@"Sapienza"];
[user getJSONObject];
NSLog(@"%@",[PNUser PNObjClassName]);
//NSLog(@"%@",userDictionary);
/*
+4 -2
View File
@@ -99,9 +99,11 @@ static bool isFirstAccess = YES;
if (self) {
_deviceType = @"iOS";
_deviceModel = [[UIDevice currentDevice] model];
_osVersion = [[UIDevice currentDevice] systemVersion];;
_deviceName = [[UIDevice currentDevice] name];;
_osVersion = [[UIDevice currentDevice] systemVersion];
_deviceName = [[UIDevice currentDevice] name];
}
return self;
}
+2
View File
@@ -26,6 +26,8 @@
@interface PNObject : NSObject
+ (NSString * _Nonnull) PNObjClassName;
- (_Nullable instancetype) initWithJSON:( NSDictionary * _Nonnull) JSON;
- (id _Nonnull) saveLocally;
+9
View File
@@ -50,6 +50,15 @@
#pragma mark -
+ (NSString * _Nonnull) PNObjClassName {
if ([[self class] resolveClassMethod:@selector(objectClassName)]) {
return [[self class] objectClassName];
}
else {
return [[super class] objectClassName];
}
}
- (_Nullable instancetype) init {
self = [super init];