[ios] MyTracker was updated.

7 files changed, 29 insertions, 35 deletions

diff --git a/iphone/Maps/MyTracker/MRAbstractDataProvider.h b/iphone/Maps/MyTracker/MRAbstractDataProvider.h
index 88a181eaa5..d333b2e58a 100755..100644
--- a/iphone/Maps/MyTracker/MRAbstractDataProvider.h
+++ b/iphone/Maps/MyTracker/MRAbstractDataProvider.h
@@ -5,6 +5,7 @@
 
 #import <Foundation/Foundation.h>
 
+@class JSONBuilder;
 
 @interface MRAbstractDataProvider : NSObject
 
@@ -18,4 +19,6 @@
 - (BOOL)hasData;
 
 - (NSUInteger)dataCount;
+
+- (void)putDataToBuilder:(JSONBuilder *)builder;
 @end
diff --git a/iphone/Maps/MyTracker/MRCustomParamsProvider.h b/iphone/Maps/MyTracker/MRCustomParamsProvider.h
index f982202c30..bd4bcddcf4 100755..100644
--- a/iphone/Maps/MyTracker/MRCustomParamsProvider.h
+++ b/iphone/Maps/MyTracker/MRCustomParamsProvider.h
@@ -1,35 +1,27 @@
 //
 // Created by Igor Glotov on 22/08/14.
 // Copyright (c) 2014 Mail.ru Group. All rights reserved.
-// MyTracker, version 1.0.18
+// MyTracker, version 1.1.1
 
 #import <Foundation/Foundation.h>
 #import "MRAbstractDataProvider.h"
 
 @interface MRCustomParamsProvider : MRAbstractDataProvider
 
-- (void)setLanguage:(NSString *)lang;
-
-
-- (void)setAge:(NSNumber *)age;
-
+@property (nonatomic, strong) NSString *language;
+@property (nonatomic, strong) NSNumber *age;
 /**
-* @param gender Пол пользователя, 0 - пол неизвестен, 1 - мужской, 2 - женский
-*/
-- (void)setGender:(NSNumber *)gender;
-
-- (void)setMRGSAppId:(NSString *)mrgsAppId;
-
-- (void)setMRGSUserId:(NSString *)mrgsUserId;
-
-- (void)setMRGSDeviceId:(NSString *)mrgsDeviceId;
-
-- (void)setPhone:(NSString *)phone;
-
-- (void)setIcqId:(NSString *)icqId;
-
-- (void)setOkId:(NSString *)okId;
-
-- (void)setEmail:(NSString *)email;
+ * @param gender Пол пользователя, 0 - пол неизвестен, 1 - мужской, 2 - женский
+ */
+@property (nonatomic, strong) NSNumber *gender;
+@property (nonatomic, strong) NSString *mrgsAppId;
+@property (nonatomic, strong) NSString *mrgsUserId;
+@property (nonatomic, strong) NSString *mrgsDeviceId;
+@property (nonatomic, strong) NSArray *icqIds;
+@property (nonatomic, strong) NSArray *okIds;
+@property (nonatomic, strong) NSArray *vkIds;
+@property (nonatomic, strong) NSArray *emails;
+
+- (void)putDataToBuilder:(JSONBuilder *)builder;
 
 @end
diff --git a/iphone/Maps/MyTracker/MRMyTracker.h b/iphone/Maps/MyTracker/MRMyTracker.h
index 9764288d31..067274b08e 100755..100644
--- a/iphone/Maps/MyTracker/MRMyTracker.h
+++ b/iphone/Maps/MyTracker/MRMyTracker.h
@@ -1,6 +1,6 @@
 // Created by Igor Glotov on 22/07/14.
 // Copyright (c) 2014 Mailru Group. All rights reserved.
-// MyTracker, version 1.0.18
+// MyTracker, version 1.1.1
 
 #import <Foundation/Foundation.h>
 #import "MRTracker.h"
@@ -21,9 +21,6 @@ extern NSString * const MRMyTrackerVersion;
 
 + (MRTrackerParams *)getTrackerParams;
 
-+ (void)trackEvent:(NSString *)name;
-+ (void)trackEvent:(NSString *)name eventParams:(NSDictionary *)eventParams;
-
 + (void)trackLoginEvent;
 + (void)trackLoginEventWithParams:(NSDictionary *)eventParams;
 
@@ -32,4 +29,9 @@ extern NSString * const MRMyTrackerVersion;
 
 + (void)trackRegistrationEvent;
 + (void)trackRegistrationEventWithParams:(NSDictionary *)eventParams;
+
+#
++ (void)trackEvent:(NSString*)name;
++ (void)trackEvent:(NSString*)name eventParams:(NSDictionary*)eventParams;
+
 @end
diff --git a/iphone/Maps/MyTracker/MRTracker.h b/iphone/Maps/MyTracker/MRTracker.h
index aec536cee9..82be8863d2 100755..100644
--- a/iphone/Maps/MyTracker/MRTracker.h
+++ b/iphone/Maps/MyTracker/MRTracker.h
@@ -1,7 +1,7 @@
 //
 // Created by Igor Glotov on 22/07/14.
 // Copyright (c) 2014 Mailru Group. All rights reserved.
-// MyTracker, version 1.0.18
+// MyTracker, version 1.1.1
 
 #import <Foundation/Foundation.h>
 
@@ -24,4 +24,5 @@
 
 - (void)trackRegistrationEvent;
 - (void)trackRegistrationEventWithParams:(NSDictionary *)eventParams;
+
 @end
diff --git a/iphone/Maps/MyTracker/MRTrackerParams+Corp.h b/iphone/Maps/MyTracker/MRTrackerParams+Corp.h
index 994fa98e18..120dd11862 100755..100644
--- a/iphone/Maps/MyTracker/MRTrackerParams+Corp.h
+++ b/iphone/Maps/MyTracker/MRTrackerParams+Corp.h
@@ -1,12 +1,12 @@
 //
 // Created by Glotov on 24/03/15.
 // Copyright (c) 2015 Mail.ru Group. All rights reserved.
-// MyTracker, version 1.0.18
+// MyTracker, version 1.1.1
 
 #import <Foundation/Foundation.h>
 #import "MRTrackerParams.h"
 
-@class MRCustomParamsProvider;
+#import "MRCustomParamsProvider.h"
 
 @interface MRTrackerParams (Corp)
 
diff --git a/iphone/Maps/MyTracker/MRTrackerParams.h b/iphone/Maps/MyTracker/MRTrackerParams.h
index 168777d549..8cd5b8aebb 100755..100644
--- a/iphone/Maps/MyTracker/MRTrackerParams.h
+++ b/iphone/Maps/MyTracker/MRTrackerParams.h
@@ -1,7 +1,7 @@
 //
 // Created by Glotov on 20/03/15.
 // Copyright (c) 2015 Mail.ru Group. All rights reserved.
-// MyTracker, version 1.0.18
+// MyTracker, version 1.1.1
 
 
 #import <Foundation/Foundation.h>
@@ -13,13 +13,10 @@
 
 - (instancetype)initWithTrackerId:(NSString *)trackerId;
 
-
 @property (strong, nonatomic) NSString *trackerId;
 @property (nonatomic) BOOL trackAppLaunch;
 
 - (void)setLanguage:(NSString *)lang;
-
-
 - (void)setAge:(NSNumber *)age;
 
 /**
@@ -27,5 +24,4 @@
 */
 - (void)setGender:(NSNumber *)gender;
 
-
 @end
diff --git a/iphone/Maps/MyTracker/libMyTracker.a b/iphone/Maps/MyTracker/libMyTracker.a
index 3fa3f812fd..ff7ab5aca9 100755..100644
--- a/iphone/Maps/MyTracker/libMyTracker.a
+++ b/iphone/Maps/MyTracker/libMyTracker.a