Pārlūkot izejas kodu

1、我的空间二级页面去掉可用容量。位置调整为左边展示已使用容量,右边展示总空间容量。

huangxiaodong 1 gadu atpakaļ
vecāks
revīzija
7bf9ba3125

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

@@ -17,7 +17,7 @@
 
 @property(nonatomic,strong) UILabel *totalLabel;
 @property(nonatomic,strong) UILabel *usedlabel;
-@property(nonatomic,strong) UILabel *unuselabel;
+//@property(nonatomic,strong) UILabel *unuselabel;
 
 @end
 
@@ -106,16 +106,17 @@
     [_progressSelectView.layer addSublayer:_glayer];
     
     
-    CGFloat butWidth = (SCREEN_W - 16*2 - 16*2)/3.0;
+    CGFloat butWidth = (SCREEN_W - 16*2 - 16*2)/2.0;
     
     _totalLabel = [[UILabel alloc] init];
     _totalLabel.font = [UIFont systemFontOfSize:12.0];
     _totalLabel.textColor = [UIColor hwColor:@"#818CA2"];
     //_fileNamelabel.backgroundColor = [UIColor greenColor];
+    _totalLabel.textAlignment = NSTextAlignmentRight;
     [whiteBgView addSubview:_totalLabel];
     
     [_totalLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(16);
+        make.right.mas_equalTo(-16);
         make.width.mas_equalTo(butWidth);
         make.top.mas_equalTo(_progressBgView.mas_bottom).offset(10);
     }];
@@ -123,28 +124,29 @@
     _usedlabel = [[UILabel alloc] init];
     _usedlabel.font = [UIFont systemFontOfSize:12.0];
     _usedlabel.textColor = [UIColor hwColor:@"#818CA2"];
-    _usedlabel.textAlignment = NSTextAlignmentCenter;
+    //_usedlabel.textAlignment = NSTextAlignmentCenter;
     //_usedlabel.backgroundColor = [UIColor greenColor];
     [whiteBgView addSubview:_usedlabel];
     
     [_usedlabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(_totalLabel.mas_right);
+        //make.left.mas_equalTo(_totalLabel.mas_right);
+        make.left.mas_equalTo(16);
         make.width.mas_equalTo(butWidth);
         make.top.mas_equalTo(_progressBgView.mas_bottom).offset(10);
     }];
     
-    _unuselabel = [[UILabel alloc] init];
-    _unuselabel.font = [UIFont systemFontOfSize:12.0];
-    _unuselabel.textColor = [UIColor hwColor:@"#818CA2"];
-    _unuselabel.textAlignment = NSTextAlignmentRight;
-    //_unuselabel.backgroundColor = [UIColor greenColor];
-    [whiteBgView addSubview:_unuselabel];
-    
-    [_unuselabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_equalTo(-13);
-        make.width.mas_equalTo(butWidth);
-        make.top.mas_equalTo(_progressBgView.mas_bottom).offset(10);
-    }];
+//    _unuselabel = [[UILabel alloc] init];
+//    _unuselabel.font = [UIFont systemFontOfSize:12.0];
+//    _unuselabel.textColor = [UIColor hwColor:@"#818CA2"];
+//    _unuselabel.textAlignment = NSTextAlignmentRight;
+//    //_unuselabel.backgroundColor = [UIColor greenColor];
+//    [whiteBgView addSubview:_unuselabel];
+//    
+//    [_unuselabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.right.mas_equalTo(-13);
+//        make.width.mas_equalTo(butWidth);
+//        make.top.mas_equalTo(_progressBgView.mas_bottom).offset(10);
+//    }];
     
 }
 
@@ -206,12 +208,12 @@
     }
     _usedlabel.text = usedStr;
     
-    NSString *unusedStr  = [[NSString alloc] initWithFormat:@"%@%.2fGB",NSLocalizedString(@"NAS_disk_unuse_Space",nil),extraAvableSizeF];
-    if(extraAvableSizeF > 1024){
-        extraAvableSizeF = extraAvableSizeF/1024.0;
-        unusedStr  = [[NSString alloc] initWithFormat:@"%@%.2fTB",NSLocalizedString(@"NAS_disk_unuse_Space",nil),extraAvableSizeF];
-    }
-    _unuselabel.text = unusedStr;
+//    NSString *unusedStr  = [[NSString alloc] initWithFormat:@"%@%.2fGB",NSLocalizedString(@"NAS_disk_unuse_Space",nil),extraAvableSizeF];
+//    if(extraAvableSizeF > 1024){
+//        extraAvableSizeF = extraAvableSizeF/1024.0;
+//        unusedStr  = [[NSString alloc] initWithFormat:@"%@%.2fTB",NSLocalizedString(@"NAS_disk_unuse_Space",nil),extraAvableSizeF];
+//    }
+//    _unuselabel.text = unusedStr;
 
 }
 @end