1.同步1.0的日志

1.我的页面 版本信息页面修改
2.删除用户协议 隐私协议入口

创维盒子/双子星云手机/AppDelegate/AppDelegate.m

@@ -126,7 +126,7 @@
 #ifdef DEBUG
     [[PLeakSniffer sharedInstance] installLeakSniffer];
 #else
-    [Bugly startWithAppId:@"179559a521"];
+    
 #endif
     
     [SVProgressHUD setDefaultStyle:(SVProgressHUDStyleDark)];
@@ -452,7 +452,10 @@
             return NASFileByBoxServiceByPingNot;
         }
         
-        if([_NASMsgMod.data.domainName rangeOfString:@"http"].location != NSNotFound){
+        if(!_NASMsgMod.data.domainName){
+            return nil;
+        }
+        else if([_NASMsgMod.data.domainName rangeOfString:@"http"].location != NSNotFound){
             NASFileByBoxServiceByPingNot =  [[NSString alloc] initWithFormat:@"%@:%@/",_NASMsgMod.data.domainName,_NASMsgMod.data.port];
             
         }

创维盒子/双子星云手机/Class/Guide/GuideLastView.m

@@ -31,7 +31,8 @@
     [self setBackgroundColor:HWECECECColor];
     
     /*背景视图*/
-    UIImageView *bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"guide_last_bg_icon"]];
+    UIImageView *bgImageView = [[UIImageView alloc] init];
+                                //WithImage:[UIImage imageNamed:@"guide_last_bg_icon"]];
     [self addSubview:bgImageView];
     [bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(0);
@@ -44,16 +45,18 @@
     UIImage *middleImage = [UIImage imageNamed:@"guide_last_middle_icon"];
     UIImageView *middleImageView = [[UIImageView alloc] initWithImage:middleImage];
     [bgImageView addSubview:middleImageView];
+    
+    //375*419 (原来375*448)
     [middleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(H_STATE_BAR + 211.f);
+        make.centerY.mas_equalTo(-20.f);
         make.left.mas_equalTo(0);
         make.right.mas_equalTo(0);
-        make.height.mas_equalTo((middleImage.size.height/middleImage.size.width)*SCREEN_W);
+        make.height.mas_equalTo(419*AUTOSCALE);
     }];
     
     /*中间标签*/
     UILabel *middleLabel = [[UILabel alloc] init];
-    [middleLabel setTextColor:HW333333Color];
+    [middleLabel setTextColor:[UIColor blackColor]];
     [middleLabel setNumberOfLines:0];
     [middleLabel setTextAlignment:(NSTextAlignmentCenter)];
     [middleLabel setFont:[UIFont boldSystemFontOfSize:14.f]];
@@ -62,7 +65,7 @@
     [middleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(-20.f);
         make.left.mas_equalTo(20.f);
-        make.bottom.equalTo(middleImageView.mas_bottom).offset(-12.f);
+        make.bottom.equalTo(middleImageView.mas_bottom).offset(15.f);
     }];
     
     /*底部标签*/

创维盒子/双子星云手机/Class/Guide/GuideView.m

@@ -47,26 +47,41 @@
     }];
     
 //    guide_up_icon
-    UIImageView *upImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"guide_up_icon"]];
+    UIImageView *upImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"GBOX_icon"]];
     [bgImageView addSubview:upImageView];
     [upImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(H_STATE_BAR + 12.f);
         make.left.mas_equalTo(25.f);
-        make.width.mas_equalTo(132);
-        make.height.mas_equalTo(28);
+        make.width.mas_equalTo(29.0);
+        make.height.mas_equalTo(29.0);
     }];
     
+    //GBOX
+    UILabel *iconRightLab = [[UILabel alloc] init];
+    iconRightLab.text = @"GBOX";
+    iconRightLab.font = [UIFont boldSystemFontOfSize:20.0];
+    iconRightLab.textColor = [UIColor blackColor];
+    [bgImageView addSubview:iconRightLab];
+    
+    [iconRightLab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(upImageView.mas_top);
+        make.left.mas_equalTo(upImageView.mas_right).offset(5);
+        //make.width.mas_equalTo(29.0);
+        make.height.mas_equalTo(29.0);
+    }];
+    
+    
     /*跳过*/
     bgImageView.userInteractionEnabled = YES;
     UIButton *skipBtn = [[UIButton alloc] init];
     [skipBtn addTarget:self action:@selector(didClickButFun:) forControlEvents:(UIControlEventTouchUpInside)];
     [skipBtn setTitle:NSLocalizedString(@"guide_skip",nil) forState:(UIControlStateNormal)];
-    //[skipBtn setTitleColor:HW999999Color forState:(UIControlStateNormal)];
+    [skipBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
     [skipBtn.titleLabel setFont:[UIFont systemFontOfSize:14.f]];
     [skipBtn.layer setCornerRadius:14.f];
-    skipBtn.layer.borderColor = [UIColor whiteColor].CGColor;
+    skipBtn.layer.borderColor = [UIColor clearColor].CGColor;
     skipBtn.layer.borderWidth = 1.0;
-    //[skipBtn setBackgroundColor:HWE3E8F1Color];
+    [skipBtn setBackgroundColor:[UIColor hwColor:@"#232323" alpha:0.8]];
     skipBtn.clipsToBounds = YES;
     [self addSubview:skipBtn];
     [skipBtn mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -94,7 +109,7 @@
     NSMutableAttributedString *noteStr = [[NSMutableAttributedString alloc] initWithString:totalStr];
     
     NSRange redRange = NSMakeRange([totalStr rangeOfString:strRight].location, [totalStr rangeOfString:strRight].length);
-    [noteStr addAttribute:NSForegroundColorAttributeName value:HW0458E3Color range:redRange];
+    [noteStr addAttribute:NSForegroundColorAttributeName value:[UIColor blackColor] range:redRange];
     
     /*左头部标签*/
     UILabel *topLeftLabel = [[UILabel alloc] init];
@@ -153,7 +168,7 @@
     
     /*底部标签*/
     UILabel *bottomLabel = [[UILabel alloc] init];
-    [bottomLabel setTextColor:HW9D9D9DColor];
+    [bottomLabel setTextColor:[UIColor blackColor]];
     [bottomLabel setNumberOfLines:0];
     [bottomLabel setTextAlignment:(NSTextAlignmentCenter)];
     [bottomLabel setFont:[UIFont systemFontOfSize:14.f]];
@@ -167,7 +182,7 @@
     
     for (NSInteger nfori = 0; nfori < 4; nfori++) {
         UIView *pointView = [[UIView alloc] init];
-        [pointView setBackgroundColor:[UIColor whiteColor]];
+        [pointView setBackgroundColor:[UIColor lightGrayColor]];
         [pointView.layer setCornerRadius:2.f];
         [bgImageView addSubview:pointView];
         [pointView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -179,7 +194,7 @@
     }
     
     pointSelectView = [[UIView alloc] init];
-    [pointSelectView setBackgroundColor:HW058DFBColor];
+    [pointSelectView setBackgroundColor:[UIColor blackColor]];
     [pointSelectView.layer setCornerRadius:2.f];
     [bgImageView addSubview:pointSelectView];
     [pointSelectView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -195,7 +210,7 @@
     gl.frame = CGRectMake(0,0,(index + 1)*SCREEN_W/4.f,8);
     gl.startPoint = CGPointMake(0, 0.5);
     gl.endPoint = CGPointMake(1, 0.5);
-    gl.colors = @[(__bridge id)HW02DCF6Color.CGColor, (__bridge id)HW01B7EAColor.CGColor];
+    gl.colors = @[(__bridge id)[UIColor hwColor:@"#FFCF70"].CGColor, (__bridge id)[UIColor hwColor:@"#ECECEC"].CGColor];
 
     gl.locations = @[@(0), @(1.0f)];
     

创维盒子/双子星云手机/Class/Set/appUpdate/AboutViewController.m

@@ -1,6 +1,6 @@
 //
 //  AboutViewController.m
-//  VclustersGemini
+//  //
 //
 //  Created by APPLE on 2020/2/24.
 //  Copyright © 2020 APPLE. All rights reserved.
@@ -84,7 +84,7 @@
     [appName setFont:[UIFont boldSystemFontOfSize:16.f]];
     [appName setTextAlignment:(NSTextAlignmentCenter)];
     [appName setText:[NSString stringWithFormat:@"%@",[iPhone appBundleName]]];
-    //[appName setText:[NSString stringWithFormat:@"%@",@"Private- X"]];
+    //[appName setText:[NSString stringWithFormat:@"%@",@"GBOX"]];
     
     [self.view addSubview:appName];
     [appName mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -119,14 +119,14 @@
     _gl_checkVersonBut.frame = CGRectMake(0,0,160.f,48.f);
     _gl_checkVersonBut.startPoint = CGPointMake(0, 0.5);
     _gl_checkVersonBut.endPoint = CGPointMake(1, 0.5);
-    _gl_checkVersonBut.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
+    _gl_checkVersonBut.colors = @[(__bridge id)HWFFE10FColor.CGColor, (__bridge id)HWFFE411Color.CGColor];
     _gl_checkVersonBut.locations = @[@(0), @(1.0f)];
     
     [_checUpdatekBtn.layer addSublayer:_gl_checkVersonBut];
     [_checUpdatekBtn addTarget:self action:@selector(versionCheckBtnClick) forControlEvents:(UIControlEventTouchUpInside)];
     [_checUpdatekBtn setTitle:NSLocalizedString(@"app_update_check",nil) forState:(UIControlStateNormal)];
     [_checUpdatekBtn setTitle:NSLocalizedString(@"app_update_last_version",nil) forState:(UIControlStateDisabled)];
-    [_checUpdatekBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
+    [_checUpdatekBtn setTitleColor:[UIColor blackColor] forState:(UIControlStateNormal)];
     [_checUpdatekBtn.titleLabel setFont:[UIFont systemFontOfSize:16.f]];
     [_checUpdatekBtn.layer setCornerRadius:8.f];
     _checUpdatekBtn.clipsToBounds = YES;
@@ -140,11 +140,9 @@
     }];
     
     
-    //1.4.3 新加一个tableview 显示镜像相关信息
-    //用户协议 隐私协议 app当前版本 系统当前版本 系统待更新版本
-    _msgTitleArr = @[NSLocalizedString(@"app_update_use_deal",nil)
-                          ,NSLocalizedString(@"app_update_private",nil)
-                          ,NSLocalizedString(@"app_version_current",nil)
+    //新加一个tableview 显示镜像相关信息
+    //app当前版本 系统当前版本 系统待更新版本
+    _msgTitleArr = @[NSLocalizedString(@"app_version_current",nil)
                           ,NSLocalizedString(@"system_version_current",nil)
                           ,NSLocalizedString(@"asystem_version_wait_update",nil)];
     
@@ -155,7 +153,7 @@
         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.height.mas_equalTo(160.f);
     }];
     
 //    UIButton *privateBtn = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -174,7 +172,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 +189,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];
@@ -258,20 +256,16 @@
         NSString *title = _msgTitleArr[row];
         cell.titleLabel.text = title;
     
-        if(row == 0 || row ==1){
-            cell.showRightImageType = YES;
-            cell.contentLabel.hidden = YES;
-        }
-        else if(row == 2){
+       if(row == 0){
             NSString *vers = [iPhone appVersion];
             [cell.contentLabel setText:[NSString stringWithFormat:@"V%@",vers]];
         }
         else if(_couldphoneSysInfoMod){
             cell.contentLabel.hidden = NO;
-            if (row == 3) {
+            if (row == 1) {
                 cell.contentLabel.text = _couldphoneSysInfoMod.data.hostImgVer;
             }
-            else if(row == 4) {
+            else if(row == 2) {
                 cell.contentLabel.text = _couldphoneSysInfoMod.data.MyNewVersion;
             }
         }
@@ -292,17 +286,6 @@
     return 20;
 }
 
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    NSInteger row = indexPath.row;
-    
-    if(row == 0){
-        [self ruleBtnClick];
-    }
-    else if(row ==1){
-        [self privateBtnClick];
-    }
-}
 
 - (UIImage *)getAppIcon{
 
@@ -333,7 +316,7 @@
 
     NSMutableDictionary *paraDict = [NSMutableDictionary dictionary];
     [paraDict setValue:@"ios" forKey:@"type"];
-    [paraDict setValue:@"skyworth" forKey:@"source"];
+    [paraDict setValue:@"GBox" forKey:@"source"];
     
     [[netWorkManager shareInstance] CommonGetWithCallBackCode:upgradeNewVersion Parameters:paraDict success:^(id  _Nonnull responseObject) {
         HLog(@"%@", responseObject);
@@ -341,7 +324,7 @@
 
       SuperModel *model = [[SuperModel alloc] initWithDictionary:responseObject error:nil];
 
-       if (model.status == 0) {
+       if (model && model.status == 0) {
 
            HWVersionModel *model = [HWVersionModel mj_objectWithKeyValues:responseObject[@"data"]];
            self.versionModel = model;
@@ -367,7 +350,6 @@
 //  NSString *currentVersion = [NSBundle mainBundle].infoDictionary[@"CFBundleVersion"];
     NSString *currentVersion = [NSBundle mainBundle].infoDictionary[@"CFBundleShortVersionString"];
     NSString *newVersion = [self.versionModel.versionNumber stringByReplacingOccurrencesOfString:@"v" withString:@""];  //去掉v
-    newVersion = [newVersion stringByReplacingOccurrencesOfString:@"V" withString:@""];  //去掉v
 //    HLog(@"%@---%@", newVersion, currentVersion);
     if ([currentVersion compare:newVersion options:NSNumericSearch] == NSOrderedSame) { // 本地版本号 == 服务器版本号
 //        [self showNoNewVersion];
@@ -430,21 +412,19 @@
 }
 
 - (void)ruleBtnClick {
-//https://cliys.armclouding.com/h5/protocol/protocol.html?agreementCoding=YSZYHXY2002&type=1
-//    [self gotoProtocolWKWebVCByPush:YES];
+
     CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
     vc.titleStr = NSLocalizedString(@"app_update_use_deal",nil);
-    NSString *url = @"https://cliys.armclouding.com/h5/protocol/protocol.html?agreementCoding=YSZYHXY2003&type=1";//[NSString stringWithFormat:@"%@/h5/protocol/protocol.html?agreementCoding=YSZYHXY2002&type=1", CloudService];
+    NSString *url = @"";
     vc.webUrl = url;
     [self.navigationController pushViewController:vc animated:YES];
 }
 
 - (void)privateBtnClick {
     
-//    [self gotoPrivateProtocolWKWebVCByPush:YES];
     CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
     vc.titleStr = NSLocalizedString(@"app_update_private",nil);
-    NSString *url = @"https://cliys.armclouding.com/h5/protocol/protocol.html?agreementCoding=YSZYSXY2002&type=1";//[NSString stringWithFormat:@"%@/h5/protocol/protocol.html?agreementCoding=YSZYSXY2001&type=1", CloudService];
+    NSString *url = @"";
     vc.webUrl = url;
     [self.navigationController pushViewController:vc animated:YES];
 }

创维盒子/双子星云手机/Class/Set/previewFile/previewAudioOrDocumentViewController.m

@@ -770,7 +770,7 @@
     
     if(!_curNASFileAudioMod){
         [self getFileListFun:NO];
-        [self queryShareSwitchFunFun];
+        //[self queryShareSwitchFunFun];
     }
 }
 

创维盒子/双子星云手机/Class/Set/previewFile/previewFileAndFolderViewController.m

@@ -813,7 +813,7 @@
     
     if(!_curNASFileAudioMod){
         [self getFileListFun:NO];
-        [self queryShareSwitchFunFun];
+        //[self queryShareSwitchFunFun];
     }
 }
 

创维盒子/双子星云手机/Class/Set/previewFile/previewImageOrVideoViewController.m

@@ -1150,7 +1150,7 @@
 - (void)setIsPhotoType:(BOOL)isPhotoType
 {
     _isPhotoType = isPhotoType;
-    [self queryShareSwitchFunFun];
+    //[self queryShareSwitchFunFun];
 }
 
 #pragma mark 获取分享开关

创维盒子/双子星云手机/Class/Set/privacyMode/privacyModeTipViewController.m

@@ -1,12 +1,11 @@
 //
 //  privacyModeTipViewController.m
-//  隐私保护
+  //
 //
-//  Created by xd h on 2023/11/28.
+//  Created David on 2023/11/28.
 //
 
 #import "privacyModeTipViewController.h"
-#import "connectDeviceManager.h"
 
 @interface privacyModeTipViewController ()
 
@@ -49,8 +48,8 @@
     [midImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.mas_equalTo(0);
         make.top.mas_equalTo(56 + safeArea);
-        make.width.mas_equalTo(193);
-        make.height.mas_equalTo(176);
+        make.width.mas_equalTo(160);
+        make.height.mas_equalTo(193);
     }];
     
     UILabel *topLab = [[UILabel alloc] init];
@@ -78,14 +77,15 @@
         make.left.mas_equalTo(30);
         make.right.mas_equalTo(-30);
         make.top.mas_equalTo(topLab.mas_bottom).offset(15);
-        make.height.mas_equalTo(40);
+        make.height.mas_equalTo(60);
     }];
     
     
     UILabel *tipLab2 = [[UILabel alloc] init];
     tipLab2.text = NSLocalizedString(@"my_set_Privacy_Mode_tip2",nil);
-    tipLab2.textColor = [UIColor hwColor:@"#2974DE" alpha:1.0];
+    tipLab2.textColor = HWFFD315Color;
     tipLab2.font = [UIFont systemFontOfSize:14.0];
+    tipLab2.numberOfLines = 0;
     tipLab2.textAlignment = NSTextAlignmentCenter;
     tipLab2.numberOfLines = 0;
     [self.view addSubview:tipLab2];
@@ -94,7 +94,7 @@
         make.left.mas_equalTo(30);
         make.right.mas_equalTo(-30);
         make.top.mas_equalTo(tipLab1.mas_bottom).offset(10);
-        make.height.mas_equalTo(20);
+        make.height.mas_equalTo(40);
     }];
     
     //跳过
@@ -102,7 +102,7 @@
     skipBtn.tag = 1;
     [skipBtn addTarget:self action:@selector(didClickButFun:) forControlEvents:(UIControlEventTouchUpInside)];
     [skipBtn setTitle:NSLocalizedString(@"guide_skip",nil) forState:(UIControlStateNormal)];
-    [skipBtn setTitleColor:[UIColor hwColor:@"#2974DE" alpha:1.0] forState:(UIControlStateNormal)];
+    [skipBtn setTitleColor:[UIColor hwColor:@"#999999" alpha:1.0] forState:(UIControlStateNormal)];
     [skipBtn.titleLabel setFont:[UIFont systemFontOfSize:14.f]];
 //    [skipBtn.layer setCornerRadius:14.f];
 //    skipBtn.layer.borderColor = [UIColor whiteColor].CGColor;
@@ -127,13 +127,13 @@
     gl.frame = CGRectMake(0,0,okBtn_W,48);
     gl.startPoint = CGPointMake(0, 0.5);
     gl.endPoint = CGPointMake(1, 0.5);
-    gl.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
+    gl.colors = @[(__bridge id)HWFFE10FColor.CGColor, (__bridge id)HWFFE411Color.CGColor];
     gl.locations = @[@(0), @(1.0f)];
     okBtn.layer.cornerRadius = 24;
     okBtn.clipsToBounds = YES;
     [okBtn.layer addSublayer:gl];
     [okBtn setTitle:NSLocalizedString(@"my_set_Privacy_Mode_open",nil) forState:(UIControlStateNormal)];
-    [okBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
+    [okBtn setTitleColor:[UIColor blackColor] forState:(UIControlStateNormal)];
     [okBtn addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
     
     [self.view addSubview:okBtn];

创维盒子/双子星云手机/NAS/NASViewController.m

@@ -692,7 +692,7 @@
     [super viewWillAppear:animated];
     [self getLastFileDataFun];
     
-    [self queryShareSwitchFunFun];
+    //[self queryShareSwitchFunFun];
     [self queryShareBeMarkFun];
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{

创维盒子/双子星云手机/NAS/NasPreviewVideoViewController.m

@@ -751,7 +751,7 @@
     
     if(!_curNASFileAudioMod){
         [self getFileListFun:NO];
-        [self queryShareSwitchFunFun];
+        //[self queryShareSwitchFunFun];
     }
 }
 

创维盒子/双子星云手机/NAS/nasLastFileViewController.m

@@ -580,7 +580,7 @@
     [super viewWillAppear:animated];
     [self getLastFileDataFun];
     
-    [self queryShareSwitchFunFun];
+    //[self queryShareSwitchFunFun];
 }
 
 #pragma mark 获取最近文件数据

创维盒子/双子星云手机/mine/mineViewController.m

@@ -60,18 +60,18 @@
         make.height.mas_equalTo(280.0*AUTOSCALE);
     }];
     
-    UIButton *pcScanButton = [[UIButton alloc] init];
-    [pcScanButton setImage:[UIImage imageNamed:@"pc_scan_icon"] forState:UIControlStateNormal];
-    pcScanButton.tag = 100;
-    [pcScanButton addTarget:self action:@selector(didClickButtonFun:) forControlEvents:UIControlEventTouchUpInside];
-    [self.view addSubview:pcScanButton];
-    
-    [pcScanButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(50);
-        make.right.mas_equalTo(-15);
-        make.width.mas_equalTo(40);
-        make.height.mas_equalTo(40);
-    }];
+//    UIButton *pcScanButton = [[UIButton alloc] init];
+//    [pcScanButton setImage:[UIImage imageNamed:@"pc_scan_icon"] forState:UIControlStateNormal];
+//    pcScanButton.tag = 100;
+//    [pcScanButton addTarget:self action:@selector(didClickButtonFun:) forControlEvents:UIControlEventTouchUpInside];
+//    [self.view addSubview:pcScanButton];
+//    
+//    [pcScanButton mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.mas_equalTo(50);
+//        make.right.mas_equalTo(-15);
+//        make.width.mas_equalTo(40);
+//        make.height.mas_equalTo(40);
+//    }];
     
     CGFloat tipImageTop = 50 + 40;
     
@@ -186,35 +186,36 @@
             [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 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 12:{//更换手机
             TipsQRCodeForChangeDeviceViewController *nextVC = [TipsQRCodeForChangeDeviceViewController new];
             [self pushViewController:nextVC animated:YES];
             break;
         }
             
-        case 14:{//联系客服
-            customerServiceViewController *vc = [customerServiceViewController new];
-            [self pushViewController:vc animated:YES];
-        }
-            break;
+//        case 14:{//联系客服
+//            customerServiceViewController *vc = [customerServiceViewController new];
+//            [self pushViewController:vc animated:YES];
+//        }
+//            break;
             
-        case 15:{//清理缓存
+        case 13:{//清理缓存
             [self clickClearCacheButtonFun];
         }
-        case 16:{//版本信息
+            break;
+        case 14:{//版本信息
             AboutViewController *nextVC = [[AboutViewController alloc] init];
             nextVC.getSysInfo = ^{
                 [[webRtcManager shareManager] getSysInfoFun];
@@ -223,16 +224,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];

创维盒子/双子星云手机/mine/view/MineCommonUsedView.m

@@ -55,13 +55,13 @@
     
     NSArray *titleArr = @[NSLocalizedString(@"my_set_Privacy_Model",nil),
                           NSLocalizedString(@"mine_cloudPhone_Model_title",nil),
-                          NSLocalizedString(@"mine_help_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_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)
     ];
     
@@ -69,13 +69,13 @@
     
     NSArray *imageArr = @[@"mine_Privacy_icon",
                           @"mine_cloudPhone_model_icon",
-                          @"mine_help_icon",
+                          //@"mine_help_icon",
                           @"mine_changePhone_icon",
                           
-                          @"mine_customer_icon",
+                          //@"mine_customer_icon",
                           @"mine_clear_icon",
                           @"mine_version_icon",
-                          @"mine_newUser_icon",
+                          //@"mine_newUser_icon",
                           //@"mine_cancell_icon",
     ];