Browse Source

1.设置页面逻辑补充

huangxiaodong 1 year ago
parent
commit
7a824d22e6

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

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

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


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


+ 110 - 19
创维盒子/双子星云手机/Class/Set/MySetViewController.m

@@ -66,6 +66,18 @@
     [self.navBarBGView setHidden:NO];
     [self.titleLabel setText:NSLocalizedString(@"more_set",nil)];
     
+    UIButton* rightButton = [[UIButton alloc] init];
+    [rightButton setImage:[UIImage imageNamed:@"icon_file_transfer"] forState:UIControlStateNormal];
+    [rightButton addTarget:self action:@selector(didiClikRightButFun:) forControlEvents:UIControlEventTouchUpInside];
+    [self.navBarBGView addSubview:rightButton];
+    
+    [rightButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(40);
+        make.height.mas_equalTo(40);
+        make.right.mas_equalTo(-15);
+        make.centerY.mas_equalTo(self.titleLabel.mas_centerY);
+    }];
+    
     [self.view addSubview:self.tableView];
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(0);
@@ -99,32 +111,111 @@
     return _customTableHeadView;
 }
 
+- (void)didiClikRightButFun:(UIButton*)but
+{
+    uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
+    vc.isNotUploadingType = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
 #pragma mark 点击文件上传相关
 - (void)didClickUploadFileByTag:(NSInteger)tag
 {
     HLog(@"hhh %ld",tag);
     
-    if(tag ==2 || tag ==3){
-        
-        if(self->_getBaseInfo){
-            self->_getBaseInfo();
-        }
-        
-        uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
-        if(tag ==2){
-            vc.isPhotoType = YES;
-        }
-        else{
-            vc.isPhotoType = NO;
+    switch (tag) {
+        case 1:
+            {
+                
+            }
+            break;
+        case 2:
+        case 3:
+        {
+            
+            if(self->_getBaseInfo){
+                self->_getBaseInfo();
+            }
+            
+            uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
+            if(tag ==2){
+                vc.isPhotoType = YES;
+            }
+            else{
+                vc.isPhotoType = NO;
+            }
+            [self.navigationController pushViewController:vc animated:YES];
+            
         }
-        [self.navigationController pushViewController:vc animated:YES];
-        
-    }
-    else if(tag == 1){
-        uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
-        vc.isNotUploadingType = YES;
-        [self.navigationController pushViewController:vc animated:YES];
+            break;
+        case 4:
+            {
+                inputPWDViewController *nextVC = [inputPWDViewController new];
+                nextVC.isCheckPwdType = YES;
+                [self.navigationController pushViewController:nextVC animated:YES];
+                
+                KWeakSelf
+                nextVC.didInputRightPwdFun = ^{
+                    [weakSelf gotoPrivacyModeVCFun];
+                };
+            }
+            break;
+        case 10:
+            {
+                TipsQRCodeForChangeDeviceViewController *vc = [[TipsQRCodeForChangeDeviceViewController alloc] init];
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+            break;
+        case 11:
+            {
+                /*弹窗提示重启*/
+                ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_restart_phone_tips",nil)
+                                                                                                 msg:nil
+                                                                                            imageStr:nil
+                                                                                         cancelTitle:NSLocalizedString(@"other_cancel",nil)
+                                                                                             okTitle:NSLocalizedString(@"my_set_no_restart_phone_btn_ok",nil) isOkBtnHighlight:NO
+                                                                                          didClickOk:^{
+                    
+                } didClickCancel:^{
+                    
+                }];
+                nextVC.modalPresentationStyle = UIModalPresentationCustom;
+                nextVC.delegate = self;
+                [self presentViewController:nextVC animated:YES completion:^{
+                    nextVC.view.superview.backgroundColor = [UIColor clearColor];
+                }];
+            }
+            break;
+        case 12:
+            {
+                [self RestoreFactoryAleartFun];
+            }
+            break;
+        case 13:
+            {
+                CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
+                vc.titleStr = NSLocalizedString(@"my_set_no_common_problem",nil);
+                NSString *url = @"https://cliys.armclouding.com/h5/microserviceUserH5/commonProblem/questionIndex.html";
+                vc.webUrl = url;
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+            break;
+        case 14:
+            {
+                AboutViewController *vc = [[AboutViewController alloc] init];
+                vc.getSysInfo = ^{
+                    if(self->_getSysInfo){
+                        self->_getSysInfo();
+                    }
+                };
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+            break;
+        default:
+            break;
     }
+    
+
 }
 
 - (UIView *)tableFoorView{

+ 1 - 1
创维盒子/双子星云手机/Class/Set/view/mySetHeadView.m

@@ -153,7 +153,7 @@
     }];
 
     UILabel *rightLabel = [[UILabel alloc] init];
-    rightLabel.text = NSLocalizedString(@"my_set_no_File_upload_record",nil) ;
+    rightLabel.text = NSLocalizedString(@"set_upload_download_tip",nil) ;
     rightLabel.font = [UIFont systemFontOfSize:14.0];
     rightLabel.textColor = [UIColor hwColor:@"#959799" alpha:1.0];
     rightLabel.textAlignment = NSTextAlignmentRight;

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

@@ -313,6 +313,7 @@
 "set_Privacy_Tip" = "保护您的个人信息安全";
 "set_Privacy_button_title" = "去设置";
 "set_Privacy_title" = "文件备份";
+"set_upload_download_tip" = "上传/下载设置";
 "set_Privacy_right_tip" = "备份设置";
 "set_Privacy_title_image" = "相册备份";
 "set_Privacy_title_image_open" = "备份已开启";