1.弹框逻辑去掉版本更新

2.版本信息去掉版本检测
3.我的页面去掉影响审核的功能

创维盒子/code/AppDelegate/SceneDelegate.m

@@ -1880,7 +1880,8 @@
 #pragma mark 弹框流程 2 APP版本更新弹窗
 - (void)checkVersionFun
 {
-    [self getVersion];
+    //[self getVersion];
+    [self getLastNoticeFun];
 }
 
 #pragma mark- 网络请求
@@ -1919,7 +1920,7 @@
 - (void)checkVersion:(HWVersionModel*)versionModel {
     
     if(!versionModel){//版本信息错误 检测新手弹框流程
-        [self showNewerGuideFun];
+        [self getLastNoticeFun];
         return;
     }
     
@@ -1929,10 +1930,10 @@
     newVersion = [newVersion stringByReplacingOccurrencesOfString:@"V" withString:@""];  //去掉v
     //HLog(@"%@---%@", newVersion, currentVersion);
     if ([currentVersion compare:newVersion options:NSNumericSearch] == NSOrderedSame) { // 本地版本号 == 服务器版本号
-        [self showNewerGuideFun];
+        [self getLastNoticeFun];
     }else if ([currentVersion compare:newVersion options:NSNumericSearch] == NSOrderedDescending) { // 本地版本号 > 服务器版本号 （异常情况）
         [HWDataManager setBoolWithKey:Const_haveVersion value:NO];
-        [self showNewerGuideFun];
+        [self getLastNoticeFun];
     }else { // 本地版本号 < 服务器版本号 (有新版本)
         [self showNewVersion:versionModel];
         [HWDataManager setBoolWithKey:Const_haveVersion value:YES];
@@ -1949,7 +1950,7 @@
     //此版本点击过稍后再试
     NSString *preVersionstr = [HWDataManager getStringWithKey:Const_did_show_version_and_click_wait];
     if(preVersionstr && [versionModel.versionNumber isEqualToString:preVersionstr]){
-        [self showNewerGuideFun];
+        [self getLastNoticeFun];
         return;
     }
     
@@ -1980,7 +1981,7 @@
     
     KWeakSelf
     haveNewVersionView.closeViewFun = ^{
-        [weakSelf showNewerGuideFun];
+        [weakSelf getLastNoticeFun];
     };
 }
 
@@ -1998,7 +1999,7 @@
     if(ksharedAppDelegate.isDidShowPwdType){
         KWeakSelf
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [weakSelf  showNewerGuideFun];
+            [weakSelf  getLastNoticeFun];
         });
         return;
     }

创维盒子/code/Class/Set/appUpdate/AboutViewController.m

@@ -139,14 +139,16 @@
         make.height.mas_equalTo(48.f);
     }];
     
+    _checUpdatekBtn.hidden = YES;
     
     //1.4.3 新加一个tableview 显示镜像相关信息
     //用户协议 隐私协议 app当前版本 系统当前版本 系统待更新版本
     _msgTitleArr = @[NSLocalizedString(@"app_update_use_deal",nil)
                           ,NSLocalizedString(@"app_update_private",nil)
                           ,NSLocalizedString(@"app_version_current",nil)
-                          ,NSLocalizedString(@"system_version_current",nil)
-                          ,NSLocalizedString(@"asystem_version_wait_update",nil)];
+                          //,NSLocalizedString(@"system_version_current",nil)
+                          //,NSLocalizedString(@"asystem_version_wait_update",nil)
+    ];
     
  
     [self.view addSubview:self.tableView];
@@ -154,8 +156,10 @@
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(15.f);
         make.right.mas_equalTo(-15.f);
-        make.top.equalTo(_checUpdatekBtn.mas_bottom).offset(25.f);
-        make.height.mas_equalTo(240.f);
+        //make.top.equalTo(_checUpdatekBtn.mas_bottom).offset(25.f);
+        make.top.equalTo(_checUpdatekBtn.mas_top).offset(15.f);
+        //make.height.mas_equalTo(240.f);
+        make.height.mas_equalTo(160.f);
     }];
     
 //    UIButton *privateBtn = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -174,7 +178,7 @@
 //        make.height.mas_equalTo(38);
 //        make.left.equalTo(self.view.mas_centerX).offset(6);
 //    }];
-//    
+//
 //    UIButton *ruleBtn = [UIButton buttonWithType:UIButtonTypeCustom];
 //    self.ruleBtn = ruleBtn;
 //    ruleBtn.titleLabel.font = [UIFont systemFontOfSize:13.f];
@@ -191,7 +195,7 @@
 //        make.height.mas_equalTo(38);
 //        make.right.equalTo(self.view.mas_centerX).offset(-6);
 //    }];
-//    
+//
 //    UIView *lineView = [[UIView alloc] init];
 //    [lineView setBackgroundColor:HW999999Color];
 //    [self.view addSubview:lineView];
@@ -254,6 +258,7 @@
     }
     //左边标题
     cell.showRightImageType = NO;
+    cell.contentLabel.hidden = NO;
     if (row < _msgTitleArr.count) {
         NSString *title = _msgTitleArr[row];
         cell.titleLabel.text = title;
@@ -266,15 +271,15 @@
             NSString *vers = [iPhone appVersion];
             [cell.contentLabel setText:[NSString stringWithFormat:@"V%@",vers]];
         }
-        else if(_couldphoneSysInfoMod){
-            cell.contentLabel.hidden = NO;
-            if (row == 3) {
-                cell.contentLabel.text = _couldphoneSysInfoMod.data.hostImgVer;
-            }
-            else if(row == 4) {
-                cell.contentLabel.text = _couldphoneSysInfoMod.data.MyNewVersion;
-            }
-        }
+//        else if(_couldphoneSysInfoMod){
+//            cell.contentLabel.hidden = NO;
+//            if (row == 3) {
+//                cell.contentLabel.text = _couldphoneSysInfoMod.data.hostImgVer;
+//            }
+//            else if(row == 4) {
+//                cell.contentLabel.text = _couldphoneSysInfoMod.data.MyNewVersion;
+//            }
+//        }
     }
     
     return cell;
@@ -334,6 +339,7 @@
     NSMutableDictionary *paraDict = [NSMutableDictionary dictionary];
     [paraDict setValue:@"ios" forKey:@"type"];
     [paraDict setValue:@"skyworth" forKey:@"source"];
+    [paraDict setValue:@"iPhone" forKey:@"iosType"];
     
     [[netWorkManager shareInstance] CommonGetWithCallBackCode:upgradeNewVersion Parameters:paraDict success:^(id  _Nonnull responseObject) {
         HLog(@"%@", responseObject);

创维盒子/code/mine/mineViewController.m

@@ -184,40 +184,40 @@
             };
         }
             break;
-        case 11:{//云手机模式
-            cloudPhoneModelViewController *nextVC = [cloudPhoneModelViewController new];
-            [self pushViewController:nextVC animated:YES];
-        }
-            break;
-        case 12:{//帮助与反馈
-            
-            CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
-            vc.titleStr = NSLocalizedString(@"mine_help_title",nil);
-            NSString *url = [[NSString alloc] initWithFormat:@"%@/problemFeedback/#/pages/fileSharing/problem/index?sn=",CloudService];
-            vc.webUrl = [[NSString alloc] initWithFormat:@"%@%@",url,ksharedAppDelegate.DeviceThirdIdMod.data.changeSn];
-            [self pushViewController:vc animated:YES];
-            
-            //数据埋点
-            [[netWorkManager shareInstance] DataEmbeddingPointBy:2 withEventValue:@"Help_feedback"];
-            
-        }
-            break;
-        case 13:{//更换手机
+//        case 11:{//云手机模式
+//            cloudPhoneModelViewController *nextVC = [cloudPhoneModelViewController new];
+//            [self pushViewController:nextVC animated:YES];
+//        }
+//            break;
+//        case 12:{//帮助与反馈
+//            
+//            CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
+//            vc.titleStr = NSLocalizedString(@"mine_help_title",nil);
+//            NSString *url = [[NSString alloc] initWithFormat:@"%@/problemFeedback/#/pages/fileSharing/problem/index?sn=",CloudService];
+//            vc.webUrl = [[NSString alloc] initWithFormat:@"%@%@",url,ksharedAppDelegate.DeviceThirdIdMod.data.changeSn];
+//            [self pushViewController:vc animated:YES];
+//            
+//            //数据埋点
+//            [[netWorkManager shareInstance] DataEmbeddingPointBy:2 withEventValue:@"Help_feedback"];
+//            
+//        }
+//            break;
+        case 11:{//更换手机
             TipsQRCodeForChangeDeviceViewController *nextVC = [TipsQRCodeForChangeDeviceViewController new];
             [self pushViewController:nextVC animated:YES];
             break;
         }
             
-        case 14:{//联系客服
+        case 12:{//联系客服
             customerServiceViewController *vc = [customerServiceViewController new];
             [self pushViewController:vc animated:YES];
         }
             break;
             
-        case 15:{//清理缓存
+        case 13:{//清理缓存
             [self clickClearCacheButtonFun];
         }
-        case 16:{//版本信息
+        case 14:{//版本信息
             AboutViewController *nextVC = [[AboutViewController alloc] init];
             nextVC.getSysInfo = ^{
                 [[webRtcManager shareManager] getSysInfoFun];
@@ -226,16 +226,15 @@
         }
             break;
             
-        case 17:{//新手引导
-            CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
-            vc.titleStr = NSLocalizedString(@"mine_newuser_title",nil);
-            NSString *url = [[NSString alloc] initWithFormat:@"%@/warrantyService/index.html#/novice",CloudService];
-            vc.webUrl = url;
-            [self pushViewController:vc animated:YES];
-        }
-            break;
+//        case 17:{//新手引导
+//            CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
+//            vc.titleStr = NSLocalizedString(@"mine_newuser_title",nil);
+//            NSString *url = [[NSString alloc] initWithFormat:@"%@/warrantyService/index.html#/novice",CloudService];
+//            vc.webUrl = url;
+//            [self pushViewController:vc animated:YES];
+//        }
+//            break;
         
-            break;
         
 //        case 17:{
 //            [[iToast makeText:@"点击了注销"] show];

创维盒子/code/mine/view/MineCommonUsedView.m

@@ -54,28 +54,28 @@
 
     
     NSArray *titleArr = @[NSLocalizedString(@"my_set_Privacy_Model",nil),
-                          NSLocalizedString(@"mine_cloudPhone_Model_title",nil),
-                          NSLocalizedString(@"mine_help_title",nil),
+                          //NSLocalizedString(@"mine_cloudPhone_Model_title",nil),
+                          //NSLocalizedString(@"mine_help_title",nil),
                           NSLocalizedString(@"my_set_no_change_phone",nil),
                           
                           NSLocalizedString(@"my_set_no_connect_kefu",nil),
                           NSLocalizedString(@"my_set_no_clear_cache",nil),
                           NSLocalizedString(@"my_set_no_check_update",nil),
-                          NSLocalizedString(@"mine_newuser_title",nil),
+                          //NSLocalizedString(@"mine_newuser_title",nil),
                           //NSLocalizedString(@"mine_sn_cancel_title",nil)
     ];
     
     
     
     NSArray *imageArr = @[@"mine_Privacy_icon",
-                          @"mine_cloudPhone_model_icon",
-                          @"mine_help_icon",
+                          //@"mine_cloudPhone_model_icon",
+                          //@"mine_help_icon",
                           @"mine_changePhone_icon",
                           
                           @"mine_customer_icon",
                           @"mine_clear_icon",
                           @"mine_version_icon",
-                          @"mine_newUser_icon",
+                          //@"mine_newUser_icon",
                           //@"mine_cancell_icon",
     ];