Version 2.0.5

APMServices.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'APMServices'
-  s.version          = '2.0.3'
+  s.version          = '2.0.5'
   s.summary          = 'app\'s miles® boosts your app\'s usage'
 
 # This description is used to generate tags and improve search results.

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMAd.h

@@ -13,6 +13,7 @@
 @property(assign, nonatomic) NSInteger adID;
 @property(strong, nonatomic)  NSString *label;
 @property(strong, nonatomic)  NSString *content;
+@property(assign, nonatomic) NSInteger type;
 
 //Media
 @property (nonatomic, strong) NSString *media;

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMBurn.h

@@ -14,6 +14,7 @@
 @property (nonatomic, strong) NSDate *burnDate;
 @property (nonatomic, strong) NSString *partnerLabel;
 @property (nonatomic, strong) NSString *label;
+@property (nonatomic, strong) NSString *content;
 @property (nonatomic, assign) NSInteger value;
 @property (nonatomic, assign) NSInteger type;
 @property (nonatomic, strong) NSString *code;
@@ -21,6 +22,9 @@
 @property (nonatomic, strong) NSString *apmScheme; //apmScheme not use on iOS
 @property (nonatomic, strong) NSString *urlScheme; //For a gift type URL (startActivity with (urlScheme + code) or only (code)
 @property (nonatomic, strong) NSString *conditions;
+@property (nonatomic, assign) NSInteger status;
+@property (nonatomic, strong) NSDate *issueDate;
+@property (nonatomic, strong) NSDate *expirationDate;
 
 @property (nonatomic, strong) NSString *media;
 @property (nonatomic, strong) UIImage *imageMedia;

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServices.h

@@ -27,9 +27,16 @@
 
 @end
 
+@protocol APMServicesUserListener <NSObject>
+
+-(void)apmServicesUserChanged:(APMUser*)user;
+
+@end
+
 @interface APMServices : NSObject<CLLocationManagerDelegate>
 
 @property (weak, nonatomic) id<APMServicesListener> servicesListener;
+@property (weak, nonatomic) id<APMServicesUserListener> servicesUserListener;
 
 @property(nonatomic, assign) BOOL sdkLifeCycleEnabled; //If true, life cycle is enabled, false life cycle is disabled
 @property(nonatomic, assign) BOOL sdkIsLoading; //Block lifeCycle of badge if userClientConnect or userClientUpdate (APMServicesUser) is launched
@@ -88,6 +95,7 @@
 -(BOOL)servicesIsDisabled;
 -(void)setDeviceStatus:(NSNumber*)deviceStatus;
 -(void)setDeviceOptIn:(NSNumber*)optIn;
+-(APMVersions*)versions;
 
 //Other
 -(void)resetAll;

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesAd.h

@@ -10,6 +10,8 @@
 
 @interface APMServicesAd : NSObject
 
-+(void)adList:(NSString*)type adListSuccess:(void (^)(NSMutableArray* ads))adListSuccess failure:(void (^)(NSError* error))failure;
++(void)adListWithAdListSuccess:(void (^)(NSMutableArray* ads))adListSuccess failure:(void (^)(NSError* error))failure;
++(void)adNewsListWithAdListSuccess:(void (^)(NSMutableArray* ads))adListSuccess failure:(void (^)(NSError* error))failure;
++(void)adSpecialsListWithAdListSuccess:(void (^)(NSMutableArray* ads))adListSuccess failure:(void (^)(NSError* error))failure;
 
 @end

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesConfig.h

@@ -8,8 +8,8 @@
 
 // Version of API
 #define APM_API_VERSION @"3.0"
-#define APM_SERVICES_VERSION_NAME @"2.0.3"
-#define APM_SERVICES_VERSION_CODE @"2030"
+#define APM_SERVICES_VERSION_NAME @"2.0.5"
+#define APM_SERVICES_VERSION_CODE @"2050"
 
 //URL
 #define APM_URL_API_PROD @"https://api.appsmiles.eu/" //Url API prod
@@ -36,6 +36,12 @@
 #define APM_GIFT_NATURE_POINTS      1
 #define APM_GIFT_NATURE_STATUS      2
 
+//Status burn
+#define APM_BURN_STATUS_ISSUED       0
+#define APM_BURN_STATUS_USED         1
+#define APM_BURN_STATUS_CANCELED     2
+#define APM_BURN_STATUS_EXPIRED      3
+
 //Page
 #define APM_SHOW_PAGE_CNIL             1
 #define APM_SHOW_PAGE_CGU              2
@@ -99,8 +105,9 @@
 #define APM_CLASS_ID_GLOBAL @"global"
 
 //Ads
-#define APM_AD_TYPE_CUMUL   @"1"
-#define APM_AD_TYPE_BONUS   @"2"
+#define APM_AD_TYPE_BONUS      3
+#define APM_AD_TYPE_NEWS       4
+#define APM_AD_TYPE_SPECIALS   5
 
 //Generosity type
 #define APM_GENEROSITY_TYPE_SYSTEMATIC 1

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesConfigPrivate.h

@@ -158,15 +158,18 @@
 #define APM_K_GIFT_ACCESSIBILITY   @"accessibility"
 
 // Burn keys
-#define APM_K_BURN_LIST       @"burns"
-#define APM_K_BURN_ID         @"burnID"
-#define APM_K_BURN_DATE       @"burnDate"
-#define APM_K_BURN_VALUE      @"value"
-#define APM_K_BURN_LABEL      @"label"
-#define APM_K_BURN_URL_SCHEME @"burnUrlScheme"
-#define APM_K_BURN_MEDIA      @"media"
-#define APM_K_BURN_CONDITION  @"conditions"
-#define APM_K_BURN_NATURE     @"nature"
+#define APM_K_BURN_LIST             @"burns"
+#define APM_K_BURN_ID               @"burnID"
+#define APM_K_BURN_DATE             @"burnDate"
+#define APM_K_BURN_VALUE            @"value"
+#define APM_K_BURN_LABEL            @"label"
+#define APM_K_BURN_URL_SCHEME       @"burnUrlScheme"
+#define APM_K_BURN_MEDIA            @"media"
+#define APM_K_BURN_CONDITION        @"conditions"
+#define APM_K_BURN_NATURE           @"nature"
+#define APM_K_BURN_STATUS           @"status"
+#define APM_K_BURN_ISSUED_DATE      @"issueDate"
+#define APM_K_BURN_EXPIRED_DATE     @"endDateValid"
 
 // Earn keys
 #define APM_K_EARN       @"earn"
@@ -283,12 +286,16 @@
 #define APM_FUNC_PAGE_APP_INTERSTITIAL         50
 #define APM_FUNC_USER_DELETE                   51
 #define APM_FUNC_USER_LIST                     52
+#define APM_FUNC_AD_NEWS_LIST                  53
+#define APM_FUNC_AD_SPECIALS_LIST              54
 
 // Url WS
 #define APM_INIT_CHECK_STORE              @"partner/initialcheckstore"
 #define APM_PARTNER_GETPROG               @"partner/getprog"
 #define APM_PARTNER_LIST                  @"partner/list"
 #define APM_AD_LIST                       @"ad/bonus"
+#define APM_AD_NEWS_LIST                  @"ad/news"
+#define APM_AD_SPECIALS_LIST              @"ad/specials"
 #define APM_USER_SETADHESION              @"user/setadhesion"
 #define APM_USER_SETPARTNERCLIENTID       @"user/setpartnerclientid"
 #define APM_USER_CHECKCREDENTIALS         @"user/checkcredentials"

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesDataUtils.h

@@ -16,6 +16,7 @@
 +(id)jsonObject:(NSDictionary*)jsonObject objectForKey:(NSString*)key defaultValue:(id)defaultValue;
 +(id)jsonObject:(NSDictionary*)jsonObject numberForKey:(NSString*)key defaultValue:(NSNumber*)defaultValue;
 +(id)jsonObject:(NSDictionary*)jsonObject arrayForKey:(NSString*)key defaultValue:(id)defaultValue class:(Class)class;
++(NSDate*)jsonObject:(NSDictionary*)jsonObject dateForKey:(NSString*)key defaultValue:(id)defaultValue dateFormat:(NSString*)dateFormat;
 
 #pragma mark - NSUserDefaults
 

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesHeaders.h

@@ -57,6 +57,7 @@
 #import "APMAlertControllerUtils.h"
 #import "APMModel.h"
 #import "APMReactUtils.h"
+#import "APMVersions.h"
 
 #import "APMWebServices.h"
 #import "APMServicesConfigPrivate.h"

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesUser.h

@@ -31,7 +31,7 @@
 +(void)userSavePassword:(NSString*)oldPassword newPassword:(NSString*)newPassword confirmPassword:(NSString*)confirmPassword userSavePasswordSuccess:(void (^)(APMUser* user))userSavePasswordSuccess failure:(void (^)(NSError* error))failure;
 +(void)userRefresh:(void (^)(APMUser* user))userRefreshSuccess failure:(void (^)(NSError* error))failure;
 +(void)userResetPassword:(NSString*)email userResetPasswordSuccess:(void (^)(NSString* message))userResetPasswordSuccess failure:(void (^)(NSError* error))failure;
-+(void)userHistory:(void (^)(APMUser* user, NSMutableArray* earns, NSMutableArray* burns))userHistorySuccess failure:(void (^)(NSError* error))failure;
++(void)userHistory:(void (^)(APMUser* user, NSMutableArray* earns, NSMutableArray* burns, NSMutableArray* ads))userHistorySuccess failure:(void (^)(NSError* error))failure;
 +(void)userHistoryBurns:(void (^)(NSMutableArray* burns))userHistoryBurnsSuccess failure:(void (^)(NSError* error))failure;
 +(void)userHistoryEarns:(void (^)(NSMutableArray* earns))userHistoryEarnsSuccess failure:(void (^)(NSError* error))failure;
 +(void)userUnsubscribeWithComment:(NSString*)comment userUnsubscribeSuccess:(void (^)())userUnsubscribeSuccess failure:(void (^)(NSError* error))failure;

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesUtils.h

@@ -6,6 +6,8 @@
 //  Copyright (c) 2015 Moonmiles. All rights reserved.
 //
 
+@class APMUser;
+
 @interface APMServicesUtils : NSObject
 
 +(void)debugLog:(NSString*)log;
@@ -60,5 +62,7 @@
 +(NSInteger)heightContentWebView:(UIWebView*)webview;
 +(NSString*)stringByStrippingHTML:(NSString*)string;
 +(NSString*)nameOfApplication;
++(BOOL)isEqual:(id)object1 object2:(id)object2;
++(APMUser*)copyUser:(APMUser*)user;
 
 @end

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMVersions.h

+//
+//  APMVersions.h
+//  APMServices
+//
+//  Created by Vincent Ducastel on 15/02/2017.
+//  Copyright © 2017 Moonmiles. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "APMModel.h"
+
+@interface APMVersions : APMModel<NSCoding, NSCopying>
+
+@property (nonatomic, assign) NSInteger statuses; //Version number of status data
+@property (nonatomic, assign) NSInteger theme; //Version number of theme data
+@property (nonatomic, assign) NSInteger traductions; //Version number of traductions data
+@property (nonatomic, assign) NSInteger pages; //Version number of pages data
+
+-(void)initWithJSONObject:(NSDictionary*)jsonObject withThemeValid:(BOOL)themeValid;
+-(NSString*)getVersionsJsonToStr;
+-(void)resetVersions;
+
+@end

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMWebServices.h

@@ -79,8 +79,12 @@
 +(void)partnerList:(NSString*)userToken categoryID:(NSString*)categoryID success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
 +(void)partnerList:(NSString*)userToken params:(NSDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
 
-+(void)adList:(NSString*)userToken type:(NSString*)type success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
++(void)adList:(NSString*)userToken success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
 +(void)adList:(NSString*)userToken params:(NSDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
++(void)adNewsList:(NSString*)userToken success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
++(void)adNewsList:(NSString*)userToken params:(NSDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
++(void)adSpecialsList:(NSString*)userToken success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
++(void)adSpecialsList:(NSString*)userToken params:(NSDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
 
 +(void)initCheckStore:(NSString*)partnerId userToken:(NSString*)userToken partnerClientId:(NSString*)partnerClientId email:(NSString*)email classId:(NSString*)classId tagId:(NSString*)tagId date:(NSString*)date latitude:(NSString*)latitude longitude:(NSString*)longitude generosity:(APMGenerosity*)generosity partnerLevel:(NSInteger)partnerLevel versions:(APMVersions*)versions success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
 +(void)initCheckStore:(NSString*)userToken params:(NSMutableDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;