Ver código fonte

1.需求:云手机模式

huangxiaodong 7 meses atrás
pai
commit
0ebdeb4cb7

+ 14 - 2
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -677,6 +677,10 @@
 		6B72725C2B0E22D000C03F87 /* uploadFileRecordBgScorllView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B72725A2B0E22D000C03F87 /* uploadFileRecordBgScorllView.m */; };
 		6B72725F2B0E240F00C03F87 /* uploadFileRecordTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B72725D2B0E240F00C03F87 /* uploadFileRecordTableView.h */; };
 		6B7272602B0E240F00C03F87 /* uploadFileRecordTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B72725E2B0E240F00C03F87 /* uploadFileRecordTableView.m */; };
+		6B78FD2F2CD4727E00E1A8B2 /* cloudPhoneModelViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B78FD2D2CD4727E00E1A8B2 /* cloudPhoneModelViewController.h */; };
+		6B78FD302CD4727E00E1A8B2 /* cloudPhoneModelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B78FD2E2CD4727E00E1A8B2 /* cloudPhoneModelViewController.m */; };
+		6B78FD312CD4727E00E1A8B2 /* cloudPhoneModelViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B78FD2D2CD4727E00E1A8B2 /* cloudPhoneModelViewController.h */; };
+		6B78FD322CD4727E00E1A8B2 /* cloudPhoneModelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B78FD2E2CD4727E00E1A8B2 /* cloudPhoneModelViewController.m */; };
 		6B7B65582AD9227700BE8CB3 /* PlayerViewController+otherDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B7B65562AD9227700BE8CB3 /* PlayerViewController+otherDelegate.h */; };
 		6B7B65592AD9227700BE8CB3 /* PlayerViewController+otherDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6B7B65572AD9227700BE8CB3 /* PlayerViewController+otherDelegate.mm */; };
 		6B7DDF262C421DA900EBDFDD /* previewVideoLandscapeTopMoreView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B7DDF242C421DA900EBDFDD /* previewVideoLandscapeTopMoreView.h */; };
@@ -1971,6 +1975,8 @@
 		6B72725A2B0E22D000C03F87 /* uploadFileRecordBgScorllView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = uploadFileRecordBgScorllView.m; sourceTree = "<group>"; };
 		6B72725D2B0E240F00C03F87 /* uploadFileRecordTableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = uploadFileRecordTableView.h; sourceTree = "<group>"; };
 		6B72725E2B0E240F00C03F87 /* uploadFileRecordTableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = uploadFileRecordTableView.m; sourceTree = "<group>"; };
+		6B78FD2D2CD4727E00E1A8B2 /* cloudPhoneModelViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cloudPhoneModelViewController.h; sourceTree = "<group>"; };
+		6B78FD2E2CD4727E00E1A8B2 /* cloudPhoneModelViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = cloudPhoneModelViewController.m; sourceTree = "<group>"; };
 		6B7B65562AD9227700BE8CB3 /* PlayerViewController+otherDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PlayerViewController+otherDelegate.h"; sourceTree = "<group>"; };
 		6B7B65572AD9227700BE8CB3 /* PlayerViewController+otherDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "PlayerViewController+otherDelegate.mm"; sourceTree = "<group>"; };
 		6B7B65612ADEAE0300BE8CB3 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
@@ -3341,6 +3347,8 @@
 				6BB5731A2C7D6E1D00713351 /* scanToPCLoginViewController.m */,
 				6BB5731F2C7D7D8900713351 /* PCLoginViewController.h */,
 				6BB573202C7D7D8900713351 /* PCLoginViewController.m */,
+				6B78FD2D2CD4727E00E1A8B2 /* cloudPhoneModelViewController.h */,
+				6B78FD2E2CD4727E00E1A8B2 /* cloudPhoneModelViewController.m */,
 			);
 			path = mine;
 			sourceTree = "<group>";
@@ -4073,6 +4081,7 @@
 				6B4C0F7E2C0314BA0070EF2E /* DFPlayerUIManager.h in Headers */,
 				6B39AED42CC893F100B07E48 /* baseTableViewCell.h in Headers */,
 				6B5BE5932BFCA5FA00A1B9B3 /* videoPlayViewController.h in Headers */,
+				6B78FD2F2CD4727E00E1A8B2 /* cloudPhoneModelViewController.h in Headers */,
 				1868201D2AB97BE1005702A6 /* TipsQRCodeViewController.h in Headers */,
 				6B5B60602B3BC8DE009A2AE2 /* fileTransferPopView.h in Headers */,
 				6BB573342C8076F000713351 /* nasBackupsManager.h in Headers */,
@@ -4363,6 +4372,7 @@
 				6B4C0F7F2C0314BA0070EF2E /* DFPlayerUIManager.h in Headers */,
 				6B39AED52CC893F100B07E48 /* baseTableViewCell.h in Headers */,
 				6B5BE5952BFCA5FA00A1B9B3 /* videoPlayViewController.h in Headers */,
+				6B78FD312CD4727E00E1A8B2 /* cloudPhoneModelViewController.h in Headers */,
 				6BD506AA2B9576A4006E7CB0 /* TipsQRCodeViewController.h in Headers */,
 				6BD506AB2B9576A4006E7CB0 /* fileTransferPopView.h in Headers */,
 				6BB573362C8076F500713351 /* nasBackupsManager.h in Headers */,
@@ -5246,6 +5256,7 @@
 				6BD5079B2B9576A4006E7CB0 /* FMDatabaseAdditions.m in Sources */,
 				6BD5079C2B9576A4006E7CB0 /* BGDB.m in Sources */,
 				6BD5079D2B9576A4006E7CB0 /* UITextfield+NLLimit.m in Sources */,
+				6B78FD322CD4727E00E1A8B2 /* cloudPhoneModelViewController.m in Sources */,
 				6BA00E2F2C9AA826003AE520 /* webRtcPlayerViewController+AppDelegate.m in Sources */,
 				6BD5079E2B9576A4006E7CB0 /* backupsFileRecordCell.m in Sources */,
 				6BD5079F2B9576A4006E7CB0 /* downLoadPreviewViewController.m in Sources */,
@@ -5618,6 +5629,7 @@
 				A08A950127E9A4E400C544BB /* FMDatabaseAdditions.m in Sources */,
 				A08A94FB27E9A4E400C544BB /* BGDB.m in Sources */,
 				A003F6B427D841EE00715CBF /* UITextfield+NLLimit.m in Sources */,
+				6B78FD302CD4727E00E1A8B2 /* cloudPhoneModelViewController.m in Sources */,
 				6BA00E2D2C9AA826003AE520 /* webRtcPlayerViewController+AppDelegate.m in Sources */,
 				6B1FBD3F2B46875300926382 /* backupsFileRecordCell.m in Sources */,
 				6B5D40242B4AA7BF000965CF /* downLoadPreviewViewController.m in Sources */,
@@ -6147,7 +6159,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6229,7 +6241,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (

+ 3 - 0
创维盒子/双子星云手机/AppDelegate/Config/Const.h

@@ -175,6 +175,9 @@ UIKIT_EXTERN NSString *const Const_audio_pre_disk_check;
 /*记录上一次的文件预览磁盘*/
 UIKIT_EXTERN NSString *const Const_file_pre_disk_check;
 
+/*云手机模式是否 YES:打开  其他关闭*/
+UIKIT_EXTERN NSString *const Const_cloudPhone_Model_Open;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 3 - 0
创维盒子/双子星云手机/AppDelegate/Config/Const.m

@@ -171,4 +171,7 @@ NSString *const Const_audio_pre_disk_check = @"audio_pre_disk_check";
 
 /*记录上一次的文件预览磁盘*/
 NSString *const Const_file_pre_disk_check = @"file_pre_disk_check";
+
+/*云手机模式是否 YES:打开  其他关闭*/
+NSString *const Const_cloudPhone_Model_Open = @"cloudPhone_Model_Open";
 @end

+ 6 - 0
创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -513,6 +513,12 @@
 //    //[UIColor hwColor:@"#7C8196"]
 //    [[UITabBarItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIColor redColor],NSForegroundColorAttributeName, [UIFont systemFontOfSize:12.0],NSFontAttributeName,nil] forState:UIControlStateNormal];
     
+    BOOL haveOpenMask = [HWDataManager getBoolWithKey:Const_cloudPhone_Model_Open];
+    if(haveOpenMask){
+        tabBarController.selectedIndex = 1;
+        [cloudVC queryWebRtcMsgFun:YES];
+    }
+    
     ksharedAppDelegate.mainTabBar = tabBarController;
     self.window.rootViewController = tabBarController;
     [self.window makeKeyAndVisible];

+ 22 - 0
创维盒子/双子星云手机/Assets.xcassets/mine/mine_cloudPhone_model_icon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_cloudPhone_model_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_cloudPhone_model_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
创维盒子/双子星云手机/Assets.xcassets/mine/mine_cloudPhone_model_icon.imageset/mine_cloudPhone_model_icon@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/mine/mine_cloudPhone_model_icon.imageset/mine_cloudPhone_model_icon@3x.png


+ 2 - 0
创维盒子/双子星云手机/Class/Set/view/MineViewCell.h

@@ -20,6 +20,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong)UIImageView *rightImage;
 @property(nonatomic, strong) CALayer* bgViewLayer;
 @property(nonatomic, strong) UISwitch *maskSwitch;
+
+@property (nonatomic,copy) void (^didClickMaskSwitch)(UISwitch *maskSwitch);
 @end
 
 NS_ASSUME_NONNULL_END

+ 16 - 9
创维盒子/双子星云手机/Class/Set/view/MineViewCell.m

@@ -81,8 +81,8 @@
     [maskSwitch setOnTintColor:HW13B2EBColor];
     [maskSwitch addTarget:self action:@selector(maskSwitchPressed:) forControlEvents:(UIControlEventValueChanged)];
 
-    BOOL haveOpenMask = [HWDataManager getBoolWithKey:Consn_Fanzhuan_Exit_app_Open];
-    [maskSwitch setOn:haveOpenMask];
+//    BOOL haveOpenMask = [HWDataManager getBoolWithKey:Consn_Fanzhuan_Exit_app_Open];
+//    [maskSwitch setOn:haveOpenMask];
 
     /**标题*/
     titleLabel = [[UILabel alloc] init];
@@ -119,15 +119,22 @@
 }
 
 - (void)maskSwitchPressed:(UISwitch *)maskSwitch{
-    [HWDataManager setBoolWithKey:Consn_Fanzhuan_Exit_app_Open value:maskSwitch.on];
     
-    if (maskSwitch.on) {
-        [[iToast makeText:NSLocalizedString(@"my_set_no_fanzhuan_exit_open",nil)] show];
-        [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Overturn_on"];
+    
+    if (_didClickMaskSwitch) {
+        _didClickMaskSwitch(maskSwitch);
     }
-    else{
-        [[iToast makeText:NSLocalizedString(@"my_set_no_fanzhuan_exit_close",nil)] show];
-        [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Overturn_off"];
+    else{//之前的逻辑  有时间再完善
+        [HWDataManager setBoolWithKey:Consn_Fanzhuan_Exit_app_Open value:maskSwitch.on];
+        
+        if (maskSwitch.on) {
+            [[iToast makeText:NSLocalizedString(@"my_set_no_fanzhuan_exit_open",nil)] show];
+            [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Overturn_on"];
+        }
+        else{
+            [[iToast makeText:NSLocalizedString(@"my_set_no_fanzhuan_exit_close",nil)] show];
+            [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Overturn_off"];
+        }
     }
 }
 @end

+ 2 - 0
创维盒子/双子星云手机/cloudPhone/cloudPhoneViewController.h

@@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface cloudPhoneViewController : BaseViewController
 
+#pragma mark 获取webrct 的链接信息
+-(void)queryWebRtcMsgFun:(BOOL)isPlayerType;
 @end
 
 NS_ASSUME_NONNULL_END

+ 16 - 0
创维盒子/双子星云手机/mine/cloudPhoneModelViewController.h

@@ -0,0 +1,16 @@
+//
+//  cloudPhoneModelViewController.h
+//  双子星云手机
+//
+//  Created by xd h on 2024/11/1.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface cloudPhoneModelViewController : BaseViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 159 - 0
创维盒子/双子星云手机/mine/cloudPhoneModelViewController.m

@@ -0,0 +1,159 @@
+//
+//  cloudPhoneModelViewController.m
+//  双子星云手机
+//
+//  Created by xd h on 2024/11/1.
+//
+
+#import "cloudPhoneModelViewController.h"
+#import "MineViewCell.h"
+
+@interface cloudPhoneModelViewController ()<UITableViewDelegate,UITableViewDataSource>
+@property (nonatomic, strong, nullable) UITableView *tableView;
+@end
+
+@implementation cloudPhoneModelViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self.titleLabel setText:NSLocalizedString(@"mine_cloudPhone_Model_title",nil)];
+    [self.view setBackgroundColor:HWF5F7FAColor];
+    
+    [self.toolBar setHidden:YES];
+    [self.navigationBar setHidden:YES];
+    [self.navBarBGView setHidden:NO];
+    
+    [self drawAnyView];
+}
+
+- (void)drawAnyView{
+    [self.view addSubview:self.tableView];
+    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(0);
+        make.right.mas_equalTo(0);
+        make.bottom.mas_equalTo(0);
+        make.top.equalTo(self.navBarBGView.mas_bottom).offset(16.f);
+    }];
+}
+
+#pragma mark - 懒加载
+- (UITableView *)tableView{
+    if (!_tableView) {
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H - TABBARHEIGHT) style:UITableViewStylePlain];
+        _tableView.delegate = self;
+        _tableView.dataSource = self;
+        _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.showsHorizontalScrollIndicator = NO;
+//        _tableView.contentInset = UIEdgeInsetsMake(-H_STATE_BAR, 0, 0, 0);
+        [_tableView setSeparatorStyle:(UITableViewCellSeparatorStyleNone)];
+        [_tableView setSeparatorColor:[UIColor clearColor]];
+        [_tableView setBackgroundColor:[UIColor clearColor]];
+        [_tableView setTableFooterView:[UIView new]];
+        _tableView.scrollEnabled = NO;
+        [_tableView setBounces:YES];
+        if (@available(iOS 15.0, *)) {
+            _tableView.sectionHeaderTopPadding = 0;
+        }
+        
+    }
+    
+    return _tableView;
+}
+
+#pragma mark - 列表委托
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return 1;
+}
+
+- (MineViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    NSInteger row = indexPath.row;
+    static NSString *identifier = @"MineViewCell";
+    
+    MineViewCell * cell =  [tableView dequeueReusableCellWithIdentifier:identifier];
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    if (!cell){
+        cell = [[MineViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:identifier];
+        [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+        [cell setBackgroundColor:[UIColor clearColor]];
+        [cell setAccessoryType:(UITableViewCellAccessoryNone)];
+    }
+    [cell.bgViewLayer removeFromSuperlayer];
+    [cell.titleLabel2 setHidden:YES];
+    [cell.rightImage setHidden:NO];
+    [cell.lineView setHidden:NO];
+    [cell.maskSwitch setHidden:YES];
+    if (row == 0){
+        [cell.titleLabel setText:NSLocalizedString(@"mine_cloudPhone_Model_title",nil)];
+        cell.titleLabel.font = [UIFont boldSystemFontOfSize:14.0];
+        
+        [cell.mImageView setImage:[UIImage imageNamed:@"mine_cloudPhone_model_icon"]];
+        [cell.rightImage setHidden:YES];
+        [cell.maskSwitch setHidden:NO];
+        
+        BOOL haveOpenMask = [HWDataManager getBoolWithKey:Const_cloudPhone_Model_Open];
+        [cell.maskSwitch setOn:haveOpenMask];
+
+        /*下圆角*/
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_W-30 , 60)
+                                                       byRoundingCorners:UIRectCornerAllCorners
+                                                             cornerRadii:CGSizeMake(8, 8)];
+        CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+        maskLayer.frame = cell.cellBgView.bounds;
+        maskLayer.path = maskPath.CGPath;
+        cell.bgViewLayer = maskLayer;
+        cell.cellBgView.layer.mask = cell.bgViewLayer;
+        
+        [cell.lineView setHidden:YES];
+        
+        KWeakSelf
+        cell.didClickMaskSwitch = ^(UISwitch * _Nonnull maskSwitch) {
+            [weakSelf maskSwitchPressed:maskSwitch];
+        };
+    }
+    
+    return cell;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    return 60;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
+{
+    return 50;
+}
+
+- (UIView*)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
+{
+    UIView *tailView = [UIView new];
+    
+    UILabel *tipLab = [[UILabel alloc] init];
+    tipLab.backgroundColor = [UIColor clearColor];
+    tipLab.font = [UIFont systemFontOfSize:12.0];
+    tipLab.textColor = HW666666Color;
+    tipLab.numberOfLines = 0;
+    tipLab.text = NSLocalizedString(@"cloudPhone_Model_tip",nil);
+    [tailView addSubview:tipLab];
+    
+    [tipLab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(15);
+        make.right.mas_equalTo(-15);
+        make.bottom.mas_equalTo(0);
+        make.top.mas_equalTo(0);
+    }];
+    
+    return tailView;
+}
+
+- (void)maskSwitchPressed:(UISwitch *)maskSwitch{
+    
+    [HWDataManager setBoolWithKey:Const_cloudPhone_Model_Open value:maskSwitch.on];
+}
+
+@end

+ 28 - 19
创维盒子/双子星云手机/mine/mineViewController.m

@@ -21,6 +21,7 @@
 #import "audioPlayerViewController.h"
 #import "scanToPCLoginViewController.h"
 #import "PCLoginViewController.h"
+#import "cloudPhoneModelViewController.h"
 
 @interface mineViewController ()
 @property(nonatomic,strong)UIButton *netButton;
@@ -169,7 +170,7 @@
     
     switch (tag)
     {
-        case 10:{
+        case 10:{//隐私模式
             inputPWDViewController *nextVC = [inputPWDViewController new];
             nextVC.isCheckPwdType = YES;
             [self pushViewController:nextVC animated:YES];
@@ -180,12 +181,12 @@
             };
         }
             break;
-        case 11:{
-            TipsQRCodeForChangeDeviceViewController *nextVC = [TipsQRCodeForChangeDeviceViewController new];
+        case 11:{//云手机模式
+            cloudPhoneModelViewController *nextVC = [cloudPhoneModelViewController new];
             [self pushViewController:nextVC animated:YES];
         }
             break;
-        case 12:{
+        case 12:{//帮助与反馈
             
             CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
             vc.titleStr = NSLocalizedString(@"mine_help_title",nil);
@@ -198,26 +199,22 @@
             
         }
             break;
-        case 13:{
-            customerServiceViewController *vc = [customerServiceViewController new];
-            [self pushViewController:vc animated:YES];
-        }
+        case 13:{//更换手机
+            TipsQRCodeForChangeDeviceViewController *nextVC = [TipsQRCodeForChangeDeviceViewController new];
+            [self pushViewController:nextVC animated:YES];
             break;
+        }
             
-            
-        case 14:{
-            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;
+        case 14:{//联系客服
+            customerServiceViewController *vc = [customerServiceViewController new];
             [self pushViewController:vc animated:YES];
         }
             break;
-        case 15:{
+            
+        case 15:{//清理缓存
             [self clickClearCacheButtonFun];
         }
-            break;
-        case 16:{
+        case 16:{//版本信息
             AboutViewController *nextVC = [[AboutViewController alloc] init];
             nextVC.getSysInfo = ^{
                 [[webRtcManager shareManager] getSysInfoFun];
@@ -225,10 +222,22 @@
             [self pushViewController:nextVC animated:YES];
         }
             break;
-        case 17:{
-            [[iToast makeText:@"点击了注销"] show];
+            
+        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];
+//        }
+//            break;
         default:
             break;
     }

+ 10 - 6
创维盒子/双子星云手机/mine/view/MineCommonUsedView.m

@@ -54,24 +54,28 @@
 
     
     NSArray *titleArr = @[NSLocalizedString(@"my_set_Privacy_Model",nil),
-                          NSLocalizedString(@"my_set_no_change_phone",nil),
+                          NSLocalizedString(@"mine_cloudPhone_Model_title",nil),
                           NSLocalizedString(@"mine_help_title",nil),
-                          NSLocalizedString(@"my_set_no_connect_kefu",nil),
+                          NSLocalizedString(@"my_set_no_change_phone",nil),
                           
-                          NSLocalizedString(@"mine_newuser_title",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_sn_cancel_title",nil)
     ];
     
+    
+    
     NSArray *imageArr = @[@"mine_Privacy_icon",
-                          @"mine_changePhone_icon",
+                          @"mine_cloudPhone_model_icon",
                           @"mine_help_icon",
-                          @"mine_customer_icon",
+                          @"mine_changePhone_icon",
                           
-                          @"mine_newUser_icon",
+                          @"mine_customer_icon",
                           @"mine_clear_icon",
                           @"mine_version_icon",
+                          @"mine_newUser_icon",
                           //@"mine_cancell_icon",
     ];
     

+ 4 - 1
创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -631,4 +631,7 @@
 "app_version_current"   = "app当前版本";
 "system_version_current"   = "系统当前版本";
 "asystem_version_wait_update"   = "系统待更新版本";
-"File_Transfer_background_working_tip_2"   = "开启后台文件传输会使用您的电量。如果您开启了省电模式,将无法后台传输。若需启用后台运行,请先关闭省电模式。";
+"File_Transfer_background_working_tip_2"   = "开启后台文件传输会使用您的电量。如果您开启了低电量模式,将无法后台传输。若需启用后台运行,请先关闭低电量模式。";
+"mine_cloudPhone_Model_title"   = "云手机模式";
+"cloudPhone_Model_tip"   = "开启后打开APP默认直接进入云手机页面,关闭则进入NAS页面";
+