diff --git a/Sources/Earthquake Network/Models/EQNSisma.m b/Sources/Earthquake Network/Models/EQNSisma.m index 03f33f0..dc96717 100644 --- a/Sources/Earthquake Network/Models/EQNSisma.m +++ b/Sources/Earthquake Network/Models/EQNSisma.m @@ -35,7 +35,7 @@ self.intensity = info[@"it"]; self.place = info[@"pl"]; self.provider = info[@"pr"]; - self.date = [EQNUtility getDataFromString:info[@"dt"]]; + self.date = [EQNUtility getDateFromString:info[@"dt"]]; self.timeDifference = [info[@"di"] doubleValue]; self.magnitudeRange = info[@"mr"]; diff --git a/Sources/Earthquake Network/model/EQNPastquakes.m b/Sources/Earthquake Network/model/EQNPastquakes.m index bb306ee..f26c283 100644 --- a/Sources/Earthquake Network/model/EQNPastquakes.m +++ b/Sources/Earthquake Network/model/EQNPastquakes.m @@ -20,7 +20,7 @@ _users = info[@"users"]; _state = info[@"state"]; _code = info[@"code"]; - _date = [EQNUtility getDataFromString:info[@"date"]]; + _date = [EQNUtility getDateFromString:info[@"date"]]; _differencePas = info[@"difference"]; _intensity = info[@"intensity"]; } diff --git a/Sources/Earthquake Network/model/EQNSegnalazione.m b/Sources/Earthquake Network/model/EQNSegnalazione.m index d7dc512..df7af17 100644 --- a/Sources/Earthquake Network/model/EQNSegnalazione.m +++ b/Sources/Earthquake Network/model/EQNSegnalazione.m @@ -19,8 +19,7 @@ _ban = info[@"ban"]; _code = info[@"code"]; - // NSDate *dateServer = [dataFormatter dateFromString:info[@"data"]]; - _date = [EQNUtility getDataFromString:info[@"date"]]; + _date = [EQNUtility getDateFromString:info[@"date"]]; _differenceSeg = info[@"difference"]; _latitude = info[@"latitude"]; _longitude = info[@"longitude"]; diff --git a/Sources/Earthquake Network/model/EQNUtility.h b/Sources/Earthquake Network/model/EQNUtility.h index 66134fd..07bf803 100644 --- a/Sources/Earthquake Network/model/EQNUtility.h +++ b/Sources/Earthquake Network/model/EQNUtility.h @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN @interface EQNUtility : NSObject -+(NSDate *)getDataFromString:(NSString *)stringData; ++ (nullable NSDate *)getDateFromString:(NSString *)dateString; +(NSArray *)applicaFiltroWithTime:(EQNFiltriMappa )filtro withList:(NSArray *)list; +(void)writeArrayWithCustomObjToUserDefaults:(NSString *)keyName withArray:(NSArray *)myArray; +(void)writeArrayWithCustomObjToUserDefaults:(NSString *)keyName withDict:(NSDictionary *)myDict; diff --git a/Sources/Earthquake Network/model/EQNUtility.m b/Sources/Earthquake Network/model/EQNUtility.m index 669243f..dd1b83f 100644 --- a/Sources/Earthquake Network/model/EQNUtility.m +++ b/Sources/Earthquake Network/model/EQNUtility.m @@ -14,11 +14,11 @@ @implementation EQNUtility -+(NSDate *)getDataFromString:(NSString *)stringData{ - - NSDateFormatter *dataFormatter = [[NSDateFormatter alloc] init]; - [dataFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"]; - return [dataFormatter dateFromString:stringData]; ++ (NSDate *)getDateFromString:(NSString *)dateString +{ + NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; + [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"]; + return [formatter dateFromString:dateString]; } +(NSDate *)impostaFiltroWithTime:(EQNFiltriMappa )filtro{