1.calculation

2.unlock

ZhiJi/Classes/Care/Controller/ZJBaseCareViewController.m

@@ -294,6 +294,7 @@
     };
     
     friend.confirmCallBack = ^(ZJFriendModel * model) {
+        [MobClick event:@"home_friendcard_setting_store"];
         //改昵称
         [weakSelf editFriendNickName:model];
     };
@@ -314,6 +315,7 @@
         }];
         return;
     }
+    [MobClick event:@"home_message_click"];
     ZJXiaoXiViewController *vc = [[ZJXiaoXiViewController alloc] init];
     [self.navigationController pushViewController:vc animated:YES];
 }
@@ -321,6 +323,7 @@
 //紧急按钮点击
 - (void)jinJiButtonClick{
     NSLog(@"紧急按钮");
+    [MobClick event:@"home_alert_click"];
     ZJJinJiViewController *jinJiVC = [[ZJJinJiViewController alloc] init];
     jinJiVC.navigationItem.title = kLocalizedString(@"care_Emergency_alarm");
     [self.navigationController pushViewController:jinJiVC animated:YES];

ZhiJi/Classes/Care/Controller/ZJCareStyle2ViewController.m

@@ -317,6 +317,7 @@
         return;
     }
 
+    [MobClick event:@"addfriend_phonenumber_input"];
     [[TQNetworkTools shared] getWithAction:userFind parameters:@{@"phone":[NSString stringWithFormat:@"%@%@", currentCountryCode, phone], /*@"phoneCode":currentCountryCode*/} success:^(id  _Nonnull response) {
 
         if([[response objectForKey:@"status"] integerValue] == 200){
@@ -432,6 +433,7 @@
     }
 
     if ([ZJUserInfoManager shared].userInfoModel.isMember && [ZJUserInfoManager shared].userInfoModel.phoneNo) {
+        [MobClick event:@"addfriend_fb_friend_add"];
         [self shareWX];
     }
 }
@@ -453,7 +455,7 @@
 }
 
 - (void)addFriendWithPhone:(NSString *)phone{
-
+    [MobClick event:@"home_addfriend_click"];
     [MobClick event:@"add_person"];
     [[TQNetworkTools shared] postWithAction:friendPhoneNoInvite parameters:@{@"phoneNo":[NSString stringWithFormat:@"%@%@", currentCountryCode, phone], /*@"phoneCode":currentCountryCode*/} success:^(id  _Nonnull response) {
         
@@ -473,6 +475,7 @@
 }
 
 - (void)myTrack{
+    [MobClick event:@"home_my_location_history_click"];
     ZJFriendTrackMapViewController *trackMapVc = [[ZJFriendTrackMapViewController alloc] init];
     trackMapVc.isMyTrack = YES;
     [self.navigationController showViewController:trackMapVc sender:nil];
@@ -554,6 +557,8 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     
+    [MobClick event:@"home_friend_click"];
+    
     if ([ZJUserInfoManager shared].userInfoModel.isMember || indexPath.row==0) {
         ZJFriendTrackMapViewController *trackMapVc = [[ZJFriendTrackMapViewController alloc] init];
         trackMapVc.model = self.friendDataSource[indexPath.row];

ZhiJi/Classes/Goods/Controller/ZJMemberPayViewController.m

@@ -150,6 +150,7 @@
     }
     
     [MobClick event:@"goto_pay"];
+    [MobClick event:@"pay_button_click"];
     
     [ZTPurchaseManager purchaseWithProductIdWithProductId:productId inView:self.view success:^{
         

ZhiJi/Classes/Login/Controller/ZJPhoneLoginViewController.m

@@ -306,7 +306,7 @@
         NSLog(@"---------------loginWithPhone %@", response);
         
         if([[response objectForKey:@"status"] integerValue] == 200){
-
+            [MobClick event:@"login_suc"];
             NSString * token = [[[response objectForKey:@"result"] objectForKey:@"data"] objectForKey:@"token"];
 
             if (token) {
@@ -323,10 +323,12 @@
             }
             
         }else if ([[response objectForKey:@"status"] integerValue] == 105) {
+            [MobClick event:@"login_fail"];
             [MBProgressHUD showError:[response objectForKey:@"msg"] toView:self.view];
         }
         
     } failure:^(NSError * _Nonnull error) {
+        [MobClick event:@"login_fail"];
         NSLog(@"loginWithPhone error %@", error);
     }];
 }

ZhiJi/Classes/Map/Controller/ZJBaseMapViewController.m

@@ -40,27 +40,11 @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self getFriendList];
     });
-    
-    if ([ZJUserInfoManager CNLanguage]) {
-        self.mapView.mapLanguage = @0;
-        [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(0)];
-    }else{
-        self.mapView.mapLanguage = @1;
-        [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(1)];
-    }
 }
 
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     [self.navigationController setNavigationBarHidden:true animated:true];
- 
-    if ([ZJUserInfoManager CNLanguage]) {
-        self.mapView.mapLanguage = @0;
-        [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(0)];
-    }else{
-        self.mapView.mapLanguage = @1;
-        [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(1)];
-    }
 }
 
 - (void)setupUI{
@@ -73,6 +57,14 @@
     ///把地图添加至view
     [self.view addSubview: _mapView];
     
+    if ([ZJUserInfoManager CNLanguage]) {
+        self.mapView.mapLanguage = @0;
+        [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(0)];
+    }else{
+        self.mapView.mapLanguage = @1;
+        [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(1)];
+    }
+    
     _mapView.delegate = self;
     _mapView.zoomLevel = 14;
     _mapView.showsScale = false;
@@ -108,6 +100,8 @@
                 };
 //            };
         }else{
+            [MobClick event:@"map_friendtrack_view"];
+            
             ZJFriendTrackMapViewController * trackMapVc = [[ZJFriendTrackMapViewController alloc] init];
             trackMapVc.model = self.selectFriendModel;
             trackMapVc.autoTrack = true;

ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.m

@@ -183,6 +183,13 @@
 }
 
 - (void) drawLineAction {
+    
+    if (self.isMyTrack) {
+        [MobClick event:@"mytrack_querybutton_click"];
+    }else{
+        [MobClick event:@"friendtrack_querybutton_click"];
+    }
+
     [self.trackTimeView.trackButton setSelected:true];
     [self.trackTimeView.trackButton setEnabled:false];
     //移除

ZhiJi/Classes/Map/Controller/ZJMapStyle2ViewController.m

@@ -169,7 +169,7 @@
         self.addBtn.selected = NO;
         return;
     }
-
+    [MobClick event:@"map_phonenumber_input"];
     [[TQNetworkTools shared] getWithAction:userFind parameters:@{@"phone":phone} success:^(id  _Nonnull response) {
 
         if([[response objectForKey:@"status"] integerValue] == 200){

ZhiJi/Classes/Mine/Controller/ZJEmergencyContactViewController.m

@@ -250,6 +250,7 @@
         return;
     }
     
+    [MobClick event:@"me_emergencycontact_add"];
     [[TQNetworkTools shared] postWithAction:addFriendContactByPhoneNo parameters:@{@"phoneNo":[NSString stringWithFormat:@"%@%@", code, phone], /*@"phoneCode":code*/} success:^(id  _Nonnull response) {
         
         if([[response objectForKey:@"status"] integerValue] == 200){
@@ -265,7 +266,7 @@
 
 #pragma mark 移除紧急联系人
 - (void)removeEmergencyContact:(ZJEmergencyContactModel *)model{
-    
+    [MobClick event:@"me_emergencycontact_delete"];
     [[TQNetworkTools shared] postWithAction:friendContactRemove parameters:@{@"lfId":model.id} success:^(id  _Nonnull response) {
         
         if([[response objectForKey:@"status"] integerValue] == 200){

ZhiJi/Classes/Mine/Controller/ZJMineViewController.m

@@ -57,7 +57,6 @@ static NSString *ID = @"mineID";
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self setUI];
-    self.headerView.xuFeiButton.hidden = YES;
 }
 
 -(void)setUI{
@@ -92,7 +91,7 @@ static NSString *ID = @"mineID";
 }
 
 - (void)settingBtnClick{
-    
+    [MobClick event:@"me_setting_click"];
     ZJSettingViewController * setting = [[ZJSettingViewController alloc]init];
     [self.navigationController pushViewController:setting animated:YES];
     setting.quitCallBack = ^{
@@ -110,10 +109,12 @@ static NSString *ID = @"mineID";
     __weak typeof(self) weakSelf = self;
     update.modifyNicknameSuccessClosure = ^{
         [weakSelf getUserInfo];
+        [MobClick event:@"me_nickname_store"];
     };
 }
 
 - (void)MyTrack {
+    [MobClick event:@"me_mytrack_click"];
     ZJFriendTrackMapViewController *trackMapVc = [[ZJFriendTrackMapViewController alloc] init];\
     trackMapVc.isMyTrack = true;
     trackMapVc.autoTrack = true;
@@ -121,6 +122,7 @@ static NSString *ID = @"mineID";
 }
 
 - (void)urgencyPerson {
+    [MobClick event:@"me_emergencycontact_click"];
     ZJEmergencyContactViewController *vc = [[ZJEmergencyContactViewController alloc]init];
     [self.navigationController pushViewController:vc animated:YES];
 }
@@ -135,12 +137,13 @@ static NSString *ID = @"mineID";
 }
 
 - (void)share {
+    [MobClick event:@"me_share"];
 //    [ZJShareManager shareWithType:Share_share currentVC:self];
     [ZJShareManager shareWithType:Share_share item:nil target:self success:nil];
 }
 
 - (void)locationSet {
-    
+    [MobClick event:@"me_location_setting"];
     NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
 
     if([[UIApplication sharedApplication] canOpenURL:url]) {
@@ -255,7 +258,21 @@ static NSString *ID = @"mineID";
             break;
         case HeaderTapTypeRennewal:
         {
- 
+            [MobClick event:@"me_unlock_click"];
+            
+            if (![ZJUserInfoManager shared].isLogin) {
+                ZJOauthLoginConfig * config = [[ZJOauthLoginConfig alloc] initWithCurrentVC:self];
+                [config loginVerify:^(id _Nonnull model) {
+                    if ([model isKindOfClass:[ZJMineUserInfoModel class]] ) {
+                        NSLog(@"success");
+                        self.isVip = ((ZJMineUserInfoModel *)model).isMember;
+                        [self.mineTableView reloadData];
+                        [self.headerView updateHeaderForLogin:true Member:((ZJMineUserInfoModel *)model).isMember UserInfo:model];
+                    }
+                }];
+                return;
+            }
+            
             if (![ZJUserInfoManager shared].userInfoModel.isMember) {
                 
 //                ZJMemberPayViewController *zhiFuVC = [[ZJMemberPayViewController alloc] init];
@@ -369,6 +386,7 @@ static NSString *ID = @"mineID";
     
     if ([ZJUserInfoManager shared].isTourist){
         
+        [MobClick event:@"me_unlock_click"];
         ZJOauthLoginConfig * config = [[ZJOauthLoginConfig alloc] initWithCurrentVC:self];
         [config loginVerify:^(id _Nonnull model) {
             if ([model isKindOfClass:[ZJMineUserInfoModel class]] ) {

ZhiJi/Classes/Mine/Controller/ZJSettingViewController.m

@@ -72,6 +72,8 @@
 
 - (void)logoutBtnClick{
     
+    [MobClick event:@"setting_logout"];
+    
     [[ZJUserInfoManager shared] clean];
     
     BaseTabBarViewController * tabbar = [BaseTabBarViewController new];
@@ -192,6 +194,7 @@
 
 - (void)userClause:(NSInteger)index{
     
+    [MobClick event:@"setting_terms"];
     NSDictionary * dic = [ZJUserInfoManager shared].h5_url;
     NSString * path;
     switch (index) {
@@ -217,7 +220,7 @@
 
 #pragma userLogout
 - (void)userCancellation{
-    
+    [MobClick event:@"setting_del_account"];
     [[TQNetworkTools shared] getWithAction:friendContactList parameters:@{} success:^(id  _Nonnull response) {
 
         if([[response objectForKey:@"status"] integerValue] == 200){

ZhiJi/Classes/Mine/View/ZJMineHeaderView.m

@@ -118,7 +118,7 @@
     //xufeiButton
     self.xuFeiButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [self.xuFeiButton setBackgroundImage:[UIImage imageNamed:@"xuFei_Btn"] forState:UIControlStateNormal];
-    [self.xuFeiButton setTitle:kLocalizedString(@"mine_renewal") forState:0];
+    [self.xuFeiButton setTitle:kLocalizedString(@"mine_unlock") forState:0];
     [self.xuFeiButton setTitleColor:[UIColor colorWithHex:0x38180D] forState:0];
     [self.xuFeiButton.titleLabel setFont:[UIFont systemFontOfSize:KFont(14)]];
     [self.xuFeiButton setBackgroundColor:[UIColor colorWithHex:0xEBC6B4]];
@@ -181,10 +181,11 @@
 - (void)updateHeaderForLogin:(BOOL)isLogin Member:(BOOL)Member UserInfo:(ZJMineUserInfoModel *)userInfo{
     _dengJiImageView.hidden = !(isLogin && Member);
     _xuFeiButton.hidden = !_dengJiImageView.hidden;
+    _xuFeiButton.hidden = false;
     if (isLogin) {
         if (Member) {
             _gongNengLabel.text = kLocalizedString(@"mine_unlocked");
-            _timeLabel.text = kLocalizedString(@"mine_free_used");
+            _timeLabel.text = [NSString stringWithFormat:@"%@%@", kLocalizedString(@"mine_free_used"), userInfo.memberEndTime];
             _xuFeiButton.hidden = YES;
         }else{
             _gongNengLabel.text = kLocalizedString(@"mine_premium_services_locked");
@@ -199,14 +200,13 @@
     }else{
         if (Member) {
             _gongNengLabel.text = kLocalizedString(@"mine_unlocked");
-            _timeLabel.text = kLocalizedString(@"mine_free_used");
+            _timeLabel.text = [NSString stringWithFormat:@"%@%@", kLocalizedString(@"mine_free_used"), userInfo.memberEndTime];
             _nicknameLabel.text = kLocalizedString(@"mine_sign"); // [[data Read] objectForKey:@"NickName"];
             _xuFeiButton.hidden = true;
         }else{
             _gongNengLabel.text = kLocalizedString(@"mine_premium_services_locked");
             _timeLabel.text = kLocalizedString(@"mine_unlock_more_services");
             [_xuFeiButton setTitle:kLocalizedString(@"mine_unlock") forState:(UIControlStateNormal)];
-            _xuFeiButton.hidden = false;
         }
 //        _gongNengLabel.text = kLocalizedString(@"mine_premium_services_locked");
 //        _timeLabel.text = kLocalizedString(@"mine_unlock_more_services");
@@ -239,6 +239,7 @@
     _gongNengLabel.text = kLocalizedString(@"mine_premium_services_locked");
     _timeLabel.text = kLocalizedString(@"mine_unlock_more_services");
     [_xuFeiButton setTitle:kLocalizedString(@"mine_unlock") forState:(UIControlStateNormal)];
+    _xuFeiButton.hidden = false;
 }
 
 @end

ZhiJi/Classes/Tools/PCH/ResourceHeader.pch

@@ -22,13 +22,13 @@
 
 //#if DEBUG
 //
-//#define ServerReport   @"https://report.linking100.com"
+//#define ServerReport   @"http://report.linking100.com/ping"
 //#define ServerHost     @"https://feedapitest.zhangxinhulian.com"
 //#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
 //
 //#else
 
-#define ServerReport   @"https://report.linking100.com"
+#define ServerReport   @"http://report.linking100.com"
 #define ServerHost     @"https://feedapi.linking100.com"
 #define ServerHostFeed @"https://feedapi.linking100.com"
 

ZhiJi/en.lproj/Localizable.strings

@@ -175,7 +175,7 @@ appName = "Family Mapp";
 "myself"="Me";
 "myself_style2"="Myself";
 
-"mine_free_used"="Free for life";
+"mine_free_used"="Valid until:";
 
 //setting
 "setting"="Settings";

ZhiJi/zh-Hans.lproj/Localizable.strings

@@ -172,7 +172,7 @@ appName = "Family Mapp";
 "myself"="自己";
 "myself_style2"="我自己";
 
-"mine_free_used"="终身免费使用";
+"mine_free_used"="有效期:";
 
 //setting
 "setting"="设置";