Commit adaaa81a authored by Vincent's avatar Vincent

Version 2.1.1

parent 984de732
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'APMServices'
s.version = '2.1.0'
s.version = '2.1.1'
s.summary = 'app\'s miles® boosts your app\'s usage'
# This description is used to generate tags and improve search results.
......
//
// APMCategoryTrophyUtils.h
// APMCategoriesTrophyUtils.h
// APMServices
//
// Created by Vincent Ducastel on 09/01/2017.
......@@ -10,8 +10,9 @@
@class APMCategoryTrophy;
@interface APMCategoryTrophyUtils : NSObject
@interface APMCategoriesTrophyUtils : NSObject
+(APMCategoryTrophy*)categoryTrophyFromId:(NSInteger)identifiant withCategoriesTrophy:(NSMutableArray*)array;
+(NSInteger)nbTrophiesOn:(NSMutableArray*)categoriesTrophy;
@end
......@@ -9,17 +9,16 @@
#import <Foundation/Foundation.h>
#import "APMModel.h"
#define APM_K_CHALLENGE_ID @"id"
#define APM_K_CHALLENGE_LABEL @"label"
#define APM_K_CHALLENGE_DESC @"desc"
#define APM_K_CHALLENGE_CURRENT_STEP @"currentStep"
#define APM_K_CHALLENGE_TOTAL_STEP @"totalStep"
#define APM_K_CHALLENGE_VALUE @"value"
#define APM_K_CHALLENGE_IS_SUPER @"isSuper"
#define APM_K_CHALLENGE_GENEROSITIES @"generosities"
#define APM_K_CHALLENGE_TRIGGERED_AT @"triggeredAt"
#define APM_K_CHALLENGE_IS_RECENTLY_COMPLETED @"isRecentlyCompleted"
#define APM_K_CHALLENGE_ID @"id"
#define APM_K_CHALLENGE_LABEL @"label"
#define APM_K_CHALLENGE_DESC @"desc"
#define APM_K_CHALLENGE_CURRENT_STEP @"currentStep"
#define APM_K_CHALLENGE_TOTAL_STEP @"totalStep"
#define APM_K_CHALLENGE_VALUE @"value"
#define APM_K_CHALLENGE_IS_SUPER @"isSuper"
#define APM_K_CHALLENGE_GENEROSITIES @"generosities"
#define APM_K_CHALLENGE_TRIGGERED_AT @"triggeredAt"
#define APM_K_CHALLENGE_IS_RECENTLY_COMPLETED @"isRecentlyCompleted"
@interface APMChallenge : APMModel<NSCoding, NSCopying>
......
......@@ -8,8 +8,8 @@
// Version of API
#define APM_API_VERSION @"3.0"
#define APM_SERVICES_VERSION_NAME @"2.1.0"
#define APM_SERVICES_VERSION_CODE @"2100"
#define APM_SERVICES_VERSION_NAME @"2.1.1"
#define APM_SERVICES_VERSION_CODE @"2110"
//URL
#define APM_URL_API_PROD @"https://api.appsmiles.eu/" //Url API prod
......
......@@ -82,6 +82,7 @@
#define APM_K_USER_SEGMENTS @"segments"
#define APM_K_USER_LOYALTY_ID @"loyaltyID"
#define APM_K_USER_CUSTOM_PARAMS @"customParams"
#define APM_K_USER_USER_JOURNEY @"userJourney"
// Device keys
#define APM_K_DEVICE @"device"
......@@ -98,14 +99,14 @@
#define APM_K_AD_LIST @"ads"
// Prog keys
#define APM_K_PROG @"prog"
#define APM_K_PROG_ISACTIVE @"isActive"
#define APM_K_PROG_OFFDURATION @"offDuration"
#define APM_K_PROG_TTL @"progTTL"
#define APM_K_PROG_OFFDURATION_END_DATE @"offDurationEndDate"
#define APM_K_PROG_TTL_END_DATE @"progTTLEndDate"
#define APM_K_PROG_DEBUG_MODE @"debugMode"
#define APM_K_PROG_DEFAULT_LANGUAGE @"defaultLanguage"
#define APM_K_PROG @"prog"
#define APM_K_PROG_ISACTIVE @"isActive"
#define APM_K_PROG_OFFDURATION @"offDuration"
#define APM_K_PROG_OFFDURATION_END_DATE @"offDurationEndDate"
#define APM_K_PROG_TTL @"progTTL"
#define APM_K_PROG_TTL_END_DATE @"progTTLEndDate"
#define APM_K_PROG_DEBUG_MODE @"debugMode"
#define APM_K_PROG_DEFAULT_LANGUAGE @"defaultLanguage"
// Generosity keys
#define APM_K_GENEROSITY_MSG @"generosityMsg"
......
......@@ -69,7 +69,7 @@
#import "APMVersions.h"
#import "APMTrophiesUtils.h"
#import "APMCategoryTrophy.h"
#import "APMTrophyUtils.h"
#import "APMTrophiesUtils.h"
#import "APMWebServices.h"
#import "APMServicesConfigPrivate.h"
......@@ -13,7 +13,7 @@
+(APMServicesLOTAnimationsUtils *)sharedInstance;
-(void)initInstance;
-(void)lotAnimationForKey:(NSString*)key success:(void (^)(NSDictionary *json))success failure:(void (^)(NSError* error))failure;
-(void)loadAnimationForKey:(NSString*)key success:(void (^)(NSDictionary *json))success failure:(void (^)(NSError* error))failure;
-(void)successAnimations:(NSDictionary*)result;
-(void)resetAll;
......
......@@ -2,14 +2,16 @@
// APMTrophiesUtils.h
// APMServices
//
// Created by Vincent Ducastel on 03/02/2017.
// Created by Vincent Ducastel on 09/01/2017.
// Copyright © 2017 Moonmiles. All rights reserved.
//
#import <Foundation/Foundation.h>
@class APMTrophy;
@interface APMTrophiesUtils : NSObject
+(NSInteger)nbTrophiesOn:(NSMutableArray*)categoriesTrophy;
+(APMTrophy*)trophyFromId:(NSInteger)identifiant withTrophies:(NSMutableArray*)array;
@end
......@@ -9,22 +9,20 @@
#import <Foundation/Foundation.h>
#import "APMModel.h"
#define APM_K_TROPHY_ID @"id"
#define APM_K_TROPHY_LABEL @"label"
#define APM_K_TROPHY_DESC @"description"
#define APM_K_TROPHY_CURRENT_STEP @"currentStep"
#define APM_K_TROPHY_TOTAL_STEP @"totalStep"
#define APM_K_TROPHY_GENEROSITIES @"generosities"
#define APM_K_TROPHY_TRIGGERED_AT @"triggeredAt"
#define APM_K_TROPHY_ILLUS_ON @"illusOn"
#define APM_K_TROPHY_ILLUS_OFF @"illusOff"
#define APM_K_TROPHY_TYPE @"type"
#define APM_K_TROPHY_TYPE_DEFAULT 0
#define APM_K_TROPHY_TYPE_MYSTERY 1
#define APM_K_TROPHY_TYPE_INDIVIDUAL 2
#define APM_K_TROPHY_IS_RECENTLY_COMPLETED @"isRecentlyCompleted"
#define APM_K_TROPHY_ID @"id"
#define APM_K_TROPHY_LABEL @"label"
#define APM_K_TROPHY_DESC @"description"
#define APM_K_TROPHY_CURRENT_STEP @"currentStep"
#define APM_K_TROPHY_TOTAL_STEP @"totalStep"
#define APM_K_TROPHY_GENEROSITIES @"generosities"
#define APM_K_TROPHY_TRIGGERED_AT @"triggeredAt"
#define APM_K_TROPHY_ILLUS_ON @"illusOn"
#define APM_K_TROPHY_ILLUS_OFF @"illusOff"
#define APM_K_TROPHY_TYPE @"type"
#define APM_K_TROPHY_TYPE_DEFAULT 0
#define APM_K_TROPHY_TYPE_MYSTERY 1
#define APM_K_TROPHY_TYPE_INDIVIDUAL 2
#define APM_K_TROPHY_IS_RECENTLY_COMPLETED @"isRecentlyCompleted"
@interface APMTrophy : APMModel<NSCoding, NSCopying>
......
//
// APMTrophyUtils.h
// APMServices
//
// Created by Vincent Ducastel on 09/01/2017.
// Copyright © 2017 Moonmiles. All rights reserved.
//
#import <Foundation/Foundation.h>
@class APMTrophy;
@interface APMTrophyUtils : NSObject
+(APMTrophy*)trophyFromId:(NSInteger)identifiant withTrophies:(NSMutableArray*)array;
@end
......@@ -16,14 +16,14 @@
@interface APMUserJourneyUtils : NSObject
+(BOOL)haveNewUserJourney;
+(BOOL)haveNewUserJourneyWithUser:(APMUser*)user nextUser:(APMUser*)nextUser;
+(BOOL)haveNewUserJourneyWithOldUser:(APMUser*)oldUser user:(APMUser*)user;
+(BOOL)haveNewStatusUserJourney;
+(BOOL)haveNewStatusUserJourneyWithUser:(APMUser*)user nextUser:(APMUser*)nextUser;
+(BOOL)haveNewStatusUserJourneyWithOldUser:(APMUser*)oldUser user:(APMUser*)user;
+(APMChallenge*)getChallengeWithStatusId:(NSInteger)statusId challengeId:(NSInteger)challengeId inUserJourney:(APMUserJourney*)userjourney;
+(BOOL)haveNewTrophiesUserJourney;
+(BOOL)haveNewTrophiesUserJourneyWithUser:(APMUser*)user nextUser:(APMUser*)nextUser;
+(BOOL)haveNewTrophiesUserJourneyWithOldUser:(APMUser*)oldUser user:(APMUser*)user;
+(APMTrophy*)getTrophyWithCategoryTrophyId:(NSInteger)categoryTrophyId trophyId:(NSInteger)trophyId inUserJourney:(APMUserJourney*)userjourney;
@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