Procházet zdrojové kódy

1.nas相关 部分UI修改

huangxiaodong před 1 rokem
rodič
revize
5fcb227fe5
32 změnil soubory, kde provedl 253 přidání a 234 odebrání
  1. 9 0
      创维盒子/jiSuanQi_Info.plist
  2. 2 2
      创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch
  3. binární
      创维盒子/双子星云手机/Assets.xcassets/Set/edit_select_all_h.imageset/edit_select_all_h@2x.png
  4. binární
      创维盒子/双子星云手机/Assets.xcassets/Set/edit_select_all_h.imageset/edit_select_all_h@3x.png
  5. binární
      创维盒子/双子星云手机/Assets.xcassets/Set/fileSet/add_file_icon.imageset/add_file_icon@2x.png
  6. binární
      创维盒子/双子星云手机/Assets.xcassets/Set/fileSet/add_file_icon.imageset/add_file_icon@3x.png
  7. binární
      创维盒子/双子星云手机/Assets.xcassets/Set/upload_file_check.imageset/upload_file_check@2x.png
  8. binární
      创维盒子/双子星云手机/Assets.xcassets/Set/upload_file_check.imageset/upload_file_check@3x.png
  9. binární
      创维盒子/双子星云手机/Assets.xcassets/common/common_did_check_24.imageset/common_did_check_24@2x.png
  10. binární
      创维盒子/双子星云手机/Assets.xcassets/common/common_did_check_24.imageset/common_did_check_24@3x.png
  11. binární
      创维盒子/双子星云手机/Assets.xcassets/tabbar/tabbar_nas_H.imageset/tabbar_nas_H@2x.png
  12. binární
      创维盒子/双子星云手机/Assets.xcassets/tabbar/tabbar_nas_H.imageset/tabbar_nas_H@3x.png
  13. 1 1
      创维盒子/双子星云手机/Class/Set/previewFile/shareRecordViewController.m
  14. 2 2
      创维盒子/双子星云手机/Class/Set/previewFile/view/audioPlayListViewCell.m
  15. 1 1
      创维盒子/双子星云手机/Class/Set/previewFile/view/editShareView.m
  16. 82 81
      创维盒子/双子星云手机/Class/Set/previewFile/view/editTypeBottomView.m
  17. 1 1
      创维盒子/双子星云手机/Class/Set/previewFile/view/editTypeHeadView.m
  18. 1 1
      创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/downLoadPreviewViewController.m
  19. 117 117
      创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransfeSetViewController.m
  20. 1 1
      创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransferPathCheckViewController.m
  21. 1 1
      创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/view/filePathCreatPopView.m
  22. 1 1
      创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileBottomView.m
  23. 1 1
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileRecordViewController.m
  24. 1 1
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordTableViewHeadView.m
  25. 1 1
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadImageOrVideoViewController.m
  26. 9 0
      创维盒子/双子星云手机/Info.plist
  27. 14 14
      创维盒子/双子星云手机/NAS/NASViewController.m
  28. 4 4
      创维盒子/双子星云手机/NAS/view/NASCommonUsedView.m
  29. 1 1
      创维盒子/双子星云手机/NAS/view/NASMySpaceTableViewCell.m
  30. 1 1
      创维盒子/双子星云手机/NAS/view/NASMySpaceView.m
  31. 1 1
      创维盒子/双子星云手机/NAS/view/backupsOptionTipView.m
  32. 1 1
      创维盒子/双子星云手机/NAS/view/newerGuideView.m

+ 9 - 0
创维盒子/jiSuanQi_Info.plist

@@ -89,6 +89,15 @@
 		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
+			<key>oss.sgbox.ai</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionRequiresForwardSecrecy</key>
+				<false/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
 			<key>14.18.190.138</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>

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

@@ -113,10 +113,10 @@ isBangsScreen; \
 //#define CloudService   @""
 
 //预生产环境
-//#define CloudService   @""
+#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
 
 //生产环境 1.4.3 开始使用
-#define CloudService   @"http://cloud.sgbox.ai"
+//#define CloudService   @"http://cloud.sgbox.ai"
 
 
 

binární
创维盒子/双子星云手机/Assets.xcassets/Set/edit_select_all_h.imageset/edit_select_all_h@2x.png


binární
创维盒子/双子星云手机/Assets.xcassets/Set/edit_select_all_h.imageset/edit_select_all_h@3x.png


binární
创维盒子/双子星云手机/Assets.xcassets/Set/fileSet/add_file_icon.imageset/add_file_icon@2x.png


binární
创维盒子/双子星云手机/Assets.xcassets/Set/fileSet/add_file_icon.imageset/add_file_icon@3x.png


binární
创维盒子/双子星云手机/Assets.xcassets/Set/upload_file_check.imageset/upload_file_check@2x.png


binární
创维盒子/双子星云手机/Assets.xcassets/Set/upload_file_check.imageset/upload_file_check@3x.png


binární
创维盒子/双子星云手机/Assets.xcassets/common/common_did_check_24.imageset/common_did_check_24@2x.png


binární
创维盒子/双子星云手机/Assets.xcassets/common/common_did_check_24.imageset/common_did_check_24@3x.png


binární
创维盒子/双子星云手机/Assets.xcassets/tabbar/tabbar_nas_H.imageset/tabbar_nas_H@2x.png


binární
创维盒子/双子星云手机/Assets.xcassets/tabbar/tabbar_nas_H.imageset/tabbar_nas_H@3x.png


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

@@ -159,7 +159,7 @@
     
     
     _leftCancleButton = [[UIButton alloc] init];
-    [_leftCancleButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
+    [_leftCancleButton setTitleColor:[UIColor hwColor:@"#FF9500" alpha:1.0] forState:UIControlStateNormal];
     _leftCancleButton.titleLabel.font = [UIFont systemFontOfSize:18.0];
     _leftCancleButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
     [_leftCancleButton addTarget:self action:@selector(didClickButtonFun:) forControlEvents:UIControlEventTouchUpInside];

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

@@ -194,8 +194,8 @@
     if(isPlayingType){
         _checkButton.hidden = YES;
         _playingGifView.hidden = NO;
-        [_titleLabel setTextColor:[UIColor hwColor:@"#01B7EA"]];
-        [_contentLabel setTextColor:[UIColor hwColor:@"#01B7EA"]];
+        [_titleLabel setTextColor:[UIColor hwColor:@"#FF9500"]];
+        [_contentLabel setTextColor:[UIColor hwColor:@"#FF9500"]];
     }
     else{
         _checkButton.hidden = NO;

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

@@ -185,7 +185,7 @@
     _shareNumberTF.delegate = self;
     _shareNumberTF.keyboardType = UIKeyboardTypeNumberPad;
     [_whiteBgView addSubview:_shareNumberTF];
-    [_shareNumberTF setTintColor:[UIColor hwColor:@"#01B7EA" alpha:1.0]];
+    [_shareNumberTF setTintColor:[UIColor hwColor:@"#FF9500" alpha:1.0]];
     
     [_shareNumberTF mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(_addButton.mas_left).offset(-5);

+ 82 - 81
创维盒子/双子星云手机/Class/Set/previewFile/view/editTypeBottomView.m

@@ -33,7 +33,8 @@
 
 - (void)drawAnyView{
     
-    CGFloat curButFullWidth = SCREEN_W/3.0;
+    //CGFloat curButFullWidth = SCREEN_W/3.0;
+    CGFloat curButFullWidth = SCREEN_W/2.0;
     
     _leftButton = [[UIButton alloc] init];
     [_leftButton addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
@@ -72,42 +73,42 @@
         make.centerY.equalTo(_leftButton.mas_centerY).offset(10);
     }];
     
-    _midButton = [[UIButton alloc] init];
-    [_midButton addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
-    _midButton.tag = 2;
-    [self addSubview:_midButton];
-    
-    [_midButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(curButFullWidth);
-        make.left.mas_equalTo(curButFullWidth);
-        make.height.mas_equalTo(60);
-        make.top.mas_equalTo(0);
-    }];
-    
-    _midImageV = [[UIImageView alloc] init];
-    _midImageV.image = [UIImage imageNamed:@"edit_share_icon"];
-    [_midButton addSubview:_midImageV];
-    
-    [_midImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(25);
-        make.height.mas_equalTo(25);
-        make.centerX.equalTo(_midButton.mas_centerX);
-        make.centerY.equalTo(_midButton.mas_centerY).offset(-10);
-    }];
-    
-    _midLabel = [[UILabel alloc] init];
-    _midLabel.textColor = [UIColor hwColor:@"#0A132B"];
-    _midLabel.textAlignment = NSTextAlignmentCenter;
-    _midLabel.font = [UIFont systemFontOfSize:12.0];
-    _midLabel.text = NSLocalizedString(@"common_edit_share",nil);
-    [_midButton addSubview:_midLabel];
-    
-    [_midLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(curButFullWidth);
-        make.height.mas_equalTo(25);
-        make.centerX.equalTo(_midButton.mas_centerX);
-        make.centerY.equalTo(_midButton.mas_centerY).offset(10);
-    }];
+//    _midButton = [[UIButton alloc] init];
+//    [_midButton addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+//    _midButton.tag = 2;
+//    [self addSubview:_midButton];
+//    
+//    [_midButton mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.width.mas_equalTo(curButFullWidth);
+//        make.left.mas_equalTo(curButFullWidth);
+//        make.height.mas_equalTo(60);
+//        make.top.mas_equalTo(0);
+//    }];
+//    
+//    _midImageV = [[UIImageView alloc] init];
+//    _midImageV.image = [UIImage imageNamed:@"edit_share_icon"];
+//    [_midButton addSubview:_midImageV];
+//    
+//    [_midImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.width.mas_equalTo(25);
+//        make.height.mas_equalTo(25);
+//        make.centerX.equalTo(_midButton.mas_centerX);
+//        make.centerY.equalTo(_midButton.mas_centerY).offset(-10);
+//    }];
+//    
+//    _midLabel = [[UILabel alloc] init];
+//    _midLabel.textColor = [UIColor hwColor:@"#0A132B"];
+//    _midLabel.textAlignment = NSTextAlignmentCenter;
+//    _midLabel.font = [UIFont systemFontOfSize:12.0];
+//    _midLabel.text = NSLocalizedString(@"common_edit_share",nil);
+//    [_midButton addSubview:_midLabel];
+//    
+//    [_midLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.width.mas_equalTo(curButFullWidth);
+//        make.height.mas_equalTo(25);
+//        make.centerX.equalTo(_midButton.mas_centerX);
+//        make.centerY.equalTo(_midButton.mas_centerY).offset(10);
+//    }];
     
     
     _rightButton = [[UIButton alloc] init];
@@ -184,54 +185,54 @@
     //test code
     //canShare = NO;
    
-    _midButton.hidden = !canShare;
-    
-    if(canShare){
-        CGFloat curButFullWidth = SCREEN_W/3.0;
-        [_leftButton mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.width.mas_equalTo(curButFullWidth);
-            make.left.mas_equalTo(0);
-            make.height.mas_equalTo(60);
-            make.top.mas_equalTo(0);
-        }];
-        
-        [_midButton mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.width.mas_equalTo(curButFullWidth);
-            make.left.mas_equalTo(curButFullWidth);
-            make.height.mas_equalTo(60);
-            make.top.mas_equalTo(0);
-        }];
-        
-        [_rightButton mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.width.mas_equalTo(curButFullWidth);
-            make.right.mas_equalTo(0);
-            make.height.mas_equalTo(60);
-            make.top.mas_equalTo(0);
-        }];
-    }
-    else{
-        CGFloat curButFullWidth = SCREEN_W/2.0;
-        [_leftButton mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.width.mas_equalTo(curButFullWidth);
-            make.left.mas_equalTo(0);
-            make.height.mas_equalTo(60);
-            make.top.mas_equalTo(0);
-        }];
-        
+//    _midButton.hidden = !canShare;
+//    
+//    if(canShare){
+//        CGFloat curButFullWidth = SCREEN_W/3.0;
+//        [_leftButton mas_remakeConstraints:^(MASConstraintMaker *make) {
+//            make.width.mas_equalTo(curButFullWidth);
+//            make.left.mas_equalTo(0);
+//            make.height.mas_equalTo(60);
+//            make.top.mas_equalTo(0);
+//        }];
+//        
 //        [_midButton mas_remakeConstraints:^(MASConstraintMaker *make) {
 //            make.width.mas_equalTo(curButFullWidth);
 //            make.left.mas_equalTo(curButFullWidth);
 //            make.height.mas_equalTo(60);
 //            make.top.mas_equalTo(0);
 //        }];
-        
-        [_rightButton mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.width.mas_equalTo(curButFullWidth);
-            make.right.mas_equalTo(0);
-            make.height.mas_equalTo(60);
-            make.top.mas_equalTo(0);
-        }];
-    }
+//        
+//        [_rightButton mas_remakeConstraints:^(MASConstraintMaker *make) {
+//            make.width.mas_equalTo(curButFullWidth);
+//            make.right.mas_equalTo(0);
+//            make.height.mas_equalTo(60);
+//            make.top.mas_equalTo(0);
+//        }];
+//    }
+//    else{
+//        CGFloat curButFullWidth = SCREEN_W/2.0;
+//        [_leftButton mas_remakeConstraints:^(MASConstraintMaker *make) {
+//            make.width.mas_equalTo(curButFullWidth);
+//            make.left.mas_equalTo(0);
+//            make.height.mas_equalTo(60);
+//            make.top.mas_equalTo(0);
+//        }];
+//        
+////        [_midButton mas_remakeConstraints:^(MASConstraintMaker *make) {
+////            make.width.mas_equalTo(curButFullWidth);
+////            make.left.mas_equalTo(curButFullWidth);
+////            make.height.mas_equalTo(60);
+////            make.top.mas_equalTo(0);
+////        }];
+//        
+//        [_rightButton mas_remakeConstraints:^(MASConstraintMaker *make) {
+//            make.width.mas_equalTo(curButFullWidth);
+//            make.right.mas_equalTo(0);
+//            make.height.mas_equalTo(60);
+//            make.top.mas_equalTo(0);
+//        }];
+//    }
 }
 
 - (void)setIsBlackType:(BOOL)isBlackType
@@ -259,8 +260,8 @@
         _leftImageV.image = [UIImage imageNamed:@"edit_download_white_icon"];
         _leftLabel.textColor = [UIColor whiteColor];
         
-        _midImageV.image = [UIImage imageNamed:@"edit_share_white_icon"];
-        _midLabel.textColor = [UIColor whiteColor];
+//        _midImageV.image = [UIImage imageNamed:@"edit_share_white_icon"];
+//        _midLabel.textColor = [UIColor whiteColor];
         
         _rightImageV.image = [UIImage imageNamed:@"edit_del_white_icon"];
         _rightLabel.textColor = [UIColor whiteColor];

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

@@ -25,7 +25,7 @@
 - (void)drawAnyView{
     
     _leftButton = [[UIButton alloc] init];
-    [_leftButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
+    [_leftButton setTitleColor:[UIColor hwColor:@"#FF9500" alpha:1.0] forState:UIControlStateNormal];
     _leftButton.titleLabel.font = [UIFont systemFontOfSize:18.0];
     _leftButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
     [_leftButton addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/downLoadPreviewViewController.m

@@ -141,7 +141,7 @@
     [_rightButton setTitle:NSLocalizedString(@"File_upload_Record_select_all",nil) forState:UIControlStateNormal];
     [_rightButton setTitle:NSLocalizedString(@"File_upload_cancel_select_all",nil) forState:UIControlStateSelected];
     
-    [_rightButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
+    [_rightButton setTitleColor:[UIColor hwColor:@"#FF9500" alpha:1.0] forState:UIControlStateNormal];
     _rightButton.titleLabel.font = [UIFont systemFontOfSize:16.0];
     _rightButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
     [_rightButton addTarget:self action:@selector(didClickSelectAllButton:) forControlEvents:UIControlEventTouchUpInside];

+ 117 - 117
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransfeSetViewController.m

@@ -151,120 +151,120 @@
         [self setUploadFilePathLabelTitleFun];
         
         //相册备份设置
-        UIView *tailBgView2 = [[UIView alloc] init];
-        tailBgView2.backgroundColor = [UIColor whiteColor];
-        tailBgView2.layer.cornerRadius = 8;
-        tailBgView2.tag = 2;
-        [_tailView addSubview:tailBgView2];
-        
-        UITapGestureRecognizer *tap2 = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didClickTailViewFun:)];
-        [tailBgView2 addGestureRecognizer:tap2];
-        
-        [tailBgView2 mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(15);
-            make.right.mas_equalTo(-15);
-            make.height.mas_equalTo(90);
-            make.top.mas_equalTo(tailBgView.mas_bottom).offset(15.0);
-        }];
-        
-        UILabel *titleLab2 = [[UILabel alloc] init];
-        titleLab2.text = NSLocalizedString(@"File_backups_path_set",nil);
-        titleLab2.font = [UIFont boldSystemFontOfSize:14.0];
-        titleLab2.textColor = [UIColor hwColor:@"#0A132B" alpha:1.0];
-        [tailBgView2 addSubview:titleLab2];
-        
-        [titleLab2 mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(10);
-            make.right.mas_equalTo(-50);
-            make.height.mas_equalTo(20);
-            make.top.mas_equalTo(20);
-        }];
-        
-        /*右侧箭头*/
-        UIImageView *rightImage2 = [[UIImageView alloc] init];
-        [rightImage2 setBackgroundColor:[UIColor clearColor]];
-        [rightImage2 setImage:[UIImage imageNamed:@"cell_right_access"]];
-        [tailBgView2 addSubview:rightImage2];
-        [rightImage2 mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.width.mas_equalTo(28);
-            make.right.mas_equalTo(-15.f);
-            make.height.mas_equalTo(28);
-            make.centerY.equalTo(titleLab2.mas_centerY);
-        }];
-        
-        _backupsFilePathLabel=[[UILabel alloc] init];
-        //titleLab.text = NSLocalizedString(@"File_upload_path_set",nil);
-        _backupsFilePathLabel.font = [UIFont systemFontOfSize:12.0];
-        _backupsFilePathLabel.textColor = [UIColor hwColor:@"#6A6A6A" alpha:1.0];
-        _backupsFilePathLabel.numberOfLines = 0;
-        [tailBgView2 addSubview:_backupsFilePathLabel];
-        
-        [_backupsFilePathLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(15);
-            make.right.mas_equalTo(-15);
-            make.bottom.mas_equalTo(-10);
-            make.top.mas_equalTo(titleLab2.mas_bottom).offset(10.0);
-        }];
-        
-        [self setBackupsFilePathLabelTitleFun];
-        
-        ////相册备份设置
-        UIView *tailBgView3 = [[UIView alloc] init];
-        tailBgView3.backgroundColor = [UIColor whiteColor];
-        tailBgView3.layer.cornerRadius = 8;
-        tailBgView3.tag = 3;
-        [_tailView addSubview:tailBgView3];
-        
-        UITapGestureRecognizer *tap3 = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didClickTailViewFun:)];
-        [tailBgView3 addGestureRecognizer:tap3];
-        
-        [tailBgView3 mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(15);
-            make.right.mas_equalTo(-15);
-            make.height.mas_equalTo(90);
-            make.top.mas_equalTo(tailBgView2.mas_bottom).offset(15.0);
-        }];
-        
-        UILabel *titleLab3 = [[UILabel alloc] init];
-        titleLab3.text = NSLocalizedString(@"File_save_to_box_path_set",nil);
-        titleLab3.font = [UIFont boldSystemFontOfSize:14.0];
-        titleLab3.textColor = [UIColor hwColor:@"#0A132B" alpha:1.0];
-        [tailBgView3 addSubview:titleLab3];
-        
-        [titleLab3 mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(10);
-            make.right.mas_equalTo(-50);
-            make.height.mas_equalTo(20);
-            make.top.mas_equalTo(20);
-        }];
-        
-        /*右侧箭头*/
-        UIImageView *rightImage3 = [[UIImageView alloc] init];
-        [rightImage3 setBackgroundColor:[UIColor clearColor]];
-        [rightImage3 setImage:[UIImage imageNamed:@"cell_right_access"]];
-        [tailBgView3 addSubview:rightImage3];
-        [rightImage3 mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.width.mas_equalTo(28);
-            make.right.mas_equalTo(-15.f);
-            make.height.mas_equalTo(28);
-            make.centerY.equalTo(titleLab3.mas_centerY);
-        }];
-        
-        _saveBoxFilePathLabel=[[UILabel alloc] init];
-        //titleLab.text = NSLocalizedString(@"File_upload_path_set",nil);
-        _saveBoxFilePathLabel.font = [UIFont systemFontOfSize:12.0];
-        _saveBoxFilePathLabel.textColor = [UIColor hwColor:@"#6A6A6A" alpha:1.0];
-        _saveBoxFilePathLabel.numberOfLines = 0;
-        [tailBgView3 addSubview:_saveBoxFilePathLabel];
-        
-        [_saveBoxFilePathLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(15);
-            make.right.mas_equalTo(-15);
-            make.bottom.mas_equalTo(-10);
-            make.top.mas_equalTo(titleLab3.mas_bottom).offset(10.0);
-        }];
-        
-        [self setSaveFileToBoxPathLabelTitleFun];
+//        UIView *tailBgView2 = [[UIView alloc] init];
+//        tailBgView2.backgroundColor = [UIColor whiteColor];
+//        tailBgView2.layer.cornerRadius = 8;
+//        tailBgView2.tag = 2;
+//        [_tailView addSubview:tailBgView2];
+//        
+//        UITapGestureRecognizer *tap2 = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didClickTailViewFun:)];
+//        [tailBgView2 addGestureRecognizer:tap2];
+//        
+//        [tailBgView2 mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.left.mas_equalTo(15);
+//            make.right.mas_equalTo(-15);
+//            make.height.mas_equalTo(90);
+//            make.top.mas_equalTo(tailBgView.mas_bottom).offset(15.0);
+//        }];
+//        
+//        UILabel *titleLab2 = [[UILabel alloc] init];
+//        titleLab2.text = NSLocalizedString(@"File_backups_path_set",nil);
+//        titleLab2.font = [UIFont boldSystemFontOfSize:14.0];
+//        titleLab2.textColor = [UIColor hwColor:@"#0A132B" alpha:1.0];
+//        [tailBgView2 addSubview:titleLab2];
+//        
+//        [titleLab2 mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.left.mas_equalTo(10);
+//            make.right.mas_equalTo(-50);
+//            make.height.mas_equalTo(20);
+//            make.top.mas_equalTo(20);
+//        }];
+//        
+//        /*右侧箭头*/
+//        UIImageView *rightImage2 = [[UIImageView alloc] init];
+//        [rightImage2 setBackgroundColor:[UIColor clearColor]];
+//        [rightImage2 setImage:[UIImage imageNamed:@"cell_right_access"]];
+//        [tailBgView2 addSubview:rightImage2];
+//        [rightImage2 mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.width.mas_equalTo(28);
+//            make.right.mas_equalTo(-15.f);
+//            make.height.mas_equalTo(28);
+//            make.centerY.equalTo(titleLab2.mas_centerY);
+//        }];
+//        
+//        _backupsFilePathLabel=[[UILabel alloc] init];
+//        //titleLab.text = NSLocalizedString(@"File_upload_path_set",nil);
+//        _backupsFilePathLabel.font = [UIFont systemFontOfSize:12.0];
+//        _backupsFilePathLabel.textColor = [UIColor hwColor:@"#6A6A6A" alpha:1.0];
+//        _backupsFilePathLabel.numberOfLines = 0;
+//        [tailBgView2 addSubview:_backupsFilePathLabel];
+//        
+//        [_backupsFilePathLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.left.mas_equalTo(15);
+//            make.right.mas_equalTo(-15);
+//            make.bottom.mas_equalTo(-10);
+//            make.top.mas_equalTo(titleLab2.mas_bottom).offset(10.0);
+//        }];
+//        
+//        [self setBackupsFilePathLabelTitleFun];
+//        
+//        ////相册备份设置
+//        UIView *tailBgView3 = [[UIView alloc] init];
+//        tailBgView3.backgroundColor = [UIColor whiteColor];
+//        tailBgView3.layer.cornerRadius = 8;
+//        tailBgView3.tag = 3;
+//        [_tailView addSubview:tailBgView3];
+//        
+//        UITapGestureRecognizer *tap3 = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didClickTailViewFun:)];
+//        [tailBgView3 addGestureRecognizer:tap3];
+//        
+//        [tailBgView3 mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.left.mas_equalTo(15);
+//            make.right.mas_equalTo(-15);
+//            make.height.mas_equalTo(90);
+//            make.top.mas_equalTo(tailBgView2.mas_bottom).offset(15.0);
+//        }];
+//        
+//        UILabel *titleLab3 = [[UILabel alloc] init];
+//        titleLab3.text = NSLocalizedString(@"File_save_to_box_path_set",nil);
+//        titleLab3.font = [UIFont boldSystemFontOfSize:14.0];
+//        titleLab3.textColor = [UIColor hwColor:@"#0A132B" alpha:1.0];
+//        [tailBgView3 addSubview:titleLab3];
+//        
+//        [titleLab3 mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.left.mas_equalTo(10);
+//            make.right.mas_equalTo(-50);
+//            make.height.mas_equalTo(20);
+//            make.top.mas_equalTo(20);
+//        }];
+//        
+//        /*右侧箭头*/
+//        UIImageView *rightImage3 = [[UIImageView alloc] init];
+//        [rightImage3 setBackgroundColor:[UIColor clearColor]];
+//        [rightImage3 setImage:[UIImage imageNamed:@"cell_right_access"]];
+//        [tailBgView3 addSubview:rightImage3];
+//        [rightImage3 mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.width.mas_equalTo(28);
+//            make.right.mas_equalTo(-15.f);
+//            make.height.mas_equalTo(28);
+//            make.centerY.equalTo(titleLab3.mas_centerY);
+//        }];
+//        
+//        _saveBoxFilePathLabel=[[UILabel alloc] init];
+//        //titleLab.text = NSLocalizedString(@"File_upload_path_set",nil);
+//        _saveBoxFilePathLabel.font = [UIFont systemFontOfSize:12.0];
+//        _saveBoxFilePathLabel.textColor = [UIColor hwColor:@"#6A6A6A" alpha:1.0];
+//        _saveBoxFilePathLabel.numberOfLines = 0;
+//        [tailBgView3 addSubview:_saveBoxFilePathLabel];
+//        
+//        [_saveBoxFilePathLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.left.mas_equalTo(15);
+//            make.right.mas_equalTo(-15);
+//            make.bottom.mas_equalTo(-10);
+//            make.top.mas_equalTo(titleLab3.mas_bottom).offset(10.0);
+//        }];
+//        
+//        [self setSaveFileToBoxPathLabelTitleFun];
     }
     
     return _tailView;
@@ -289,7 +289,7 @@
     NSMutableAttributedString *noteStr = [[NSMutableAttributedString alloc] initWithString:totalStr];
     
     NSRange redRange = NSMakeRange([totalStr rangeOfString:rightStr].location, [totalStr rangeOfString:rightStr].length);
-    [noteStr addAttribute:NSForegroundColorAttributeName value:[UIColor hwColor:@"#01B7EA" alpha:0.8] range:redRange];
+    [noteStr addAttribute:NSForegroundColorAttributeName value:[UIColor hwColor:@"#FF9500" alpha:0.8] range:redRange];
     [noteStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12.0] range:redRange];
     // 设置行间距
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
@@ -320,7 +320,7 @@
     NSMutableAttributedString *noteStr = [[NSMutableAttributedString alloc] initWithString:totalStr];
     
     NSRange redRange = NSMakeRange([totalStr rangeOfString:rightStr].location, [totalStr rangeOfString:rightStr].length);
-    [noteStr addAttribute:NSForegroundColorAttributeName value:[UIColor hwColor:@"#01B7EA" alpha:0.8] range:redRange];
+    [noteStr addAttribute:NSForegroundColorAttributeName value:[UIColor hwColor:@"#FF9500" alpha:0.8] range:redRange];
     [noteStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12.0] range:redRange];
     // 设置行间距
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
@@ -352,7 +352,7 @@
     NSMutableAttributedString *noteStr = [[NSMutableAttributedString alloc] initWithString:totalStr];
     
     NSRange redRange = NSMakeRange([totalStr rangeOfString:rightStr].location, [totalStr rangeOfString:rightStr].length);
-    [noteStr addAttribute:NSForegroundColorAttributeName value:[UIColor hwColor:@"#01B7EA" alpha:0.8] range:redRange];
+    [noteStr addAttribute:NSForegroundColorAttributeName value:[UIColor hwColor:@"#FF9500" alpha:0.8] range:redRange];
     [noteStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12.0] range:redRange];
     // 设置行间距
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransferPathCheckViewController.m

@@ -80,7 +80,7 @@
     
     UIButton* rightButton = [[UIButton alloc] init];
     [rightButton setTitle:NSLocalizedString(@"File_upload_path_new",nil)  forState:UIControlStateNormal];
-    [rightButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
+    [rightButton setTitleColor:[UIColor hwColor:@"#FF9500" alpha:1.0] forState:UIControlStateNormal];
     rightButton.titleLabel.font = [UIFont systemFontOfSize:18.0];
     rightButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
     [rightButton addTarget:self action:@selector(didiClikRightButFun:) forControlEvents:UIControlEventTouchUpInside];

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

@@ -113,7 +113,7 @@
     filePathNameTF.delegate = self;
     filePathNameTF.returnKeyType = UIReturnKeyDone;
     [whiteBgView addSubview:filePathNameTF];
-    [filePathNameTF setTintColor:[UIColor hwColor:@"#01B7EA" alpha:1.0]];
+    [filePathNameTF setTintColor:[UIColor hwColor:@"#FF9500" alpha:1.0]];
     
     UIView *leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 1)];
     filePathNameTF.leftView = leftView;

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileBottomView.m

@@ -48,7 +48,7 @@
     _uploadFileRoutelabel = [[UILabel alloc] init];
     //_uploadFileRoutelabel.font = [UIFont systemFontOfSize:14.0];
     //_uploadFileRoutelabel.textColor = [UIColor hwColor:@"#959799" alpha:1.0];
-    _uploadFileRoutelabel.textColor =[UIColor hwColor:@"#01B7EA" alpha:1.0];
+    _uploadFileRoutelabel.textColor =[UIColor hwColor:@"#FF9500" alpha:1.0];
     [self addSubview:_uploadFileRoutelabel];
     _uploadFileRoutelabel.adjustsFontSizeToFitWidth = YES;
     

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

@@ -349,7 +349,7 @@
 
   
     _leftButton = [[UIButton alloc] init];
-    [_leftButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
+    [_leftButton setTitleColor:[UIColor hwColor:@"#FF9500" alpha:1.0] forState:UIControlStateNormal];
     _leftButton.titleLabel.font = [UIFont systemFontOfSize:18.0];
     _leftButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
     [_leftButton addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordTableViewHeadView.m

@@ -33,7 +33,7 @@
     }];
     
     _rightButton = [[UIButton alloc] init];
-    [_rightButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
+    [_rightButton setTitleColor:[UIColor hwColor:@"#FF9500" alpha:1.0] forState:UIControlStateNormal];
     _rightButton.titleLabel.font = [UIFont systemFontOfSize:12.0];
     _rightButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
     [_rightButton addTarget:self action:@selector(didiClikButFun:) forControlEvents:UIControlEventTouchUpInside];

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

@@ -125,7 +125,7 @@
     UIButton *rightBut = [[UIButton alloc] init];
     [rightBut setTitle:NSLocalizedString(@"File_upload_Record_select_all",nil) forState:UIControlStateNormal];
     [rightBut setTitle:NSLocalizedString(@"File_upload_cancel_select_all",nil) forState:UIControlStateSelected];
-    [rightBut setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
+    [rightBut setTitleColor:[UIColor hwColor:@"#FF9500" alpha:1.0] forState:UIControlStateNormal];
     rightBut.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
     [rightBut addTarget:self action:@selector(didClickSelectAllButton:) forControlEvents:UIControlEventTouchUpInside];
     

+ 9 - 0
创维盒子/双子星云手机/Info.plist

@@ -97,6 +97,15 @@
 		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
+			<key>oss.sgbox.ai</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSExceptionRequiresForwardSecrecy</key>
+				<false/>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
 			<key>14.18.190.138</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>

+ 14 - 14
创维盒子/双子星云手机/NAS/NASViewController.m

@@ -550,12 +550,12 @@
     
     switch (tag)
     {
-        case 10:{
-            backupsOptionViewController *vc = [backupsOptionViewController new];
-            [self pushViewController:vc animated:YES];
-        }
-            break;
-        case 11:
+//        case 10:{
+//            backupsOptionViewController *vc = [backupsOptionViewController new];
+//            [self pushViewController:vc animated:YES];
+//        }
+//            break;
+        case 10:
         {
 //                if(!ksharedAppDelegate.isWebSockLinkOKAginType){
 //                    [[iToast makeText:NSLocalizedString(@"check_could_phone_state",nil)] show];
@@ -566,13 +566,13 @@
                 [self pushViewController:nextVC animated:YES];
             }
             break;
-        case 12:{
-            shareRecordViewController *vc = [shareRecordViewController new];
-            [self pushViewController:vc animated:YES];
-            [self.NASCommonUsedV setRedPointShow:NO];
-            [self updateShareBeMarkFun];
-        }
-            break;
+//        case 12:{
+//            shareRecordViewController *vc = [shareRecordViewController new];
+//            [self pushViewController:vc animated:YES];
+//            [self.NASCommonUsedV setRedPointShow:NO];
+//            [self updateShareBeMarkFun];
+//        }
+//            break;
        
         default:
             break;
@@ -693,7 +693,7 @@
     [self getLastFileDataFun];
     
     //[self queryShareSwitchFunFun];
-    [self queryShareBeMarkFun];
+    //[self queryShareBeMarkFun];
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self checkFileTransferTask];

+ 4 - 4
创维盒子/双子星云手机/NAS/view/NASCommonUsedView.m

@@ -57,15 +57,15 @@
     }];
 
     
-    NSArray *titleArr = @[NSLocalizedString(@"my_set_no_File_backups",nil),
+    NSArray *titleArr = @[//NSLocalizedString(@"my_set_no_File_backups",nil),
                           NSLocalizedString(@"set_file_Transfer_WWAN_title2",nil),
-                          NSLocalizedString(@"my_set_no_share2",nil)
+                          //NSLocalizedString(@"my_set_no_share2",nil)
                           //,NSLocalizedString(@"my_set_no_share",nil)
     ];
     
-    NSArray *imageArr = @[@"nas_backups_icon",
+    NSArray *imageArr = @[//@"nas_backups_icon",
                           @"nas_set_icon",
-                          @"nas_share_icon"
+                          //@"nas_share_icon"
                           //,@"nas_share_icon"
     ];
     

+ 1 - 1
创维盒子/双子星云手机/NAS/view/NASMySpaceTableViewCell.m

@@ -101,7 +101,7 @@
     _glayer = [CAGradientLayer layer];
     _glayer.startPoint = CGPointMake(0, 0.5);
     _glayer.endPoint = CGPointMake(1, 0.5);
-    _glayer.colors = @[(__bridge id)[UIColor hwColor:@"#0BDDFD" alpha:1.0].CGColor, (__bridge id)[UIColor hwColor:@"#048CFB" alpha:1.0].CGColor];
+    _glayer.colors = @[(__bridge id)[UIColor hwColor:@"#FFD315" alpha:1.0].CGColor, (__bridge id)[UIColor hwColor:@"#FFD315" alpha:1.0].CGColor];
     _glayer.locations = @[@(0), @(1.0f)];
     [_progressSelectView.layer addSublayer:_glayer];
     

+ 1 - 1
创维盒子/双子星云手机/NAS/view/NASMySpaceView.m

@@ -94,7 +94,7 @@
     _glayer = [CAGradientLayer layer];
     _glayer.startPoint = CGPointMake(0, 0.5);
     _glayer.endPoint = CGPointMake(0.97, 0.5);
-    _glayer.colors = @[(__bridge id)[UIColor hwColor:@"#0CDEFD" alpha:1.0].CGColor, (__bridge id)[UIColor hwColor:@"#058DFB" alpha:1.0].CGColor];
+    _glayer.colors = @[(__bridge id)[UIColor hwColor:@"#FFD315" alpha:1.0].CGColor, (__bridge id)[UIColor hwColor:@"#FFD315" alpha:1.0].CGColor];
     _glayer.locations = @[@(0), @(1.0f)];
     [_progressSelectView.layer addSublayer:_glayer];
     

+ 1 - 1
创维盒子/双子星云手机/NAS/view/backupsOptionTipView.m

@@ -84,7 +84,7 @@
     [attrStr addAttribute:NSForegroundColorAttributeName value:[UIColor hwColor:@"#151515" alpha:0.5] range:NSMakeRange(0, attrStr.length)];
     
     NSRange redRange = NSMakeRange([fullTitle rangeOfString:title3].location, [fullTitle rangeOfString:title3].length);
-    UIColor *noteColor =[UIColor hwColor:@"#01B7EA" alpha:1.0];
+    UIColor *noteColor =[UIColor hwColor:@"#FF9500" alpha:1.0];
     [attrStr addAttribute:NSForegroundColorAttributeName value:noteColor range:redRange];
     [attrStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:14.0] range:NSMakeRange(0, attrStr.length)];
     

+ 1 - 1
创维盒子/双子星云手机/NAS/view/newerGuideView.m

@@ -128,7 +128,7 @@
     
     NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:fullTitle];
     NSRange redRange = NSMakeRange([fullTitle rangeOfString:title2].location, [fullTitle rangeOfString:title2].length);
-    UIColor *noteColor =[UIColor hwColor:@"#01B7EA" alpha:1.0];
+    UIColor *noteColor =[UIColor hwColor:@"#FF9500" alpha:1.0];
     [attrStr addAttribute:NSForegroundColorAttributeName value:noteColor range:redRange];
     [attrStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:14.0] range:NSMakeRange(0, attrStr.length)];