Quellcode durchsuchen

1.隐私模式---进行中

huangxiaodong vor 1 Jahr
Ursprung
Commit
a23afec8c0
20 geänderte Dateien mit 547 neuen und 29 gelöschten Zeilen
  1. 32 0
      创维盒子/双子星云手机.xcodeproj/project.pbxproj
  2. 2 2
      创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch
  3. 22 0
      创维盒子/双子星云手机/Assets.xcassets/Set/icon_Privacy_model.imageset/Contents.json
  4. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/icon_Privacy_model.imageset/icon_Privacy_model@2x.png
  5. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/icon_Privacy_model.imageset/icon_Privacy_model@3x.png
  6. 17 0
      创维盒子/双子星云手机/Categories/NSArray+Log.h
  7. 35 0
      创维盒子/双子星云手机/Categories/NSArray+Log.m
  8. 17 0
      创维盒子/双子星云手机/Categories/NSDictionary+Log.h
  9. 39 0
      创维盒子/双子星云手机/Categories/NSDictionary+Log.m
  10. 1 1
      创维盒子/双子星云手机/Class/Guide/forgetPwdViewController.h
  11. 5 0
      创维盒子/双子星云手机/Class/Guide/forgetPwdViewController.m
  12. 4 0
      创维盒子/双子星云手机/Class/Guide/inputPWDViewController.h
  13. 19 2
      创维盒子/双子星云手机/Class/Guide/inputPWDViewController.m
  14. 31 22
      创维盒子/双子星云手机/Class/Set/MySetViewController.m
  15. 16 0
      创维盒子/双子星云手机/Class/Set/privacyMode/privacyModeViewController.h
  16. 293 0
      创维盒子/双子星云手机/Class/Set/privacyMode/privacyModeViewController.m
  17. 1 1
      创维盒子/双子星云手机/CloudPlayer/View/PlayerView.m
  18. 4 1
      创维盒子/双子星云手机/connectDeviceManager/model/DeviceThirdIdModel.h
  19. 7 0
      创维盒子/双子星云手机/netWork/newWorkInterface.h
  20. 2 0
      创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

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

@@ -167,6 +167,12 @@
 		6B2170892B1444CC00656670 /* allVersionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B2170872B1444CC00656670 /* allVersionView.m */; };
 		6B21708C2B14BDAA00656670 /* couldphoneSysInfoModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B21708A2B14BDAA00656670 /* couldphoneSysInfoModel.h */; };
 		6B21708D2B14BDAA00656670 /* couldphoneSysInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B21708B2B14BDAA00656670 /* couldphoneSysInfoModel.m */; };
+		6B2170912B15BAE700656670 /* privacyModeViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B21708F2B15BAE700656670 /* privacyModeViewController.h */; };
+		6B2170922B15BAE700656670 /* privacyModeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B2170902B15BAE700656670 /* privacyModeViewController.m */; };
+		6B2170982B15CD9200656670 /* NSDictionary+Log.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B2170962B15CD9200656670 /* NSDictionary+Log.h */; };
+		6B2170992B15CD9200656670 /* NSDictionary+Log.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B2170972B15CD9200656670 /* NSDictionary+Log.m */; };
+		6B21709C2B15CDB600656670 /* NSArray+Log.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B21709A2B15CDB400656670 /* NSArray+Log.h */; };
+		6B21709D2B15CDB600656670 /* NSArray+Log.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B21709B2B15CDB600656670 /* NSArray+Log.m */; };
 		6B3F96342AD2A15A008E349E /* netWorkManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96322AD2A15A008E349E /* netWorkManager.h */; };
 		6B3F96352AD2A15A008E349E /* netWorkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B3F96332AD2A15A008E349E /* netWorkManager.m */; };
 		6B3F963A2AD2AD0B008E349E /* newWorkInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96392AD2AD0B008E349E /* newWorkInterface.h */; };
@@ -536,6 +542,12 @@
 		6B2170872B1444CC00656670 /* allVersionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = allVersionView.m; sourceTree = "<group>"; };
 		6B21708A2B14BDAA00656670 /* couldphoneSysInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = couldphoneSysInfoModel.h; sourceTree = "<group>"; };
 		6B21708B2B14BDAA00656670 /* couldphoneSysInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = couldphoneSysInfoModel.m; sourceTree = "<group>"; };
+		6B21708F2B15BAE700656670 /* privacyModeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = privacyModeViewController.h; sourceTree = "<group>"; };
+		6B2170902B15BAE700656670 /* privacyModeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = privacyModeViewController.m; sourceTree = "<group>"; };
+		6B2170962B15CD9200656670 /* NSDictionary+Log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Log.h"; sourceTree = "<group>"; };
+		6B2170972B15CD9200656670 /* NSDictionary+Log.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Log.m"; sourceTree = "<group>"; };
+		6B21709A2B15CDB400656670 /* NSArray+Log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Log.h"; sourceTree = "<group>"; };
+		6B21709B2B15CDB600656670 /* NSArray+Log.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Log.m"; sourceTree = "<group>"; };
 		6B3F96322AD2A15A008E349E /* netWorkManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = netWorkManager.h; sourceTree = "<group>"; };
 		6B3F96332AD2A15A008E349E /* netWorkManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = netWorkManager.m; sourceTree = "<group>"; };
 		6B3F96392AD2AD0B008E349E /* newWorkInterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = newWorkInterface.h; sourceTree = "<group>"; };
@@ -1069,6 +1081,7 @@
 		18C4754C2A8E0D9B006129C0 /* Set */ = {
 			isa = PBXGroup;
 			children = (
+				6B21708E2B15BAC300656670 /* privacyMode */,
 				6B05815D2AFCD0A900D37290 /* uploadFile */,
 				6B0581582AFC84EE00D37290 /* view */,
 				18F9CB012ABD77EF003FF71A /* ChangeDevice */,
@@ -1236,6 +1249,15 @@
 			path = uploadFileManager;
 			sourceTree = "<group>";
 		};
+		6B21708E2B15BAC300656670 /* privacyMode */ = {
+			isa = PBXGroup;
+			children = (
+				6B21708F2B15BAE700656670 /* privacyModeViewController.h */,
+				6B2170902B15BAE700656670 /* privacyModeViewController.m */,
+			);
+			path = privacyMode;
+			sourceTree = "<group>";
+		};
 		6B3F96312AD2A0FA008E349E /* netWork */ = {
 			isa = PBXGroup;
 			children = (
@@ -1331,6 +1353,10 @@
 		A003F6AA27D841EE00715CBF /* Categories */ = {
 			isa = PBXGroup;
 			children = (
+				6B21709A2B15CDB400656670 /* NSArray+Log.h */,
+				6B21709B2B15CDB600656670 /* NSArray+Log.m */,
+				6B2170962B15CD9200656670 /* NSDictionary+Log.h */,
+				6B2170972B15CD9200656670 /* NSDictionary+Log.m */,
 				A003F6AE27D841EE00715CBF /* UIColor+Colors.h */,
 				A003F6B127D841EE00715CBF /* UIColor+Colors.m */,
 				A003F6AF27D841EE00715CBF /* UIColor+HZXColor.h */,
@@ -1667,6 +1693,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6B21709C2B15CDB600656670 /* NSArray+Log.h in Headers */,
 				184C8AD02A94980D00F26650 /* CustomerWebViewController.h in Headers */,
 				6BFF26992AFA16DA00FCB4F7 /* forgetSecretKeyViewController.h in Headers */,
 				6BFF26912AF9D88200FCB4F7 /* AuthCodeTextField.h in Headers */,
@@ -1685,9 +1712,11 @@
 				6BBB35E22AE935C000E4A59B /* DDYLanguageTool.h in Headers */,
 				6BFF26882AF8949F00FCB4F7 /* playerShowSecretkeyView.h in Headers */,
 				6BF0F3D52AD3937B000AA133 /* DeviceThirdIdModel.h in Headers */,
+				6B2170982B15CD9200656670 /* NSDictionary+Log.h in Headers */,
 				18FCE5332AD12FE00020F623 /* ConnectTestViewController.h in Headers */,
 				181E84F22A8F0A9B00292B96 /* HelpDownScrollView.h in Headers */,
 				6B2170882B1444CC00656670 /* allVersionView.h in Headers */,
+				6B2170912B15BAE700656670 /* privacyModeViewController.h in Headers */,
 				6BF0F3D02AD391D8000AA133 /* connectDeviceManager.h in Headers */,
 				6BFF26952AF9D8CC00FCB4F7 /* AuthCodeInputView.h in Headers */,
 				18FCE5442AD136FF0020F623 /* ShortcutManager.h in Headers */,
@@ -2112,6 +2141,7 @@
 				1866F99E2A136DC700B31E22 /* iPhone.m in Sources */,
 				183AE64D2A8A2CF000B11CB0 /* UIRefreshControl+AFNetworking.m in Sources */,
 				A003F6E327D8428200715CBF /* SceneDelegate.m in Sources */,
+				6B2170922B15BAE700656670 /* privacyModeViewController.m in Sources */,
 				183AE6552A8A2CF000B11CB0 /* AFHTTPSessionManager.m in Sources */,
 				183AE6582A8A2CF000B11CB0 /* AFNetworkReachabilityManager.m in Sources */,
 				6B05828A2B045E0B00D37290 /* uploadFileDataModel.m in Sources */,
@@ -2124,6 +2154,7 @@
 				18FCE5412AD136670020F623 /* PlayerViewController+AdjustBtnFrame.m in Sources */,
 				6B7272542B0CABC600C03F87 /* cachesFileManager.m in Sources */,
 				184C8ADE2A949DBD00F26650 /* HWVersionModel.m in Sources */,
+				6B21709D2B15CDB600656670 /* NSArray+Log.m in Sources */,
 				18FCE5352AD12FE00020F623 /* ConnectTestViewController.m in Sources */,
 				183AE64C2A8A2CF000B11CB0 /* UIProgressView+AFNetworking.m in Sources */,
 				A031DD7527EC507000909527 /* HWAddFolderViewController.m in Sources */,
@@ -2180,6 +2211,7 @@
 				A003F6C027D841FF00715CBF /* FLAnimatedImage.m in Sources */,
 				A02FF6AC27D7054700D59D3F /* main.m in Sources */,
 				6B7272602B0E240F00C03F87 /* uploadFileRecordTableView.m in Sources */,
+				6B2170992B15CD9200656670 /* NSDictionary+Log.m in Sources */,
 				6B05815C2AFC851E00D37290 /* mySetHeadView.m in Sources */,
 				A08A94DB27E97DB800C544BB /* HWPageViewController.m in Sources */,
 			);

+ 2 - 2
创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -82,8 +82,8 @@ isBangsScreen; \
 //#define CloudService           @"http://14.18.190.141:11180"
 //#define CloudService           @"http://14.18.190.141:1280"
 //创维盒子 测试地址
-//#define CloudService   @"http://14.18.190.141:1801"
-#define CloudService   @"http://hiboxde.armclouding.com:7780"
+#define CloudService   @"http://14.18.190.141:1801"
+//#define CloudService   @"http://hiboxde.armclouding.com:7780"
 
 
 #define AESCODEKEEYY @"fvO8gAfNSr1tbdQe"

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

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

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


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


+ 17 - 0
创维盒子/双子星云手机/Categories/NSArray+Log.h

@@ -0,0 +1,17 @@
+//
+//  NSArray+Log.h
+//  VclustersGemini
+//
+//  Created by xd h on 2020/6/24.
+//  Copyright © 2020 APPLE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSArray (Log)
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 35 - 0
创维盒子/双子星云手机/Categories/NSArray+Log.m

@@ -0,0 +1,35 @@
+//
+//  NSArray+Log.m
+//  VclustersGemini
+//
+//  Created by xd h on 2020/6/24.
+//  Copyright © 2020 APPLE. All rights reserved.
+//
+
+#import "NSArray+Log.h"
+
+@implementation NSArray (Log)
+
+- (NSString *)descriptionWithLocale:(nullable id)locale indent:(NSUInteger)level{
+    
+    NSMutableString *mStr = [NSMutableString string];
+    NSMutableString *tab = [NSMutableString stringWithString:@""];
+    for (int i = 0; i < level; i++) {
+        [tab appendString:@"\t"];
+    }
+    [mStr appendString:@"(\n"];
+    for (int i = 0; i < self.count; i++) {
+        NSString *lastSymbol = (self.count == i + 1) ? @"":@",";
+        id value = self[i];
+        if ([value respondsToSelector:@selector(descriptionWithLocale:indent:)]) {
+            [mStr appendFormat:@"\t%@%@%@\n",tab,[value descriptionWithLocale:locale indent:level + 1],lastSymbol];
+        } else {
+            [mStr appendFormat:@"\t%@%@%@\n",tab,value,lastSymbol];
+        }
+    }
+    [mStr appendFormat:@"%@)",tab];
+    return mStr;
+    
+}
+
+@end

+ 17 - 0
创维盒子/双子星云手机/Categories/NSDictionary+Log.h

@@ -0,0 +1,17 @@
+//
+//  NSDictionary+Log.h
+//  VclustersGemini
+//
+//  Created by xd h on 2020/6/24.
+//  Copyright © 2020 APPLE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSDictionary (Log)
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 39 - 0
创维盒子/双子星云手机/Categories/NSDictionary+Log.m

@@ -0,0 +1,39 @@
+//
+//  NSDictionary+Log.m
+//  VclustersGemini
+//
+//  Created by xd h on 2020/6/24.
+//  Copyright © 2020 APPLE. All rights reserved.
+//
+
+#import "NSDictionary+Log.h"
+
+@implementation NSDictionary (Log)
+
+- (NSString *)descriptionWithLocale:(id)locale indent:(NSUInteger)level
+{
+    NSMutableString *mStr = [NSMutableString string];
+    NSMutableString *tab = [NSMutableString stringWithString:@""];
+    for (int i = 0; i < level; i++) {
+        [tab appendString:@"\t"];
+    }
+    [mStr appendString:@"{\n"];
+    NSArray *allKey = self.allKeys;
+    for (int i = 0; i < allKey.count; i++) {
+        id value = self[allKey[i]];
+        NSString *lastSymbol = (allKey.count == i + 1) ? @"":@";";
+        if ([value respondsToSelector:@selector(descriptionWithLocale:indent:)]) {
+
+            [mStr appendFormat:@"\t%@%@ = %@%@\n",tab,allKey[i],[value descriptionWithLocale:locale indent:level + 1],lastSymbol];
+
+        } else {
+
+            [mStr appendFormat:@"\t%@%@ = %@%@\n",tab,allKey[i],value,lastSymbol];
+
+        }
+    }
+    [mStr appendFormat:@"%@}",tab];
+    return mStr;
+}
+
+@end

+ 1 - 1
创维盒子/双子星云手机/Class/Guide/forgetPwdViewController.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface forgetPwdViewController : BaseViewController
-
+@property(nonatomic, assign)   bool isCheckPwdType;//隐私模式进来 验证下密码
 @end
 
 NS_ASSUME_NONNULL_END

+ 5 - 0
创维盒子/双子星云手机/Class/Guide/forgetPwdViewController.m

@@ -45,6 +45,11 @@
 
 #pragma mark 点击返回
 - (void)backBtnPressed{
+    if(_isCheckPwdType){
+        [self.navigationController popViewControllerAnimated:YES];
+        return;
+    }
+    
     //发个通知 记录进入了设置密码
     [[NSNotificationCenter defaultCenter] postNotificationName:forgetPwdBackNotification object:nil];
 }

+ 4 - 0
创维盒子/双子星云手机/Class/Guide/inputPWDViewController.h

@@ -11,6 +11,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface inputPWDViewController : BaseViewController
 @property(nonatomic, assign)   bool isQRCodeType;//第一次 扫码进来的
+
+@property(nonatomic, assign)   bool isCheckPwdType;//隐私模式进来 验证下密码
+//
+@property (nonatomic,copy) void (^didInputRightPwdFun)(void);
 @end
 
 NS_ASSUME_NONNULL_END

+ 19 - 2
创维盒子/双子星云手机/Class/Guide/inputPWDViewController.m

@@ -446,6 +446,16 @@
 #pragma mark 验证密码正常
 -(void)verifyPwdRightFun
 {
+    //隐私模式验证密码 不走后续流程
+    if(_isCheckPwdType){
+        if(_didInputRightPwdFun){
+            _didInputRightPwdFun();
+        }
+        
+        [self.navigationController popViewControllerAnimated:YES];
+        return;
+    }
+    
     [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
     if(_isQRCodeType){
         [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
@@ -560,10 +570,17 @@
 #pragma mark 点击忘记密码
 - (void)forgetPwdFun
 {
+    
+    if(_isCheckPwdType){
+        forgetPwdViewController *vc = [forgetPwdViewController new];
+        vc.isCheckPwdType = YES;
+        [self.navigationController pushViewController:vc animated:YES];
+        return;
+    }
+    
     //发个通知 记录进入了设置密码
     [[NSNotificationCenter defaultCenter] postNotificationName:forgetPwdNotification object:nil];
-    //forgetPwdViewController *vc = [forgetPwdViewController new];
-    //[self.navigationController pushViewController:vc animated:YES];
+   
     
     //SceneDelegate *sceneDelegate = (SceneDelegate *)self.window.rootViewController;
 }

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

@@ -24,6 +24,7 @@
 #import "uploadImageOrVideoViewController.h"
 #import "TZImagePickerController.h"
 #import "uploadFileRecordViewController.h"
+#import "privacyModeViewController.h"
 
 @interface MySetViewController ()<HelpDownScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,ComontAlretViewControllerDelegate>
 {
@@ -210,8 +211,7 @@
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 7;
-    //return 6;//去掉隐藏进程
+    return 6;
      //return 5;//去掉更换icon
 }
 
@@ -234,8 +234,13 @@
     [cell.lineView setHidden:NO];
     [cell.maskSwitch setHidden:YES];
     if (row == 0){
-        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_modify_pwd",nil)];
-        [cell.mImageView setImage:[UIImage imageNamed:@"mdoify_pwd"]];
+        
+        [cell.titleLabel setText:NSLocalizedString(@"my_set_Privacy_Model",nil)];
+        [cell.mImageView setImage:[UIImage imageNamed:@"icon_Privacy_model"]];
+        
+//        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_modify_pwd",nil)];
+//        [cell.mImageView setImage:[UIImage imageNamed:@"mdoify_pwd"]];
+        
         /*上圆角*/
         //设置部分圆角  贝塞尔曲线
         UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_W-30 , 60)
@@ -253,29 +258,29 @@
 //        //        [cell.titleLabel setText:NSLocalizedString(@"mask_view_hiden_set_hiden",nil)];
 //        //        [cell.mImageView setImage:[UIImage imageNamed:@"icon-jincheng"]];
 //        //    }else if (row == 3){
-    }else if (row == 1){
-        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_fanzhuan_exit",nil)];
-        [cell.mImageView setImage:[UIImage imageNamed:@"fanzhuan"]];
-        [cell.rightImage setHidden:YES];
-        [cell.maskSwitch setHidden:NO];
+//    }else if (row == 1){
+//        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_fanzhuan_exit",nil)];
+//        [cell.mImageView setImage:[UIImage imageNamed:@"fanzhuan"]];
+//        [cell.rightImage setHidden:YES];
+//        [cell.maskSwitch setHidden:NO];
     //}else if (row == 4){/*版本信息*/
-    }else if (row == 2){/*版本信息*/
+    }else if (row == 1){/*版本信息*/
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_check_update",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"app_update"]];
         [cell.titleLabel2 setText:[iPhone appVersion]];
         [cell.titleLabel2 setHidden:NO];
     //}else if (row == 5){/*更换设备*/
-    }else if (row == 3){/*更换设备*/
+    }else if (row == 2){/*更换设备*/
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_change_phone",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"icon_change_ohone"]];
     //}else if (row == 6){
-    }else if (row == 4){/*常见问题*/
+    }else if (row == 3){/*常见问题*/
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_common_problem",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"icon_common_problem"]];
-    }else if (row == 5){/*回复出厂*/
+    }else if (row == 4){/*回复出厂*/
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_Restore_Factory",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"icon_Restore_Factory"]];
-    }else if (row == 6){/*重启空间*/
+    }else if (row == 5){/*重启空间*/
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_restart_phone",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"icon-gengxin"]];
         /*下圆角*/
@@ -304,21 +309,25 @@
     
     NSInteger row = indexPath.row;
     if (0 == row){
-        /*修改密码*/
-        ModifyPWDFirstViewController *nextVC = [[ModifyPWDFirstViewController alloc] init];
+        
+        privacyModeViewController *nextVC = [[privacyModeViewController alloc] init];
         [self.navigationController pushViewController:nextVC animated:YES];
+        
+        /*修改密码*/
+//        ModifyPWDFirstViewController *nextVC = [[ModifyPWDFirstViewController alloc] init];
+//        [self.navigationController pushViewController:nextVC animated:YES];
 //    }else if (1 == row){
 //        /*更换图标*/
 //        ChangeLogoViewController *nextVC = [[ChangeLogoViewController alloc] init];
 //        [self.navigationController pushViewController:nextVC animated:YES];
-    }else if (1 == row){/*进城隐藏*/
+ //   }else if (1 == row){/*进城隐藏*/
 //        HidenMaskSetViewController *nextVC = [[HidenMaskSetViewController alloc] init];
 //        [self.navigationController pushViewController:nextVC animated:YES];
 //    }else if (3 == row){/*设备翻转*/
 //        ;
     }
     //else if (4 == row){/*版本信息*/
-    else if (2 == row){/*版本信息*/
+    else if (1 == row){/*版本信息*/
         AboutViewController *vc = [[AboutViewController alloc] init];
         vc.getSysInfo = ^{
             if(self->_getSysInfo){
@@ -327,19 +336,19 @@
         };
         [self.navigationController pushViewController:vc animated:YES];
     //}else if (5 == row){/*更换设备*/
-    }else if (3 == row){/*更换设备*/
+    }else if (2 == row){/*更换设备*/
         TipsQRCodeForChangeDeviceViewController *vc = [[TipsQRCodeForChangeDeviceViewController alloc] init];
         [self.navigationController pushViewController:vc animated:YES];
-    }else if (4 == row){/*常见问题*/
+    }else if (3 == row){/*常见问题*/
         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];
     
-    }else if (5 == row){/*恢复出厂*/
+    }else if (4 == row){/*恢复出厂*/
         [self RestoreFactoryAleartFun];
-    }else if (6 == row){/*重启空间*/
+    }else if (5 == row){/*重启空间*/
         /*弹窗提示重启*/
         ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_restart_phone_tips",nil)
                                                                                          msg:nil

+ 16 - 0
创维盒子/双子星云手机/Class/Set/privacyMode/privacyModeViewController.h

@@ -0,0 +1,16 @@
+//
+//  privacyModeViewController.h
+//  隐私保护
+//
+//  Created by xd h on 2023/11/28.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface privacyModeViewController : BaseViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 293 - 0
创维盒子/双子星云手机/Class/Set/privacyMode/privacyModeViewController.m

@@ -0,0 +1,293 @@
+//
+//  privacyModeViewController.m
+//  隐私保护
+//
+//  Created by xd h on 2023/11/28.
+//
+
+#import "privacyModeViewController.h"
+#import "connectDeviceManager.h"
+#import "MineViewCell.h"
+#import "ModifyPWDFirstViewController.h"
+#import "ChangeLogoViewController.h"
+#import "inputPWDViewController.h"
+
+@interface privacyModeViewController ()<UITableViewDelegate,UITableViewDataSource>
+@property(nonatomic,strong)UIView* headView;//
+@property(nonatomic, strong) UISwitch *privacySwitch;
+@property (nonatomic, strong, nullable) UITableView *tableView;
+@end
+
+@implementation privacyModeViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    [self.view setBackgroundColor:HWF5F7FAColor];
+    [self.toolBar setHidden:YES];
+    [self.navigationBar setHidden:YES];
+    [self.navBarBGView setHidden:NO];
+    [self.titleLabel setText:NSLocalizedString(@"my_set_Privacy_Model",nil)];
+    
+    [self drawAnyView];
+}
+
+- (void)drawAnyView{
+    [self initHeadUIFun];
+    
+    [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(_headView.mas_bottom).offset(20.f);
+    }];
+}
+
+- (void)initHeadUIFun
+{
+    _headView = [[UIView alloc] init];
+    _headView.backgroundColor = [UIColor whiteColor];
+    _headView.layer.cornerRadius = 8;
+    [self.view addSubview:_headView];
+    
+    [_headView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(15);
+        make.right.mas_equalTo(-15);
+        make.height.mas_equalTo(108);
+        make.top.equalTo(self.navBarBGView.mas_bottom).offset(16.f);
+    }];
+    
+    UIImageView *topImageV = [[UIImageView alloc] init];
+    topImageV.image = [UIImage imageNamed:@"icon_Privacy_model"];
+    [_headView addSubview:topImageV];
+    
+    [topImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(15);
+        make.top.mas_equalTo(15);
+        make.width.mas_equalTo(28);
+        make.height.mas_equalTo(28);
+    }];
+    
+    UILabel *topLab = [[UILabel alloc] init];
+    topLab.text = NSLocalizedString(@"my_set_Privacy_Model",nil);
+    topLab.font = [UIFont boldSystemFontOfSize:14.0];
+    topLab.textColor = [UIColor hwColor:@"#0A132B" alpha:1.0];
+    [_headView addSubview:topLab];
+    
+    [topLab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(topImageV.mas_right).offset(5);
+        make.top.mas_equalTo(topImageV.mas_top).offset(0);
+        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(28);
+    }];
+    
+    _privacySwitch = [[UISwitch alloc] init];
+    [_headView addSubview:_privacySwitch];
+    [_privacySwitch mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-15.f);
+        make.centerY.equalTo(topImageV.mas_centerY);
+    }];
+    [_privacySwitch setOnTintColor:HW13B2EBColor];
+    [_privacySwitch addTarget:self action:@selector(maskSwitchPressed:) forControlEvents:(UIControlEventValueChanged)];
+
+    [self setPrivacySwitchStateFun];
+    
+    UILabel *tipLab = [[UILabel alloc] init];
+    tipLab.text = NSLocalizedString(@"my_set_Privacy_Model_tip",nil);
+    tipLab.font = [UIFont systemFontOfSize:12.0];
+    tipLab.textColor = [UIColor hwColor:@"#6A6A6A" alpha:1.0];
+    tipLab.numberOfLines = 0;
+    [_headView addSubview:tipLab];
+    
+    [tipLab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(topImageV.mas_bottom).offset(10);
+        make.left.mas_equalTo(topImageV.mas_left).offset(0);
+        make.right.mas_equalTo(_privacySwitch.mas_right).offset(0);
+    }];
+}
+
+#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 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 3;
+}
+
+- (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(@"my_set_no_modify_pwd",nil)];
+        [cell.mImageView setImage:[UIImage imageNamed:@"mdoify_pwd"]];
+        
+        /*上圆角*/
+        //设置部分圆角  贝塞尔曲线
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_W-30 , 60)
+                                                       byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight
+                                                             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;
+    }else if (row == 1){
+        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_change_logo",nil)];
+        [cell.mImageView setImage:[UIImage imageNamed:@"icon_change_logo"]];
+        //    }else if (row == 2){
+        //        [cell.titleLabel setText:NSLocalizedString(@"mask_view_hiden_set_hiden",nil)];
+        //        [cell.mImageView setImage:[UIImage imageNamed:@"icon-jincheng"]];
+        //    }else if (row == 3){
+    }else if (row == 2){
+        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_fanzhuan_exit",nil)];
+        [cell.mImageView setImage:[UIImage imageNamed:@"fanzhuan"]];
+        [cell.rightImage setHidden:YES];
+        [cell.maskSwitch setHidden:NO];
+
+        /*下圆角*/
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_W-30 , 60)
+                                                       byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerBottomRight
+                                                             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];
+    }
+
+    return cell;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    return 60;
+}
+
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    
+    NSInteger row = indexPath.row;
+    if (0 == row){
+        /*修改密码*/
+        ModifyPWDFirstViewController *nextVC = [[ModifyPWDFirstViewController alloc] init];
+        [self.navigationController pushViewController:nextVC animated:YES];
+    }else if (1 == row){
+        /*更换图标*/
+        ChangeLogoViewController *nextVC = [[ChangeLogoViewController alloc] init];
+        [self.navigationController pushViewController:nextVC animated:YES];
+    }
+//    else if (1 == row){/*进城隐藏*/
+//        HidenMaskSetViewController *nextVC = [[HidenMaskSetViewController alloc] init];
+//        [self.navigationController pushViewController:nextVC animated:YES];
+//    }
+    else if (2 == row){/*设备翻转*/
+        ;
+    }
+   
+}
+
+- (void)maskSwitchPressed:(UISwitch *)privacySwitch{
+    [self setPrivacySwitchStateFun];
+    
+    inputPWDViewController *nextVC = [inputPWDViewController new];
+    nextVC.isCheckPwdType = YES;
+    [self.navigationController pushViewController:nextVC animated:YES];
+    
+    KWeakSelf
+    nextVC.didInputRightPwdFun = ^{
+        [weakSelf updatePrivacyModeFun];
+    };
+    
+}
+
+#pragma mark 设置tabview 是否隐藏
+- (void)setPrivacySwitchStateFun{
+    BOOL haveOpenMask = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
+    [_privacySwitch setOn:haveOpenMask];
+    
+    if(haveOpenMask){
+        self.tableView.hidden = NO;
+    }
+    else{
+        self.tableView.hidden = YES;
+    }
+}
+
+#pragma mark 联网设置隐私模式
+- (void)updatePrivacyModeFun{
+    
+    [self showNewIndicatorWithCanBack:YES canTouch:NO];
+
+    BOOL haveOpenMask = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
+    NSString* curSn = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.sn;
+    
+    NSMutableDictionary *paraDict = [NSMutableDictionary dictionary];
+    [paraDict setValue:curSn forKey:@"sn"];
+    [paraDict setValue:[NSNumber numberWithBool:!haveOpenMask] forKey:@"isPrivacyMode"];
+    
+    KWeakSelf
+    [[netWorkManager shareInstance] CommonPostCallBackCode:updatePrivacyMode Parameters:paraDict success:^(id  _Nonnull responseObject) {
+        HLog(@"%@", responseObject);
+      [self removeNewIndicator];
+
+      SuperModel *model = [[SuperModel alloc] initWithDictionary:responseObject error:nil];
+
+       if (model.status == 0) {
+           [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode = ![connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
+           
+           [weakSelf setPrivacySwitchStateFun];
+       }
+       else
+       {
+           [[iToast makeText:model.msg] show];
+       }
+
+    } failure:^(NSError * _Nonnull error) {
+       HLog(@"%@", error);
+        [[iToast makeText:@"网络异常,请稍后重试!"] show];
+      [self removeNewIndicator];
+    }];
+}
+@end

+ 1 - 1
创维盒子/双子星云手机/CloudPlayer/View/PlayerView.m

@@ -67,7 +67,7 @@ ShowImageViewDelegate>{
                   inRect:CGRectMake(0, 0, glkshowImageView.drawableWidth, glkshowImageView.drawableHeight)
                 fromRect:[ciImage extent]];
     
-    [self->glkshowImageView display];
+    //[self->glkshowImageView display];
 }
 
 - (void)showIMage

+ 4 - 1
创维盒子/双子星云手机/connectDeviceManager/model/DeviceThirdIdModel.h

@@ -26,10 +26,13 @@ NS_ASSUME_NONNULL_BEGIN
 /***/
 @property (nonatomic,copy) NSString *firstTimeUpdatePassword; //
 /***/
-@property (nonatomic,assign) bool isFirstUpdatePassword; //
+@property (nonatomic,assign) BOOL isFirstUpdatePassword; //
 /***/
 @property (nonatomic,copy) NSString *password; //
 
+/***/
+@property (nonatomic,assign) BOOL isPrivacyMode; //是否为隐私模式
+
 /**自定义字段 是否为局域网*/
 @property (nonatomic,assign) bool isPingOk; //
 @end

+ 7 - 0
创维盒子/双子星云手机/netWork/newWorkInterface.h

@@ -29,4 +29,11 @@
  返回数据模型 */
 #define upgradeNewVersion  @"/box/upgrade/new/version"
 
+/*4 修改隐私模式   POST请求
+输入参数     sn
+输入参数     isPrivacyMode  true:开启隐私模式        false:关闭隐私模式
+ 
+ 返回数据模型 */
+#define updatePrivacyMode  @"/box/updatePrivacyMode"
+
 #endif /* newWorkInterface_h */

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

@@ -277,3 +277,5 @@
 "my_set_about_version_tap_daili"   = "代理版本号";
 "my_set_about_version_tap_app"   = "手机版本号";
 "my_set_about_version_tap_sn"   = "SN号";
+"my_set_Privacy_Model"   = "隐私模式";
+"my_set_Privacy_Model_tip"   = "隐私模式下,具有设置登录密码、更换图标、翻转退出及进程隐藏等保护您个人信息安全的功能";