no message

superCleaner/Assets.xcassets/Guide/guide_image_03.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "苹果6.7.8-引导页-3副本@2x.png",
+      "filename" : "苹果6.7.8-引导页-3@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "苹果6.7.8-引导页-3副本@3x.png",
+      "filename" : "苹果6.7.8-引导页-3@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

superCleaner/Assets.xcassets/Guide/guide_image_x_03.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "super苹果引导11-3副本@2x.png",
+      "filename" : "super苹果引导11-3@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "super苹果引导11-3副本@3x.png",
+      "filename" : "super苹果引导11-3@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

superCleaner/Base/ICGuideViewController.m

@@ -67,6 +67,7 @@
         [collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:indexPath.row + 1 inSection:indexPath.section] atScrollPosition: UICollectionViewScrollPositionCenteredHorizontally animated:true];
     } else {
         [self dismissGuideView];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"guideDismiss" object:nil];
     }
 }
 

superCleaner/Base/ICIAPViewController.h

@@ -12,6 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ICIAPViewController : UIViewController
 
+@property (nonatomic, copy) NSString * value;
+
 @end
 
 NS_ASSUME_NONNULL_END

superCleaner/Base/ICIAPViewController.m

@@ -12,10 +12,7 @@
 #import "ICIPAProductModel.h"
 #import "Data.h"
 
-@interface ICIAPViewController (){
-    NSTimer * timer;
-    int timerCount;
-}
+@interface ICIAPViewController ()
 
 @property (weak, nonatomic) IBOutlet UIView *weakContentView;
 @property (weak, nonatomic) IBOutlet UIView *yearContentView;
@@ -36,6 +33,8 @@
 @property (nonatomic, strong) NSMutableArray *products;
 @property (nonatomic, strong) ICIPAProductModel *currentProduct;
 
+@property (nonatomic, assign) CFTimeInterval startTime;
+
 @end
 
 @implementation ICIAPViewController
@@ -43,8 +42,14 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    [MobClick event:@"pay_page_view"];
-    [MobClick beginEvent:@"pay_page_stay"];
+    [MobClick event:@"pay_page_view" label:_value?:@""];
+    [MobClick beginEvent:@"pay_page_stay" label:_value?:@""];
+    NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": @"pay_page_view", @"value": _value?:@""}.mutableCopy;
+    [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
+    } failure:^(NSError * _Nonnull error) {
+    }];
+    
+    _startTime = CACurrentMediaTime();
     
     // Do any additional setup after loading the view.
     self.weakContentView.layer.cornerRadius = KScaleWidth(8);
@@ -98,15 +103,6 @@
     [self.yearContentView.layer addAnimation:animation forKey: @"transform.scale"];
 }
 
-- (void)dealloc{
-    [MobClick endEvent:@"pay_page_stay"];
-    NSLog(@"ICIAPViewController dealloc");
-}
-
-- (void)timerStart {
-    timerCount++;
-}
-
 -(void)getIpaList {
     __weak typeof(self) weakSelf = self;
     [[ZTNetworkTools shared] getWithAction:getIPAPayConfig parameters:@{} success:^(id  _Nonnull response) {
@@ -129,8 +125,12 @@
                         NSDictionary * dic = [[data Read] objectForKey:@"config"];
                         
                         if (dic) {
-                            self.weakPriceLabel.text = [NSString stringWithFormat:@"%@ %@", [dic objectForKey:@"pay_3day_txt"], model.name];
-                            weakSelf.yearPeriodOfUseLabel.text = [dic objectForKey:@"478_button_text"];
+                            if ([dic objectForKey:@"pay_3day_txt"]){
+                                self.weakPriceLabel.text = [NSString stringWithFormat:@"%@", [dic objectForKey:@"pay_3day_txt"]];
+                            }
+                            if ([dic objectForKey:@"478_button_text"]){
+                                weakSelf.yearPeriodOfUseLabel.text = [dic objectForKey:@"478_button_text"];
+                            }
                         }
                     }
                 }
@@ -142,7 +142,6 @@
 }
 
 - (void)selectedWeakAction {
-    [MobClick event:@"pay_week_vip_click"];
     if (self.products.count == 0){
         return;
     }
@@ -153,10 +152,16 @@
         }
     }
     [self startPlanAction:_currentProduct index:1];
+    
+    [MobClick event:@"pay_week_vip_click" label:_value?:@""];
+    NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": @"pay_week_vip_click", @"value": _value?:@""}.mutableCopy;
+    [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
+    } failure:^(NSError * _Nonnull error) {
+    }];
 }
 
 - (void)selectedYearAction {
-    [MobClick event:@"pay_year_vip_click"];
+
     if (self.products.count == 0){
         return;
     }
@@ -167,6 +172,12 @@
         }
     }
     [self startPlanAction:_currentProduct index:0];
+    
+    [MobClick event:@"pay_year_vip_click" label:_value?:@""];
+    NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": @"pay_year_vip_click", @"value": _value?:@""}.mutableCopy;
+    [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
+    } failure:^(NSError * _Nonnull error) {
+    }];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -176,13 +187,32 @@
 
 // dismiss
 - (IBAction)dismissAction {
-    [MobClick event:@"pay_payment_close_click"];
+    [MobClick event:@"pay_payment_close_click" label:_value?:@""];
+    NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": @"pay_payment_close_click", @"value": _value?:@""}.mutableCopy;
+    [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
+    } failure:^(NSError * _Nonnull error) {
+    }];
+    
+
+    CFTimeInterval endTime = CACurrentMediaTime();
+    
+    [MobClick endEvent:@"pay_page_stay" label:[NSString stringWithFormat:@"%@, %gs", _value, endTime - self.startTime]];
+    
+    dict = @{@"event": @"guazinovel", @"action": @"pay_page_stay", @"value":[NSString stringWithFormat:@"%@, %gs", _value, endTime - self.startTime]}.mutableCopy;
+    [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
+    } failure:^(NSError * _Nonnull error) {
+    }];
+
     [self dismissViewControllerAnimated:true completion:nil];
 }
 
 // 恢复购买
 - (IBAction)restoreAction {
-    [MobClick event:@"pay_restore_click"];
+    [MobClick event:@"pay_restore_click" label:_value?:@""];
+    NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": @"pay_restore_click", @"value": _value?:@""}.mutableCopy;
+    [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
+    }  failure:^(NSError * _Nonnull error) {
+    }];
     [ICPurchaseManager restorePurchasesWithSuccess:^{
         [[ICUserManager shared] getUserInfo:^(ZTUserInfoModel * _Nonnull model) {
             [self dismissViewControllerAnimated:true completion:nil];
@@ -202,19 +232,36 @@
     [ICPurchaseManager purchaseWithProductIdWithProductId:payTypeStr inView:self.view success:^{
 //        [MobClick event:@"pay_suc"];
         
+        NSString * action = @"";
         if (index == 0) {
-            [MobClick event:@"pay_year_success"];
+            action = @"pay_year_success";
         }else if (index == 1){
-            [MobClick event:@"pay_week_success"];
+            action = @"pay_week_success";
         }
+        [MobClick event:action label:self.value?:@""];
+        NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": action, @"value": self.value?:@""}.mutableCopy;
+        [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
+        }  failure:^(NSError * _Nonnull error) {
+        }];
         
         [[ICUserManager shared] getUserInfo:^(ZTUserInfoModel * _Nonnull model) {
             [weakSelf dismissViewControllerAnimated:true completion:nil];
         } failure:^{
             [weakSelf dismissViewControllerAnimated:true completion:nil];
         }];
-    } faliure:^{
-
+    } faliure:^(NSString * failResult) {
+        
+        NSString * action = @"";
+        if (index == 0) {
+            action = @"pay_year_fail";
+        }else if (index == 1){
+            action = @"pay_week_fail";
+        }
+        [MobClick event:action label:[NSString stringWithFormat:@"%@, %@", self.value, failResult]];
+        NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": action, @"value":[NSString stringWithFormat:@"%@, %@", self.value, failResult]}.mutableCopy;
+        [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
+        }  failure:^(NSError * _Nonnull error) {
+        }];
     }];
 }
 

superCleaner/Guide/ZJGuideConfig.m

@@ -10,6 +10,7 @@
 #import "ICGuideViewController.h"
 #import "ICUserManager.h"
 #import "LaunchScreenPlaceHolderView.h"
+#import "Data.h"
 
 @interface ZJGuideConfig ()
 
@@ -86,14 +87,21 @@
     NSUserDefaults *userDefault = [NSUserDefaults standardUserDefaults];
     NSString *localVersion = [userDefault objectForKey:kAPP_Version];
     
-    if ([currentVersion isEqualToString:localVersion]) {
-        //已经运行过该版本
-        window.rootViewController = finishMainVC;
-        if (result) {
-            result(NO);
-        }
-    } else {
+    BOOL open = false;
+    Data * data = [[Data alloc] init];
+    NSDictionary * dic = [[data Read] objectForKey:@"open1close0"];
+    if ([[dic objectForKey:@"first_open_navigate"] isEqual:@1]) {
+        open = true;
+    }
+    
+    if (![currentVersion isEqualToString:localVersion] && open) {
+
         [MobClick event:@"app_startup_show"];
+        NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": @"app_startup_show", @"value": @""}.mutableCopy;
+        [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
+        } failure:^(NSError * _Nonnull error) {
+        }];
+        
         config.vc.clickCallBack = ^(BOOL agree) {
             if (agree) {
                 //同意 更新储存版本 切换rootVC
@@ -108,6 +116,13 @@
             result(YES);
         }
         window.rootViewController = config.vc;
+    } else {
+        
+        //已经运行过该版本
+        window.rootViewController = finishMainVC;
+        if (result) {
+            result(NO);
+        }
     }
 }
 

superCleaner/Home/Controller/ICHomeViewController.m

@@ -41,7 +41,6 @@ IBInspectable
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    [MobClick event:@"home_pop"];
     _dataSource = @[@{@"image":@"home_cell_0", @"title":@"照片和视频", @"details":@"清理重复照片和视频"},
                    @{@"image":@"home_cell_2", @"title":@"日历和提醒事项", @"details":@"清理过期提醒事项"},
                    @{@"image":@"home_cell_3", @"title":@"赫兹声波", @"details":@""},
@@ -52,15 +51,19 @@ IBInspectable
     
     [self setupUI];
 
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(guideDismiss) name:@"guideDismiss" object:nil];
+    
+    [[ICUserManager shared] getServiceInfo:nil failure:nil];
     [[ICUserManager shared] loginAndGetUserInfo:^(ZTUserInfoModel * _Nonnull model) {
-        [[ICUserManager shared] getServiceInfo];
 
         if (![ICUserManager shared].isMember) {
             
             Data * data = [[Data alloc] init];
             NSDictionary * dic = [[data Read] objectForKey:@"open1close0"];
             if ([[dic objectForKey:@"isPayfront"] isEqual:@1]) {
+                
                 ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+                iapVC.value = @"home_pop";
                 ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
                 [self presentViewController:navc animated:true completion:nil];
             }
@@ -70,7 +73,7 @@ IBInspectable
         
     }];
     
-    NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": @"tab_imp", @"value": @""}.mutableCopy;
+    NSDictionary * dict = @{@"event": @"guazinovel", @"action": @"tab_imp", @"value": @""}.mutableCopy;
     [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
     } failure:^(NSError * _Nonnull error) {
     }];
@@ -91,6 +94,31 @@ IBInspectable
     [self.headerView.smartClearButton removeRadarAnimation];
 }
 
+- (void)dealloc{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)guideDismiss{
+    [[ICUserManager shared] loginAndGetUserInfo:^(ZTUserInfoModel * _Nonnull model) {
+
+        if (![ICUserManager shared].isMember) {
+            
+            Data * data = [[Data alloc] init];
+            NSDictionary * dic = [[data Read] objectForKey:@"open1close0"];
+            if ([[dic objectForKey:@"isPayfront"] isEqual:@1]) {
+                
+                ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+                iapVC.value = @"home_pop";
+                ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
+                [self presentViewController:navc animated:true completion:nil];
+            }
+        }
+        
+    } failure:^{
+        
+    }];
+}
+
 - (void)setupUI{
     [super setupUI];
     
@@ -341,8 +369,8 @@ IBInspectable
                 ICCleanDustViewController *vc = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICCleanDustViewController"];
                 [self.navigationController pushViewController:vc animated:true];
             }else {
-                [MobClick event:@"phone_deash_clean"];
                 ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+                iapVC.value = @"phone_deash_clean";
                 ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
                 [self presentViewController:navc animated:true completion:nil];
             }
@@ -354,8 +382,8 @@ IBInspectable
                 ICNetworkSpeedViewController *vc = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICNetworkSpeedViewController"];
                 [self.navigationController pushViewController:vc animated:true];
             }else {
-                [MobClick event:@"network_speed_detection"];
                 ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+                iapVC.value = @"network_speed_detection";
                 ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
                 [self presentViewController:navc animated:true completion:nil];
             }
@@ -367,8 +395,8 @@ IBInspectable
                 ICDbTestViewController *vc = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICDbTestViewController"];
                 [self.navigationController pushViewController:vc animated:true];
             }else {
-                [MobClick event:@"db_detection"];
                 ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+                iapVC.value = @"db_detection";
                 ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
                 [self presentViewController:navc animated:true completion:nil];
             }
@@ -380,8 +408,8 @@ IBInspectable
                 ICBatteryCareViewController *vc = [[ICBatteryCareViewController alloc] init];
                 [self.navigationController pushViewController:vc animated:true];
             }else {
-                [MobClick event:@"battery_life"];
                 ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+                iapVC.value = @"battery_life";
                 ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
                 [self presentViewController:navc animated:true completion:nil];
             }

superCleaner/Home/Controller/ICPhotoManageViewController.m

@@ -267,36 +267,37 @@
         }
     
     } else {
+        NSString * value = @"";
         switch (indexPath.row) {
             case 0: {
-                [MobClick event:@"photo_and_video_screenshot"];
+                value = @"photo_and_video_screenshot";
             }
                 break;
             case 1: {
-                [MobClick event:@"photo_and_video_spot"];
+                value = @"photo_and_video_spot";
             }
                 break;
             case 2: {
-                [MobClick event:@"photo_and_video_similar_photo"];
+                value = @"photo_and_video_similar_photo";
             }
                 break;
             case 3: {
-                [MobClick event:@"photo_and_video_similar_video"];
+                value = @"photo_and_video_similar_video";
             }
                 break;
             case 4: {
-                [MobClick event:@"photo_and_video_similar_live_photo"];
+                value = @"photo_and_video_similar_live_photo";
             }
                 break;
             case 5: {
-               [MobClick event:@"photo_and_video_similar_burst_photo"];
+                value = @"photo_and_video_similar_burst_photo";
             }
                 break;
-                
             default:
                 break;
         }
         ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+        iapVC.value = value;
         ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
         [self presentViewController:navc animated:true completion:nil];
     }

superCleaner/Home/Controller/WKClearPhotoViewController.m

@@ -126,8 +126,13 @@
         case 1:
             [self screenshotDetailAction];
             break;
-        case 2:
+        case 2:{
             [MobClick event:@"clean_now_similar_video"];
+            NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": @"clean_now_similar_video", @"value": @""}.mutableCopy;
+            [[ZTNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
+            }  failure:^(NSError * _Nonnull error) {
+            }];
+        }
             break;
         case 3:
             [self livePhotoDetailAction];
@@ -260,12 +265,11 @@
             [MBProgressHUD showError: ICLocalized(@"NoPhotosCleanup")];//@"无照片可清理"];
         }
     } else {
-        [MobClick event:@"clean_now_delete_all"];
         ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+        iapVC.value = @"clean_now_delete_all";
         ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
         [self presentViewController:navc animated:true completion:nil];
     }
-    
 }
 
 - (void)deleteSuccessWithTemDataArr: (NSInteger)count freeSize: (CGFloat)size {
@@ -298,8 +302,8 @@
         vc.navigationItem.title = ICLocalized(@"ScreenCapture"); //@"屏幕截图";
         [self.navigationController pushViewController:vc animated:YES];
     } else {
-        [MobClick event:@"clean_now_screenshot"];
         ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+        iapVC.value = @"clean_now_screenshot";
         ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
         [self presentViewController:navc animated:true completion:nil];
     }
@@ -314,8 +318,8 @@
         vc.photoType = SimilayLivePhoto;
         [self.navigationController pushViewController:vc animated:YES];
     } else {
-        [MobClick event:@"clean_now_similar_live_photo"];
         ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+        iapVC.value = @"clean_now_similar_live_photo";
         ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
         [self presentViewController:navc animated:true completion:nil];
     }
@@ -330,8 +334,8 @@
         vc.photoType = SimilayNormalPhoto;
         [self.navigationController pushViewController:vc animated:YES];
     } else {
-        [MobClick event:@"clean_now_similar_photo"];
         ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+        iapVC.value = @"clean_now_similar_photo";
         ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
         [self presentViewController:navc animated:true completion:nil];
     }

superCleaner/LaunchScreen/LaunchScreenPlaceHolderView.m

@@ -37,21 +37,43 @@
 }
 
 - (void)prepare{
-
-    [[ICUserManager shared] loginAndGetUserInfo:^(ZTUserInfoModel * _Nonnull model) {
-        if (self.finishCallBack) {
-            self.finishCallBack();
-        }
-        if(self->timer){
-            dispatch_source_cancel(self->timer);
-        }
+    
+    [[ICUserManager shared] getServiceInfo:^{
+        [[ICUserManager shared] loginAndGetUserInfo:^(ZTUserInfoModel * _Nonnull model) {
+              if (self.finishCallBack) {
+                  self.finishCallBack();
+              }
+              if(self->timer){
+                  dispatch_source_cancel(self->timer);
+              }
+          } failure:^{
+              if (self.finishCallBack) {
+                  self.finishCallBack();
+              }
+              if(self->timer){
+                  dispatch_source_cancel(self->timer);
+              }
+          }];
+        
+          [self setTimer];
     } failure:^{
-        if (self.finishCallBack) {
-            self.finishCallBack();
-        }
-        if(self->timer){
-            dispatch_source_cancel(self->timer);
-        }
+        [[ICUserManager shared] loginAndGetUserInfo:^(ZTUserInfoModel * _Nonnull model) {
+              if (self.finishCallBack) {
+                  self.finishCallBack();
+              }
+              if(self->timer){
+                  dispatch_source_cancel(self->timer);
+              }
+          } failure:^{
+              if (self.finishCallBack) {
+                  self.finishCallBack();
+              }
+              if(self->timer){
+                  dispatch_source_cancel(self->timer);
+              }
+          }];
+        
+          [self setTimer];
     }];
   
     [self setTimer];

superCleaner/Manager/ICUserManager.h

@@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)getUserInfo: (void(^)(ZTUserInfoModel *model))success failure:(void(^)(void))failure;
 
-- (void)getServiceInfo;
+- (void)getServiceInfo:(void(^)(void))success failure:(void(^)(void))failure;
     
 @property(nonatomic, strong) ZTUserInfoModel *model;
 @property(nonatomic, strong) NSString *network;

superCleaner/Manager/ICUserManager.m

@@ -58,7 +58,7 @@ static ICUserManager * manager;
 
 - (BOOL)isMember {
     
-    return true;
+//    return true;
     
     NSString *dateString = [[NSUserDefaults standardUserDefaults] valueForKeyPath:@"expiryDate"];
 
@@ -152,10 +152,7 @@ static ICUserManager * manager;
     }];
 }
 
-//-(void)getSystemConfigInfo: (void(^)(ZTNovelInfoModel *model))success failure:(void(^)(void))failure {
-//}
-
-- (void)getServiceInfo{
+- (void)getServiceInfo:(void(^)(void))success failure:(void(^)(void))failure{
     
     Data * data = [[Data alloc] init];
     [[ZTNetworkTools shared] getWithAction:appServiceInfo parameters:@{} success:^(id  _Nonnull response) {
@@ -174,13 +171,25 @@ static ICUserManager * manager;
             if ([[[response objectForKey:@"result"] objectForKey:@"data"] objectForKey:@"open1close0"]) {
                 [data WirteDic:[[[response objectForKey:@"result"] objectForKey:@"data"] objectForKey:@"open1close0"] Key:@"open1close0"];
             } else {
-                [data removeDicForKey:@"open1close0"];
+//                [data removeDicForKey:@"open1close0"];
+            }
+            
+            if (success) {
+                success();
+            }
+            
+        }else{
+            if (failure) {
+                failure();
             }
         }
         
     } failure:^(NSError * _Nonnull error) {
         [data removeDicForKey:@"urlInfo"];
         NSLog(@"失败");
+        if (failure) {
+            failure();
+        }
     }];
 }
 

superCleaner/Manager/Network/ICPurchaseManager.swift

@@ -11,7 +11,7 @@ import SwiftyStoreKit
 
 class ICPurchaseManager: NSObject {
     
-    @objc class func purchaseWithProductId(productId: String, inView: UIView, success: @escaping(()->Void) ,faliure: @escaping(()->Void)) {
+    @objc class func purchaseWithProductId(productId: String, inView: UIView, success: @escaping(()->Void) ,faliure: @escaping((String)->Void)) {
         
         let productIdentifier = productId
         
@@ -112,11 +112,11 @@ class ICPurchaseManager: NSObject {
                     }
                 }) { (error) in
                     innerHud.hide(animated: true)
-                    faliure();
+                    faliure(error.localizedDescription);
                 }
 
             case .error(let error):
-                faliure();
+                faliure(error.localizedDescription);
                 hud.hide(animated: true);
                 switch error.code {
                 case .unknown:

superCleaner/Manager/WKClearPhotoManager/WKClearPhotoManager.m

@@ -275,6 +275,8 @@
                 model.imageSize = imageData.length;
                 self.snapshotSize += imageData.length;
                 [weakSelf.snapshotArray addObject: model];
+                
+                self.completionHandler(YES, nil);
             }];
         }];
         [self requestImageWithIndex:index+1];

superCleaner/Other/ICCalendarManageController.m

@@ -143,16 +143,18 @@
             [self.navigationController pushViewController:calendarVC animated:true];
         }
     } else {
+        NSString * value = @"";
         if (indexPath.row == 0) {
-            [MobClick event:@"calendar_and_reminder_overdue_calender"];
+            value = @"calendar_and_reminder_overdue_calender";
         } else {
-            [MobClick event:@"calendar_and_reminder_overdue_reminder"];
+            value = @"calendar_and_reminder_overdue_reminder";
         }
+        
         ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
+        iapVC.value = value;
         ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
         [self presentViewController:navc animated:true completion:nil];
     }
 }
 
-
 @end

superCleaner/zh-Hans.lproj/Localizable.strings

@@ -170,7 +170,7 @@
 "Start" = "开始";
 "Pause" = "暂停";
 
-"PhoneCleaning"     = "手机清灰";
+"PhoneCleaning"     = "赫兹声波";
 "DecibelDetection"  = "声波助手";
 "InternetSpeedTest" = "网络测速";
 "PowerSavingTips"   = "来自 Super Cleaner 9个省电小妙招";