浏览代码

1.设置页面再次处理 ,补充隐私模式的入口

huangxiaodong 1 年之前
父节点
当前提交
c9c246c73a

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

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

二进制
创维盒子/双子星云手机/Assets.xcassets/Set/fileSet/Privacy_model_icon.imageset/Privacy_model_icon@2x.png


二进制
创维盒子/双子星云手机/Assets.xcassets/Set/fileSet/Privacy_model_icon.imageset/Privacy_model_icon@3x.png


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

@@ -204,9 +204,7 @@
             [self.navigationController pushViewController:vc animated:YES];
         }
             break;
-            
-            
-        case 1:
+        case 106:
         {
                 if(!ksharedAppDelegate.isWebSockLinkOKAginType){
                     [[iToast makeText:NSLocalizedString(@"check_could_phone_state",nil)] show];
@@ -274,12 +272,6 @@
             
         }
             break;
-        case 10:
-            {
-                TipsQRCodeForChangeDeviceViewController *vc = [[TipsQRCodeForChangeDeviceViewController alloc] init];
-                [self.navigationController pushViewController:vc animated:YES];
-            }
-            break;
         case 7:
             {
                 /*弹窗提示关闭备份*/
@@ -299,8 +291,25 @@
                 }];
             }
             break;
+        case 10:{
+            inputPWDViewController *nextVC = [inputPWDViewController new];
+            nextVC.isCheckPwdType = YES;
+            [self.navigationController pushViewController:nextVC animated:YES];
+            
+            
+            nextVC.didInputRightPwdFun = ^{
+                [weakSelf gotoPrivacyModeVCFun];
+            };
+        }
+            break;
         case 11:
             {
+                TipsQRCodeForChangeDeviceViewController *vc = [[TipsQRCodeForChangeDeviceViewController alloc] init];
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+            break;
+        case 12:
+            {
                 /*弹窗提示重启*/
                 ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_restart_phone_tips",nil)
                                                                                                  msg:nil
@@ -319,12 +328,12 @@
                 }];
             }
             break;
-        case 12:
+        case 13:
             {
                 [self RestoreFactoryAleartFun];
             }
             break;
-        case 13:
+        case 14:
             {
                 CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
                 vc.titleStr = NSLocalizedString(@"my_set_no_common_problem",nil);
@@ -333,7 +342,7 @@
                 [self.navigationController pushViewController:vc animated:YES];
             }
             break;
-        case 14:
+        case 15:
             {
                 AboutViewController *vc = [[AboutViewController alloc] init];
                 vc.getSysInfo = ^{
@@ -344,7 +353,7 @@
                 [self.navigationController pushViewController:vc animated:YES];
             }
             break;
-        case 15:
+        case 16:
             {
                 [self clickClearCacheButtonFun];
             }

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

@@ -160,14 +160,15 @@
     }];
     
     
-    NSArray *titleArr = @[NSLocalizedString(@"my_set_no_change_phone",nil),
+    NSArray *titleArr = @[NSLocalizedString(@"my_set_Privacy_Model",nil),
+                          NSLocalizedString(@"my_set_no_change_phone",nil),
                           NSLocalizedString(@"my_set_no_restart_phone",nil),
                           NSLocalizedString(@"my_set_no_Restore_Factory",nil),
                           NSLocalizedString(@"my_set_no_common_problem",nil),
                           NSLocalizedString(@"my_set_no_check_update",nil),
                           NSLocalizedString(@"my_set_no_clear_cache",nil)];
     
-    NSArray *imageArr = @[@"icon_change_ohone",@"icon-gengxin",
+    NSArray *imageArr = @[@"Privacy_model_icon",@"icon_change_ohone",@"icon-gengxin",
                           @"icon_Restore_Factory",@"icon_common_problem",
                           @"app_update",@"app_clear_cache"];