소스 검색

2、点击系统升级弹框确定按钮后30分钟内不弹; 3、重启、恢复出厂设备、首次设置密码 3个情况下8分钟之内不弹

huangxiaodong 3 달 전
부모
커밋
e59feda546

+ 14 - 0
创维盒子/code/AppDelegate/SceneDelegate.m

@@ -442,6 +442,13 @@
 //        self.window.rootViewController = nextVCNav;
     }
     else{
+        //1、重启、恢复出厂设备、首次设置密码 3个情况下8分钟之内不弹
+        long seconds =  [iTools getNowTimeStamp];
+        NSNumber *secondsNum = [NSNumber numberWithLong:seconds];
+        if(secondsNum){
+            [HWDataManager  setNumberWithKey:stringKeyAddSn(@"disenable_type2_BoxHeartbeat") value:secondsNum];
+        }
+        
         /*没有设置密码*/
         SetPWDFirstViewController *qrCodeVC = [[SetPWDFirstViewController alloc] init];
         BaseNavigationController *qrCodeVCNav = [[BaseNavigationController alloc] initWithRootViewController:qrCodeVC];
@@ -1747,6 +1754,13 @@
             [weakSelf otaUpdateNowFun];
         });
     }];
+    
+    //1.点击更新 标志 30分别 不谈 心跳弹框
+    long seconds =  [iTools getNowTimeStamp];
+    NSNumber *secondsNum = [NSNumber numberWithLong:seconds];
+    if(secondsNum){
+        [HWDataManager  setNumberWithKey:stringKeyAddSn(@"disenable_type1_BoxHeartbeat") value:secondsNum];
+    }
 }
 
 #pragma mark 弹框流程 1 OTA升级完成

+ 17 - 0
创维盒子/code/NAS/NASViewController.m

@@ -1003,6 +1003,23 @@
 #pragma mark 检测盒子的心跳情况
 - (void)checkBoxHeartbeatFun
 {
+    //2、点击系统升级弹框确定按钮后30分钟内不弹;
+    NSNumber *preSecondNum =  [HWDataManager getNumberWithKey:stringKeyAddSn(@"disenable_type1_BoxHeartbeat")];
+    if(preSecondNum){
+        long seconds =  [iTools getNowTimeStamp];
+        if(seconds - preSecondNum.longValue <= 60*30){
+            return;
+        }
+    }
+    
+    //3、重启、恢复出厂设备、首次设置密码 3个情况下8分钟之内不弹
+    NSNumber *preSecondNum2 =  [HWDataManager getNumberWithKey:stringKeyAddSn(@"disenable_type2_BoxHeartbeat")];
+    if(preSecondNum2){
+        long seconds =  [iTools getNowTimeStamp];
+        if(seconds - preSecondNum2.longValue <= 60*8){
+            return;
+        }
+    }
     
     if(ksharedAppDelegate.didShowBoxHeartbeatAlertType
        ||[webRtcManager shareManager].isResetingType

+ 32 - 0
创维盒子/code/webRtc/webRtcManager/webRtcManager.m

@@ -550,6 +550,13 @@
     [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Cloud_restart"];
     
     _isRebootIngType = YES;
+    
+    //1、重启、恢复出厂设备、首次设置密码 3个情况下8分钟之内不弹
+    long seconds =  [iTools getNowTimeStamp];
+    NSNumber *secondsNum = [NSNumber numberWithLong:seconds];
+    if(secondsNum){
+        [HWDataManager  setNumberWithKey:stringKeyAddSn(@"disenable_type2_BoxHeartbeat") value:secondsNum];
+    }
 }
 
 #pragma mark 恢复出厂设置
@@ -564,6 +571,13 @@
     //数据埋点
     [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Cloud_restore_factory"];
     _isResetingType = YES;
+    
+    //1、重启、恢复出厂设备、首次设置密码 3个情况下8分钟之内不弹
+    long seconds =  [iTools getNowTimeStamp];
+    NSNumber *secondsNum = [NSNumber numberWithLong:seconds];
+    if(secondsNum){
+        [HWDataManager  setNumberWithKey:stringKeyAddSn(@"disenable_type2_BoxHeartbeat") value:secondsNum];
+    }
 }
 
 #pragma mark 云机截图保存到云机图库
@@ -1085,6 +1099,24 @@
 #pragma mark 检测盒子的心跳情况
 - (void)checkBoxHeartbeatFun
 {
+    //2、点击系统升级弹框确定按钮后30分钟内不弹;
+    NSNumber *preSecondNum =  [HWDataManager getNumberWithKey:stringKeyAddSn(@"disenable_type1_BoxHeartbeat")];
+    if(preSecondNum){
+        long seconds =  [iTools getNowTimeStamp];
+        if(seconds - preSecondNum.longValue <= 60*30){
+            return;
+        }
+    }
+    
+    //3、重启、恢复出厂设备、首次设置密码 3个情况下8分钟之内不弹
+    NSNumber *preSecondNum2 =  [HWDataManager getNumberWithKey:stringKeyAddSn(@"disenable_type2_BoxHeartbeat")];
+    if(preSecondNum2){
+        long seconds =  [iTools getNowTimeStamp];
+        if(seconds - preSecondNum2.longValue <= 60*8){
+            return;
+        }
+    }
+    
     if(ksharedAppDelegate.didShowBoxHeartbeatAlertType
        ||[webRtcManager shareManager].isResetingType
        ||[webRtcManager shareManager].isRebootIngType

+ 19 - 0
创维盒子/code/webRtc/webRtcPlayerViewController.m

@@ -1480,6 +1480,25 @@
 #pragma mark 检测盒子的心跳情况
 - (void)checkBoxHeartbeatFun
 {
+    //2、点击系统升级弹框确定按钮后30分钟内不弹;
+    NSNumber *preSecondNum =  [HWDataManager getNumberWithKey:stringKeyAddSn(@"disenable_type1_BoxHeartbeat")];
+    if(preSecondNum){
+        long seconds =  [iTools getNowTimeStamp];
+        if(seconds - preSecondNum.longValue <= 60*30){
+            return;
+        }
+    }
+    
+    //3、重启、恢复出厂设备、首次设置密码 3个情况下8分钟之内不弹
+    NSNumber *preSecondNum2 =  [HWDataManager getNumberWithKey:stringKeyAddSn(@"disenable_type2_BoxHeartbeat")];
+    if(preSecondNum2){
+        long seconds =  [iTools getNowTimeStamp];
+        if(seconds - preSecondNum2.longValue <= 60*8){
+            return;
+        }
+    }
+    
+    
     if(ksharedAppDelegate.didShowBoxHeartbeatAlertType
        ||[webRtcManager shareManager].isResetingType
        ||[webRtcManager shareManager].isRebootIngType