Browse Source

1.UI 验收部分bug修复

huangxiaodong 1 year ago
parent
commit
87e30cd9e2

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

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

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


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


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

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

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


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


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

@@ -82,7 +82,7 @@
     [imageBackupsBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(-10);
         make.left.mas_equalTo(10);
-        make.top.equalTo(self.navBarBGView.mas_bottom).offset(40.f);
+        make.top.equalTo(self.navBarBGView.mas_bottom).offset(16.f);
         make.height.mas_equalTo(56);
     }];
 

+ 17 - 6
创维盒子/双子星云手机/Class/Set/previewFile/view/previewToUploadFileView.m

@@ -53,8 +53,19 @@
     UIView *whiteBgView = [[UIView alloc] init];
     whiteBgView.backgroundColor = [UIColor whiteColor];
     [self addSubview:whiteBgView];
-    whiteBgView.layer.cornerRadius = 32;
-    whiteBgView.layer.masksToBounds = YES;
+//    whiteBgView.layer.cornerRadius = 12;
+//    whiteBgView.layer.masksToBounds = YES;
+    
+    /*上圆角*/
+    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_W , 180+ AdaptTabHeight)
+                                                   byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight
+                                                         cornerRadii:CGSizeMake(12, 12)];
+    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+    maskLayer.frame = CGRectMake(0, 0, SCREEN_W, 180+ AdaptTabHeight);
+    maskLayer.path = maskPath.CGPath;
+    whiteBgView.layer.mask = nil;
+    whiteBgView.layer.mask = maskLayer;
+    
     
     [whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(0);
@@ -92,8 +103,8 @@
     NSArray *titleArr = @[NSLocalizedString(@"my_set_no_image_upload",nil),
                           NSLocalizedString(@"my_set_no_video_upload",nil)];
   
-    NSArray *imageStrArr = @[@"uploadFile_image",
-                             @"uploadFile_Video"
+    NSArray *imageStrArr = @[@"uploadFile_image_bigger",
+                             @"uploadFile_Video_bigger"
                              ];
     
     CGFloat curButFullWidth = SCREEN_W/4.0;
@@ -131,8 +142,8 @@
         [imageBgView addSubview:leftImageV];
 
         [leftImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.width.mas_equalTo(25);
-            make.height.mas_equalTo(25);
+            make.width.mas_equalTo(35);
+            make.height.mas_equalTo(35);
             make.centerX.equalTo(imageBgView.mas_centerX);
             make.centerY.equalTo(imageBgView.mas_centerY).offset(0);
         }];

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

@@ -182,38 +182,51 @@
         }
     }
     
-    
-    if (row == 0){
-        
-        /*上圆角*/
+    if(_folderListArr.count == 1){
         //设置部分圆角  贝塞尔曲线
         UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_W-30 , 90)
-                                                       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 == _folderListArr.count -1){
-        //[cell.titleLabel setText:NSLocalizedString(@"File_Transfer_set_battery_level",nil)];
- 
-        //cell.titleLabel.text = @"云机名称/我的空间/XYJ";
-        
-        /*下圆角*/
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_W-30 , 90)
-                                                       byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerBottomRight
+                                                       byRoundingCorners:UIRectCornerAllCorners
                                                              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];
     }
+    else{
+        if (row == 0){
+            
+            /*上圆角*/
+            //设置部分圆角  贝塞尔曲线
+            UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_W-30 , 90)
+                                                           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 == _folderListArr.count -1){
+            //[cell.titleLabel setText:NSLocalizedString(@"File_Transfer_set_battery_level",nil)];
+     
+            //cell.titleLabel.text = @"云机名称/我的空间/XYJ";
+            
+            /*下圆角*/
+            UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_W-30 , 90)
+                                                           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];
+        }
+    }
+    
 
     KWeakSelf
     cell.didClickSwitch = ^(BOOL SwitchOn) {