Commit 64889a61 authored by Vincent's avatar Vincent

Version 2.0.1

parent f919fd0a
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'APMServices'
s.version = '2.0.0'
s.version = '2.0.1'
s.summary = 'app\'s miles® boosts your app\'s usage'
# This description is used to generate tags and improve search results.
......
......@@ -10,6 +10,7 @@
@interface APMHowWorks : APMModel<NSCoding, NSCopying>
@property(nonatomic, assign) NSInteger identifiant;
@property(nonatomic, strong) NSString *label;
@property(nonatomic, strong) NSString *content;
@property(nonatomic, assign) NSInteger type;
......@@ -17,6 +18,15 @@
@property(nonatomic, strong) NSMutableArray* gifts; //For type gifts
@property(nonatomic, assign) NSInteger target; //0 : Not connected, 1 : Connected, 2 : Connected and not connected
//Local
@property(nonatomic, strong) NSDate *viewedAt;
@property(nonatomic, assign) NSInteger count;
-(id)initWithJSONObject:(NSDictionary*)jsonObject;
#pragma mark - Others
-(void)view:(BOOL)userConnected;
-(BOOL)isViewed;
@end
......@@ -11,7 +11,6 @@
@interface APMProg : APMModel<NSCoding, NSCopying>
@property (nonatomic, assign) BOOL isActive;
@property (nonatomic, strong) NSString *progInfoMsg;
@property (nonatomic, assign) NSInteger offDuration; //Red button to off tag, in hours
@property (nonatomic, strong) NSDate *offDurationEndDate;
@property (nonatomic, assign) NSInteger progTTL; //Time to live, in seconds
......
......@@ -8,8 +8,8 @@
// Version of API
#define APM_API_VERSION @"3.0"
#define APM_SERVICES_VERSION_NAME @"2.0.0"
#define APM_SERVICES_VERSION_CODE @"2000"
#define APM_SERVICES_VERSION_NAME @"2.0.1"
#define APM_SERVICES_VERSION_CODE @"2010"
//URL
#define APM_URL_API_PROD @"https://api.appsmiles.eu/" //Url API prod
......
......@@ -16,6 +16,7 @@
#define APM_K_VERSION @"version"
#define APM_K_APPID @"appID"
#define APM_K_LANG @"lang"
#define APM_K_COUNTRY_CODE @"countryCode"
#define APM_K_DEFAULT_LANGUAGE @"defaultLanguage"
#define APM_K_OS @"osType"
#define APM_K_DEVICE_NAME @"device_name"
......@@ -100,7 +101,6 @@
#define APM_K_PROG @"prog"
#define APM_K_PROG_ISACTIVE @"isActive"
#define APM_K_PROG_OFFDURATION @"offDuration"
#define APM_K_PROG_INFOMSG @"progInfoMsg"
#define APM_K_PROG_TTL @"progTTL"
#define APM_K_PROG_OFFDURATION_END_DATE @"offDurationEndDate"
#define APM_K_PROG_TTL_END_DATE @"progTTLEndDate"
......@@ -125,7 +125,6 @@
#define APM_K_GENEROSITY_LAT @"lat"
#define APM_K_GENEROSITY_LNG @"long"
#define APM_K_GENEROSITY_NEXT @"generosityNext"
#define APM_K_GENEROSITY_FIRST @"generosityFirst"
#define APM_K_GENEROSITY_GET_NEXT_TAG @"getNextTag"
#define APM_K_GENEROSITY_TRIGGED_AT @"triggedAt"
#define APM_K_GENEROSITY_OFFSET @"generosityOffset"
......@@ -184,12 +183,15 @@
// HowWorks keys
#define APM_K_HOW_WORKS_LIST @"howworks"
#define APM_K_HOW_WORKS_ID @"pageId"
#define APM_K_HOW_WORKS_LABEL @"label"
#define APM_K_HOW_WORKS_CONTENT @"content"
#define APM_K_HOW_WORKS_TYPE @"type"
#define APM_K_HOW_WORKS_ACTIONS @"actions"
#define APM_K_HOW_WORKS_GIFTS @"gifts"
#define APM_K_HOW_WORKS_TARGET @"isConnected"
#define APM_K_HOW_WORKS_VIEWED_AT @"viewedAt"
#define APM_K_HOW_WORKS_COUNT @"count"
// Walkthrough keys
#define APM_K_WALKTHROUGH_LIST @"walkthrough"
......
......@@ -21,9 +21,14 @@
-(NSMutableArray*)getPagesWithRubric:(NSInteger)rubric;
-(NSMutableArray*)getPagesWithRubric:(NSInteger)rubric userConnected:(BOOL)userConnected;
-(BOOL)canShowPages:(NSInteger)rubric;
-(BOOL)canShowPages:(NSInteger)rubric userConnected:(BOOL)userConnected;
-(BOOL)pagesExists:(NSInteger)rubric;
-(void)savePagesShowed:(NSInteger)rubric;
-(void)savePagesViewed:(NSInteger)rubric;
-(void)savePagesViewed:(NSInteger)rubric userConnected:(BOOL)userConnected;
-(BOOL)isViewedWithPages:(NSMutableArray*)pages;
-(NSInteger)nbViewWithPages:(NSArray*)pages;
-(void)successPagesWithRubric:(NSInteger)rubric result:(NSDictionary*)result;
-(void)removePages:(NSInteger)rubric;
-(void)resetAll;
@end
......@@ -11,20 +11,6 @@
+(NSInteger) getPartnerLevel;
+(void) setPartnerLevel:(NSInteger)value;
#pragma mark - How It Works
+(BOOL) isHowWorksConnectedShowed;
+(void) setHowWorksConnectedShowed:(BOOL)value;
+(BOOL) isHowWorksNotConnectedShowed;
+(void) setHowWorksNotConnectedShowed:(BOOL)value;
#pragma mark - Onboarding
+(BOOL) isOnboardingConnectedShowed;
+(void) setOnboardingConnectedShowed:(BOOL)value;
+(BOOL) isOnboardingNotConnectedShowed;
+(void) setOnboardingNotConnectedShowed:(BOOL)value;
+(BOOL) isServerDebugMode;
+(void) setServerDebugMode:(BOOL)value;
......
......@@ -17,7 +17,7 @@
+(void)userClientConnectPendingConnectionInfoWithUserConnectSuccess:(void (^)(APMUser* user))userConnectSuccess failure:(void (^)(NSError* error))failure;
+(void)userClientConnect:(NSDictionary*)dictionaryUser userConnectSuccess:(void (^)(APMUser* user))userConnectSuccess failure:(void (^)(NSError* error))failure;
+(void)userClientConnect:(NSString*)email partnerClientId:(NSString*)partnerClientId optIn:(NSNumber*)optIn userConnectSuccess:(void (^)(APMUser* user))userConnectSuccess failure:(void (^)(NSError* error))failure;
+(void)userClientConnect:(NSString*)firstname lastname:(NSString*)lastname email:(NSString*)email password:(NSString*)password facebookId:(NSString*)facebookId partnerClientId:(NSString*)partnerClientId oldClientId:(NSString*)oldClientId segments:(NSDictionary*)segments optIn:(NSNumber*)optIn userConnectSuccess:(void (^)(APMUser* user))userConnectSuccess failure:(void (^)(NSError* error))failure;
+(void)userClientConnect:(NSString*)firstname lastname:(NSString*)lastname email:(NSString*)email facebookId:(NSString*)facebookId partnerClientId:(NSString*)partnerClientId oldClientId:(NSString*)oldClientId segments:(NSDictionary*)segments optIn:(NSNumber*)optIn userConnectSuccess:(void (^)(APMUser* user))userConnectSuccess failure:(void (^)(NSError* error))failure;
+(void)userLogout:(void (^)())userLogoutSuccess failure:(void (^)(NSError* error))failure;
+(void)userCreate:(NSString*)firstname lastname:(NSString*)lastname email:(NSString*)email password:(NSString*)password facebookId:(NSString*)facebookId segments:(NSDictionary*)segments userCreateSuccess:(void (^)(APMUser* user))userCreateSuccess failure:(void (^)(NSError* error))failure;
......
......@@ -45,6 +45,7 @@
+(NSComparisonResult)systemVersionXcodeLessThan:(NSString*)v;
+(NSMutableParagraphStyle*)createStyle:(CGFloat)lineHeightMultiple lineSpacing:(CGFloat)lineSpacing;
+(void)copy:(NSString*)copy;
+(NSString*)getCountryCode;
+(NSString*)getLanguageCode;
+(UIView*)getCellFromCollectionView:(UIView*)tableView indexPath:(NSIndexPath*)indexPath;
+(UIColor*)uiColorFromHexaColor:(NSString*)hexaValue;
......
......@@ -58,7 +58,7 @@
+(void)userSavePushToken:(NSString*)userToken registrationId:(NSString*)registrationId success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userSavePushToken:(NSString*)userToken params:(NSDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userClientCheckCredentials:(NSString*)login pwd:(NSString*)pwd firstname:(NSString*)firstname lastname:(NSString*)lastname partnerClientId:(NSString*)partnerClientId oldClientId:(NSString*)oldClientId facebookId:(NSString*)facebookId segments:(NSDictionary*)segments success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userClientCheckCredentials:(NSString*)login firstname:(NSString*)firstname lastname:(NSString*)lastname partnerClientId:(NSString*)partnerClientId oldClientId:(NSString*)oldClientId facebookId:(NSString*)facebookId segments:(NSDictionary*)segments success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userClientCheckCredentials:(NSDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userClientSave:(NSString*)userToken email:(NSString*)email firstname:(NSString*)firstname lastname:(NSString*)lastname mobile:(NSString*)mobile gender:(NSString*)gender birthday:(NSString*)birthday city:(NSString*)city facebookId:(NSString*)facebookId partnerClientId:(NSString*)partnerClientId segments:(NSDictionary*)segments success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
......@@ -123,4 +123,6 @@
+(void)callHttp:(NSString*)url success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(NSString*)createUserAgent;
@end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment