Browse Source

1.设置页面ui完成

huangxiaodong 1 year ago
parent
commit
7e90f41b46
28 changed files with 502 additions and 57 deletions
  1. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/app_update.imageset/编组 6@2x.png
  2. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/app_update.imageset/编组 6@3x.png
  3. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/icon-gengxin.imageset/icon-gengxin@2x.png
  4. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/icon-gengxin.imageset/icon-gengxin@3x.png
  5. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/icon_Restore_Factory.imageset/icon_Restore_Factory@2x.png
  6. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/icon_Restore_Factory.imageset/icon_Restore_Factory@3x.png
  7. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/icon_change_ohone.imageset/编组@2x.png
  8. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/icon_change_ohone.imageset/编组@3x.png
  9. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/icon_common_problem.imageset/icon_common_problem@2x.png
  10. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/icon_common_problem.imageset/icon_common_problem@3x.png
  11. 22 0
      创维盒子/双子星云手机/Assets.xcassets/Set/image_backups_icon.imageset/Contents.json
  12. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/image_backups_icon.imageset/image_backups_icon@2x.png
  13. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/image_backups_icon.imageset/image_backups_icon@3x.png
  14. 22 0
      创维盒子/双子星云手机/Assets.xcassets/Set/setting_Privacy_bg.imageset/Contents.json
  15. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/setting_Privacy_bg.imageset/setting_Privacy_bg@2x.png
  16. BIN
      创维盒子/双子星云手机/Assets.xcassets/Set/setting_Privacy_bg.imageset/setting_Privacy_bg@3x.png
  17. 22 0
      创维盒子/双子星云手机/Assets.xcassets/common/common_eye_close.imageset/Contents.json
  18. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_eye_close.imageset/common_eye_close@2x.png
  19. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_eye_close.imageset/common_eye_close@3x.png
  20. 22 0
      创维盒子/双子星云手机/Assets.xcassets/common/common_eye_open.imageset/Contents.json
  21. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_eye_open.imageset/common_eye_open@2x.png
  22. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_eye_open.imageset/common_eye_open@3x.png
  23. 27 26
      创维盒子/双子星云手机/Class/Set/MySetViewController.m
  24. 365 19
      创维盒子/双子星云手机/Class/Set/view/mySetHeadView.m
  25. 3 3
      创维盒子/双子星云手机/en.lproj/Localizable.strings
  26. 3 3
      创维盒子/双子星云手机/ja.lproj/Localizable.strings
  27. 13 3
      创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings
  28. 3 3
      创维盒子/双子星云手机/zh-Hant.lproj/Localizable.strings

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


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


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


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


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


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


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


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


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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

@@ -35,7 +35,7 @@
     UIButton *tvP2PBtn;
 }
 @property (nonatomic, strong, nullable) UITableView *tableView;
-
+@property (nonatomic, strong, nullable) mySetHeadView *customTableHeadView;
 @end
 
 @implementation MySetViewController
@@ -77,34 +77,33 @@
 
 
 
-- (UIView *)tableHeadView{
-    UIView *bgView = [[UIView alloc] initWithFrame:(CGRectMake(0, 0, SCREEN_W, 108.f + 15))];
-    [bgView setBackgroundColor:[UIColor clearColor]];
-    
-    mySetHeadView *headView = [[mySetHeadView alloc] init];
-    [bgView addSubview:headView];
-    headView.layer.cornerRadius = 8;
-    headView.layer.masksToBounds = YES;
-    
-    [headView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(15);
-        make.right.mas_equalTo(-15);
-        make.top.mas_equalTo(0);
-        make.bottom.mas_equalTo(-15);
-    }];
+- (mySetHeadView *)customTableHeadView{
     
-    KWeakSelf
-#pragma mark 上传文件相关处理
-    headView.didClickBut = ^(NSInteger tag) {
-        [weakSelf didClickUploadFileByTag:tag];
-    };
+    if(!_customTableHeadView){
+        CGFloat PrivacyBgW = SCREEN_W - 20;
+        CGFloat PrivacyBgH = 116.0 * PrivacyBgW / (345.0);
+        
+        CGFloat totalHeight = 10 + PrivacyBgH + (110+15) + (110+15)+(135+15);
+        
+
+        _customTableHeadView = [[mySetHeadView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, totalHeight)];
+
+        
+        KWeakSelf
+    #pragma mark 上传文件相关处理
+        _customTableHeadView.didClickBut = ^(NSInteger tag) {
+            [weakSelf didClickUploadFileByTag:tag];
+        };
+    }
     
-    return bgView;
+    return _customTableHeadView;
 }
 
 #pragma mark 点击文件上传相关
 - (void)didClickUploadFileByTag:(NSInteger)tag
 {
+    HLog(@"hhh %ld",tag);
+    
     if(tag ==2 || tag ==3){
         
         if(self->_getBaseInfo){
@@ -129,7 +128,7 @@
 }
 
 - (UIView *)tableFoorView{
-    UIView *bgView = [[UIView alloc] initWithFrame:(CGRectMake(0, 0, SCREEN_W, 68.f))];
+    UIView *bgView = [[UIView alloc] initWithFrame:(CGRectMake(0, 0, SCREEN_W, 48.f))];
     [bgView setBackgroundColor:[UIColor clearColor]];
     
     tvP2PBtn = [[UIButton alloc] initWithFrame:(CGRectMake(15, 20, SCREEN_W - 2*15.f, 48.f))];
@@ -254,7 +253,7 @@
         }
         
         [_tableView setTableFooterView:[self tableFoorView]];
-        [_tableView setTableHeaderView:[self tableHeadView]];
+        [_tableView setTableHeaderView:[self customTableHeadView]];
     }
     
     return _tableView;
@@ -262,11 +261,13 @@
 
 #pragma mark - 列表委托
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
-    return 1;
+    return 0;
+    //return 1;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 6;
+    return 0;
+    //return 6;
      //return 5;//去掉更换icon
 }
 

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

@@ -7,6 +7,14 @@
 
 #import "mySetHeadView.h"
 
+@interface mySetHeadView ()
+{
+    UIView *imageBackupsBgView;
+    UILabel *imageBackupsLabel;
+    UIButton *imageBackupsButton;
+}
+@end
+
 @implementation mySetHeadView
 
 - (id)initWithFrame:(CGRect)frame{
@@ -18,60 +26,159 @@
 }
 
 - (void)drawAnyView{
-    [self setBackgroundColor:[UIColor whiteColor]];
+    [self setBackgroundColor:[UIColor hwColor:@"#F5F7FA" alpha:1.0]];
+    //self.backgroundColor = [UIColor redColor];
+    
+    //setting_Privacy_bg
+    UIImageView *PrivacyBg = [[UIImageView alloc] init];
+    PrivacyBg.image = [UIImage imageNamed:@"setting_Privacy_bg"];
+    //PrivacyBg.contentMode = UIViewContentModeScaleAspectFit;
+    PrivacyBg.userInteractionEnabled = YES;
+    [self addSubview:PrivacyBg];
+    //PrivacyBg.backgroundColor = [UIColor greenColor];
+    
+    CGFloat PrivacyBgW = SCREEN_W - 20;
+    CGFloat PrivacyBgH = 116.0 * PrivacyBgW / (345.0);
+    
+    [PrivacyBg mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(10);
+        make.width.mas_equalTo(PrivacyBgW);
+        make.height.mas_equalTo(PrivacyBgH);
+    }];
+    
+    UILabel *PrivacyTitleLabel = [[UILabel alloc] init];
+    PrivacyTitleLabel.text = NSLocalizedString(@"my_set_Privacy_Model",nil) ;
+    PrivacyTitleLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    PrivacyTitleLabel.textColor = [UIColor hwColor:@"0A132B" alpha:1.0];
+    [PrivacyBg addSubview:PrivacyTitleLabel];
+
+    [PrivacyTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(15);
+        make.width.mas_equalTo(150);
+        make.height.mas_equalTo(20);
+    }];
+    
+    UIButton *setPrivacyBut = [[UIButton alloc] init];
+    
+    // gradient
+    CAGradientLayer *gl = [CAGradientLayer layer];
+    gl.frame = CGRectMake(0,0,80.f,32.f);
+    gl.startPoint = CGPointMake(0, 0.5);
+    gl.endPoint = CGPointMake(1, 0.5);
+    gl.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
+    gl.locations = @[@(0), @(1.0f)];
+
+    [setPrivacyBut.layer addSublayer:gl];
+    
+    setPrivacyBut.tag = 4;
+    [setPrivacyBut addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+    setPrivacyBut.layer.cornerRadius = 16.0;
+    setPrivacyBut.layer.masksToBounds = YES;
+    [setPrivacyBut setTitle:NSLocalizedString(@"set_Privacy_button_title",nil) forState:UIControlStateNormal];
+    setPrivacyBut.titleLabel.font = [UIFont systemFontOfSize:12.0];
+    [PrivacyBg addSubview:setPrivacyBut];
+
+    [setPrivacyBut mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-10);
+        make.top.mas_equalTo(10);
+        make.width.mas_equalTo(80);
+        make.height.mas_equalTo(32);
+    }];
+    
+    UILabel *PrivacyTipLabel = [[UILabel alloc] init];
+    PrivacyTipLabel.text = NSLocalizedString(@"set_Privacy_Tip",nil) ;
+    PrivacyTipLabel.font = [UIFont systemFontOfSize:14.0];
+    PrivacyTipLabel.textColor = [UIColor hwColor:@"#01B7EA" alpha:1.0];
+    [PrivacyBg addSubview:PrivacyTipLabel];
+
+    [PrivacyTipLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(PrivacyTitleLabel.mas_bottom).offset(10);
+        make.right.mas_equalTo(0);
+        make.height.mas_equalTo(20);
+    }];
+    
+    UILabel *PrivacyTipLabel2 = [[UILabel alloc] init];
+    PrivacyTipLabel2.text = NSLocalizedString(@"my_set_Privacy_Mode_tip1",nil) ;
+    PrivacyTipLabel2.font = [UIFont systemFontOfSize:12.0];
+    PrivacyTipLabel2.textColor = [UIColor hwColor:@"#6A6A6A" alpha:1.0];
+    PrivacyTipLabel2.numberOfLines = 0;
+    [PrivacyBg addSubview:PrivacyTipLabel2];
+
+    [PrivacyTipLabel2 mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(PrivacyTipLabel.mas_bottom).offset(10);
+        make.right.mas_equalTo(-10);
+        make.height.mas_equalTo(40);
+    }];
+    
     
     //文件上传
+    UIView *fileUploadBgView = [[UIView alloc] init];
+    fileUploadBgView.backgroundColor = [UIColor whiteColor];
+    fileUploadBgView.layer.cornerRadius = 8;
+    [self addSubview:fileUploadBgView];
+    
+    [fileUploadBgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(PrivacyBg.mas_bottom).offset(15);
+        make.right.mas_equalTo(-10);
+        make.height.mas_equalTo(110);
+    }];
+    
     UILabel *titleLabel = [[UILabel alloc] init];
-    titleLabel.text = NSLocalizedString(@"my_set_no_File_upload",nil) ;
+    titleLabel.text = NSLocalizedString(@"my_set_no_File_upload_title",nil) ;
     titleLabel.font = [UIFont boldSystemFontOfSize:16.0];
-    [self addSubview:titleLabel];
-    
+    [fileUploadBgView addSubview:titleLabel];
+
     [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(10);
         make.top.mas_equalTo(10);
         make.width.mas_equalTo(100);
         make.height.mas_equalTo(20);
     }];
-    
+
     //上传记录
     UIImageView *arrowImageView = [[UIImageView alloc] init];
     arrowImageView.image = [UIImage imageNamed:@"cell_right_access"];
-    [self addSubview:arrowImageView];
-    
+    [fileUploadBgView addSubview:arrowImageView];
+
     [arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(-10);
         make.top.mas_equalTo(10);
         make.width.mas_equalTo(20);
         make.height.mas_equalTo(20);
     }];
-    
+
     UILabel *rightLabel = [[UILabel alloc] init];
     rightLabel.text = NSLocalizedString(@"my_set_no_File_upload_record",nil) ;
     rightLabel.font = [UIFont systemFontOfSize:14.0];
     rightLabel.textColor = [UIColor hwColor:@"#959799" alpha:1.0];
     rightLabel.textAlignment = NSTextAlignmentRight;
-    [self addSubview:rightLabel];
-    
+    [fileUploadBgView addSubview:rightLabel];
+
     [rightLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(arrowImageView.mas_left).offset(-2);
         make.top.mas_equalTo(10);
         make.width.mas_equalTo(200);
         make.height.mas_equalTo(20);
     }];
-    
+
     UIButton *recordBut = [[UIButton alloc] init];
     //recordBut.backgroundColor = [UIColor greenColor];
     recordBut.tag = 1;
     [recordBut addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
-    [self addSubview:recordBut];
-    
+    [fileUploadBgView addSubview:recordBut];
+
     [recordBut mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(0);
         make.top.mas_equalTo(0);
         make.width.mas_equalTo(150);
         make.height.mas_equalTo(40);
     }];
-    
+
     //图片上传
     NSString* curImgUploadStr = [[NSString alloc] initWithFormat:@"%@ %@",@"  ",NSLocalizedString(@"my_set_no_image_upload",nil)];
     UIButton *imageUploadBut = [[UIButton alloc] init];
@@ -83,15 +190,15 @@
     imageUploadBut.titleLabel.font = [UIFont systemFontOfSize:13.0];
     imageUploadBut.tag = 2;
     [imageUploadBut addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
-    [self addSubview:imageUploadBut];
-    
+    [fileUploadBgView addSubview:imageUploadBut];
+
     [imageUploadBut mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(10);
         make.right.mas_equalTo(self.mas_centerX).offset(-10);
         make.bottom.mas_equalTo(-10);
         make.height.mas_equalTo(48);
     }];
-    
+
     //视频上传
     NSString* curVidelUploadStr = [[NSString alloc] initWithFormat:@"%@ %@",@"  ",NSLocalizedString(@"my_set_no_video_upload",nil)];
     UIButton *videoUploadBut = [[UIButton alloc] init];
@@ -103,14 +210,253 @@
     videoUploadBut.titleLabel.font = [UIFont systemFontOfSize:13.0];
     videoUploadBut.tag = 3;
     [videoUploadBut addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
-    [self addSubview:videoUploadBut];
-    
+    [fileUploadBgView addSubview:videoUploadBut];
+
     [videoUploadBut mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(-10);
         make.left.mas_equalTo(self.mas_centerX).offset(10);
         make.bottom.mas_equalTo(-10);
         make.height.mas_equalTo(48);
     }];
+    
+    
+    //文件备份
+    UIView *fileBackupsBgView = [[UIView alloc] init];
+    fileBackupsBgView.backgroundColor = [UIColor whiteColor];
+    fileBackupsBgView.layer.cornerRadius = 8;
+    [self addSubview:fileBackupsBgView];
+    
+    [fileBackupsBgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(fileUploadBgView.mas_bottom).offset(15);
+        make.right.mas_equalTo(-10);
+        make.height.mas_equalTo(110);
+    }];
+    
+    UILabel *BackupsTitleLabel = [[UILabel alloc] init];
+    BackupsTitleLabel.text = NSLocalizedString(@"set_Privacy_title",nil) ;
+    BackupsTitleLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    [fileBackupsBgView addSubview:BackupsTitleLabel];
+
+    [BackupsTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(10);
+        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(20);
+    }];
+
+    //
+    UIImageView *arrowImageView2 = [[UIImageView alloc] init];
+    arrowImageView2.image = [UIImage imageNamed:@"cell_right_access"];
+    [fileBackupsBgView addSubview:arrowImageView2];
+
+    [arrowImageView2 mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-10);
+        make.top.mas_equalTo(10);
+        make.width.mas_equalTo(20);
+        make.height.mas_equalTo(20);
+    }];
+    
+    NSString *BackupsRightTitle = NSLocalizedString(@"set_Privacy_right_tip",nil);
+    CGFloat BackupsRightW = [BackupsRightTitle boundingRectWithSize:CGSizeMake(200, 20) options:(NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14.0]} context:nil].size.width;
+    BackupsRightW += 5;
+    
+    UILabel *BackupsRightLabel = [[UILabel alloc] init];
+    BackupsRightLabel.text =  BackupsRightTitle;
+    BackupsRightLabel.font = [UIFont systemFontOfSize:14.0];
+    BackupsRightLabel.textColor = [UIColor hwColor:@"#959799" alpha:1.0];
+    BackupsRightLabel.textAlignment = NSTextAlignmentRight;
+    [fileBackupsBgView addSubview:BackupsRightLabel];
+
+    [BackupsRightLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(arrowImageView.mas_left).offset(-2);
+        make.top.mas_equalTo(10);
+        make.width.mas_equalTo(BackupsRightW);
+        make.height.mas_equalTo(20);
+    }];
+
+    UIButton *BackupsSetBut = [[UIButton alloc] init];
+    //BackupsSetBut.backgroundColor = [UIColor greenColor];
+    BackupsSetBut.tag = 5;
+    [BackupsSetBut addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+    [fileBackupsBgView addSubview:BackupsSetBut];
+
+    [BackupsSetBut mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(0);
+        make.top.mas_equalTo(0);
+        make.left.mas_equalTo(BackupsRightLabel.mas_left);
+        make.height.mas_equalTo(40);
+    }];
+    
+    UIButton *BackupsEyeBut = [[UIButton alloc] init];
+    //BackupsEyeBut.backgroundColor = [UIColor greenColor];
+    [BackupsEyeBut setImage:[UIImage imageNamed:@"common_eye_open"] forState:UIControlStateNormal];
+    [BackupsEyeBut setImage:[UIImage imageNamed:@"common_eye_close"] forState:UIControlStateSelected];
+    BackupsEyeBut.tag = 6;
+    [BackupsEyeBut addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+    [fileBackupsBgView addSubview:BackupsEyeBut];
+
+    [BackupsEyeBut mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(BackupsSetBut.mas_left).offset(0);
+        make.centerY.mas_equalTo(BackupsRightLabel.mas_centerY);
+        make.width.mas_equalTo(40);
+        make.height.mas_equalTo(40);
+    }];
+    
+    imageBackupsBgView = [[UIView alloc] init];
+    imageBackupsBgView.backgroundColor = [UIColor hwColor:@"#F9F9F9" alpha:1.0];
+    imageBackupsBgView.layer.cornerRadius = 8;
+    [fileBackupsBgView addSubview:imageBackupsBgView];
+    
+    [imageBackupsBgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-10);
+        make.left.mas_equalTo(10);
+        make.bottom.mas_equalTo(-10);
+        make.height.mas_equalTo(56);
+    }];
+    
+    UIImageView *backupsImageV = [[UIImageView alloc] init];
+    backupsImageV.image = [UIImage imageNamed:@"image_backups_icon"];
+    [imageBackupsBgView addSubview:backupsImageV];
+    
+    [backupsImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(0);
+        make.left.mas_equalTo(10);
+        make.width.mas_equalTo(28);
+        make.height.mas_equalTo(28);
+    }];
+    
+    UILabel *imageBackupsTitleLabel = [[UILabel alloc] init];
+    imageBackupsTitleLabel.text = NSLocalizedString(@"set_Privacy_title_image",nil) ;
+    imageBackupsTitleLabel.font = [UIFont systemFontOfSize:14.0];
+    [imageBackupsBgView addSubview:imageBackupsTitleLabel];
+
+    [imageBackupsTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(-10);
+        make.left.mas_equalTo(backupsImageV.mas_right).offset(10);
+        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(20);
+    }];
+    
+    UILabel *imageBackupsLabel = [[UILabel alloc] init];
+    imageBackupsLabel.text = NSLocalizedString(@"set_Privacy_title_image_open",nil) ;
+    imageBackupsLabel.font = [UIFont systemFontOfSize:12.0];
+    imageBackupsLabel.textColor = [UIColor hwColor:@"#6A6A6A" alpha:1.0];
+    [imageBackupsBgView addSubview:imageBackupsLabel];
+
+    [imageBackupsLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(10);
+        make.left.mas_equalTo(backupsImageV.mas_right).offset(10);
+        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(20);
+    }];
+    
+    UIButton *imageBackupsButton = [[UIButton alloc] init];
+    imageBackupsButton.backgroundColor = [UIColor hwColor:@"#DCF4FB" alpha:1.0];
+    imageBackupsButton.tag = 7;
+    [imageBackupsButton addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+    imageBackupsButton.layer.cornerRadius = 12.0;
+    imageBackupsButton.layer.masksToBounds = YES;
+    [imageBackupsButton setTitle:NSLocalizedString(@"common_open",nil) forState:UIControlStateNormal];
+    [imageBackupsButton setTitle:NSLocalizedString(@"common_close",nil) forState:UIControlStateSelected];
+    [imageBackupsButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
+    imageBackupsButton.titleLabel.font = [UIFont systemFontOfSize:12.0];
+    [imageBackupsBgView addSubview:imageBackupsButton];
+
+    [imageBackupsButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-10);
+        make.centerY.mas_equalTo(0);
+        make.width.mas_equalTo(60);
+        make.height.mas_equalTo(24);
+    }];
+    
+    
+    //其他功能
+    UIView *otherBgView = [[UIView alloc] init];
+    otherBgView.backgroundColor = [UIColor whiteColor];
+    otherBgView.layer.cornerRadius = 8;
+    [self addSubview:otherBgView];
+    
+    [otherBgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(fileBackupsBgView.mas_bottom).offset(15);
+        make.right.mas_equalTo(-10);
+        make.height.mas_equalTo(135);
+    }];
+    
+    UILabel *otherTitleLabel = [[UILabel alloc] init];
+    otherTitleLabel.text = NSLocalizedString(@"set_other_title",nil) ;
+    otherTitleLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    [otherBgView addSubview:otherTitleLabel];
+
+    [otherTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(10);
+        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(20);
+    }];
+    
+    
+    NSArray *titleArr = @[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)];
+    
+    NSArray *imageArr = @[@"icon_change_ohone",@"icon-gengxin",@"icon_Restore_Factory",@"icon_common_problem",@"app_update"];
+    
+    CGFloat butWidth = (SCREEN_W -20)/titleArr.count;
+    CGFloat butHeight = 88.0;
+    
+    for (int i=0; i<titleArr.count; i++) {
+        
+        UILabel *curlab = [[UILabel alloc] init];
+        curlab.text = titleArr[i];
+        curlab.font = [UIFont systemFontOfSize:12.0];
+        curlab.textColor = [UIColor hwColor:@"#0A132B" alpha:1.0];
+        curlab.numberOfLines = 0;
+        curlab.textAlignment = NSTextAlignmentCenter;
+        [otherBgView addSubview:curlab];
+        
+        [curlab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(butWidth*i);
+            make.bottom.mas_equalTo(-10);
+            make.width.mas_equalTo(butWidth);
+            make.height.mas_equalTo(30);
+        }];
+        
+        UIButton *curImageV = [[UIButton alloc] init];
+        curImageV.userInteractionEnabled = NO;
+        [curImageV setImage:[UIImage imageNamed:imageArr[i]] forState:UIControlStateNormal];;
+        [otherBgView addSubview:curImageV];
+        
+        [curImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(butWidth*i);
+            make.bottom.mas_equalTo(curlab.mas_top);
+            make.width.mas_equalTo(butWidth);
+            make.height.mas_equalTo(40);
+        }];
+        
+        UIButton *curButton = [[UIButton alloc] init];
+        //curButton.backgroundColor = [UIColor greenColor];
+        curButton.tag = 10 + i;
+        [curButton addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+        //[curButton setTitle:titleArr[i] forState:UIControlStateNormal];
+        //[curButton setTitleColor:[UIColor hwColor:@"#0A132B" alpha:1.0] forState:UIControlStateNormal];
+        //[curButton setImage:[UIImage imageNamed:imageArr[i]] forState:UIControlStateNormal];
+        //curButton.titleLabel.font = [UIFont systemFontOfSize:12.0];
+        [otherBgView addSubview:curButton];
+
+        [curButton mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(butWidth*i);
+            make.bottom.mas_equalTo(0);
+            make.width.mas_equalTo(butWidth);
+            make.height.mas_equalTo(butHeight);
+        }];
+        
+    
+
+    }
 }
 
 

+ 3 - 3
创维盒子/双子星云手机/en.lproj/Localizable.strings

@@ -256,10 +256,10 @@
 "my_set_no_Restore_Factory_ok_tips" = "Factory reset successful";
 "my_set_no_Restore_Factory_ok_msg" = "When the recovery is complete, you will be redirected to the home page.";
 "my_set_no_Restore_FactoryOK" = "OK";
-"my_set_no_File_upload"   = "Upload File";
+"my_set_no_File_upload_title"   = "Upload File";
 "my_set_no_File_upload_record"   = "Upload Records";
-"my_set_no_image_upload"   = "Upload Image";
-"my_set_no_video_upload"   = "Upload video";
+"my_set_no_image_upload"   = "image";
+"my_set_no_video_upload"   = "video";
 "my_set_no_File_upload"   = "Upload";
 "File_upload_Record_no_data"   = "No Records";
 "File_upload_Record_uploading"   = "Uploading";

+ 3 - 3
创维盒子/双子星云手机/ja.lproj/Localizable.strings

@@ -254,10 +254,10 @@
 "my_set_no_Restore_Factory_ok_tips" = "初期化しました";
 "my_set_no_Restore_Factory_ok_msg" = "修復が完了しました。ホーム画面に戻ります。";
 "my_set_no_Restore_FactoryOK" = "わかりました";
-"my_set_no_File_upload"   = "ファイルのアップロード";
+"my_set_no_File_upload_title"   = "ファイルのアップロード";
 "my_set_no_File_upload_record"   = "アップロード履歴";
-"my_set_no_image_upload"   = "写真のアップロード";
-"my_set_no_video_upload"   = "動画のアップロード";
+"my_set_no_image_upload"   = "写真";
+"my_set_no_video_upload"   = "動画";
 "my_set_no_File_upload"   = "アップロード";
 "File_upload_Record_no_data"   = "アップロードされたデータはありません。";
 "File_upload_Record_uploading"   = "アップロード中";

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

@@ -253,10 +253,10 @@
 "my_set_no_Restore_Factory_ok_tips" = "恢复出厂设置成功";
 "my_set_no_Restore_Factory_ok_msg" = "恢复完成,将跳转到首页。";
 "my_set_no_Restore_FactoryOK" = "好的";
-"my_set_no_File_upload"   = "文件上传";
+"my_set_no_File_upload_title"   = "文件上传";
 "my_set_no_File_upload_record"   = "上传记录";
-"my_set_no_image_upload"   = "上传图片";
-"my_set_no_video_upload"   = "上传视频";
+"my_set_no_image_upload"   = "图片";
+"my_set_no_video_upload"   = "视频";
 "my_set_no_File_upload"   = "上传";
 "File_upload_Record_no_data"   = "暂无上传记录~";
 "File_upload_Record_uploading"   = "上传中";
@@ -310,3 +310,13 @@
 //1.3 新增
 "scan_Tip_title"   = "Private-X设置使用教程";
 "scan_Tip_title_button" = "扫描设备序列码";
+"set_Privacy_Tip" = "保护您的个人信息安全";
+"set_Privacy_button_title" = "去设置";
+"set_Privacy_title" = "文件备份";
+"set_Privacy_right_tip" = "备份设置";
+"set_Privacy_title_image" = "相册备份";
+"set_Privacy_title_image_open" = "备份已开启";
+"set_Privacy_title_image_close" = "备份已关闭";
+"common_open" = "开启";
+"common_close" = "关闭";
+"set_other_title" = "其他功能";

+ 3 - 3
创维盒子/双子星云手机/zh-Hant.lproj/Localizable.strings

@@ -255,10 +255,10 @@
 "my_set_no_Restore_Factory_ok_tips" = "恢復出廠設定成功";
 "my_set_no_Restore_Factory_ok_msg" = "恢復完成,將跳轉到首頁。";
 "my_set_no_Restore_FactoryOK" = "好的";
-"my_set_no_File_upload"   = "文件上傳";
+"my_set_no_File_upload_title"   = "文件上傳";
 "my_set_no_File_upload_record"   = "上傳記錄";
-"my_set_no_image_upload"   = "上傳圖片";
-"my_set_no_video_upload"   = "上傳視頻";
+"my_set_no_image_upload"   = "圖片";
+"my_set_no_video_upload"   = "視頻";
 "my_set_no_File_upload"   = "上傳";
 "File_upload_Record_no_data"   = "暫無上傳記錄";
 "File_upload_Record_uploading"   = "上傳中";