1.分享详情UI修改

创维盒子/双子星云手机/Class/Set/previewFile/shareRecordDetailsHWViewController.m

@@ -15,6 +15,7 @@
 @property (nonatomic,strong)UIButton*checkShareLinkButton;
 @property (nonatomic,strong)UIView *extractCodeBgView;
 @property (nonatomic,strong)UILabel *extractCodeTip2Lab;
+@property (nonatomic,strong)UIView *shareEndDateBgView;
 @property (nonatomic,strong)UILabel *shareEndDateLabel;
 
 @property (nonatomic,strong)UIButton*cancelShareLinkButton;
@@ -152,13 +153,13 @@
     
     UILabel *extractCodeTipLab = [[UILabel alloc] init];
     extractCodeTipLab.font = [UIFont systemFontOfSize:14.f];
-    [extractCodeTipLab setTextColor:HW0A132BColor];
+    [extractCodeTipLab setTextColor:[UIColor hwColor:@"#999999"]];
     extractCodeTipLab.text =  NSLocalizedString(@"share_Extract_code_tip",nil);
     [_extractCodeBgView addSubview:extractCodeTipLab];
     
     [extractCodeTipLab mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(15);
-        make.right.mas_equalTo(_extractCodeBgView.mas_centerX);
+        make.width.mas_equalTo(80);
         make.top.mas_equalTo(0);
         make.bottom.mas_equalTo(0);
     }];
@@ -166,31 +167,63 @@
     _extractCodeTip2Lab = [[UILabel alloc] init];
     _extractCodeTip2Lab.font = [UIFont systemFontOfSize:14.f];
     //[_extractCodeTip2Lab setTextAlignment:(NSTextAlignmentRight)];
-    [_extractCodeTip2Lab setTextAlignment:(NSTextAlignmentCenter)];
+    //[_extractCodeTip2Lab setTextAlignment:(NSTextAlignmentCenter)];
     [_extractCodeTip2Lab setTextColor:[UIColor hwColor:@"#01B7EA" alpha:1.0]];
     [_extractCodeBgView addSubview:_extractCodeTip2Lab];
     //extractCodeTip2Lab.text = _addShareMod.data.extractionCode;
     
+    //_extractCodeTip2Lab.backgroundColor = [UIColor redColor];
+    
     [_extractCodeTip2Lab mas_makeConstraints:^(MASConstraintMaker *make) {
-        //make.left.mas_equalTo(extractCodeTipLab.mas_right);
-        make.left.mas_equalTo(20);
+        make.left.mas_equalTo(extractCodeTipLab.mas_right);
         make.right.mas_equalTo(-20);
         make.top.mas_equalTo(0);
         make.bottom.mas_equalTo(0);
     }];
     
+    
+    //失效日期
+    _shareEndDateBgView = [[UIView alloc] init];
+    _shareEndDateBgView.backgroundColor = [UIColor hwColor:@"#F9F9F9"];
+    [_whiteBgView addSubview:_shareEndDateBgView];
+    _shareEndDateBgView.layer.cornerRadius = 8;
+    _shareEndDateBgView.layer.masksToBounds = YES;
+    
+    [_shareEndDateBgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(50);
+        make.right.mas_equalTo(-50);
+        make.top.equalTo(_extractCodeBgView.mas_bottom).offset(15);
+        make.height.mas_equalTo(40);
+    }];
+    
+    //失效时间
+    UILabel *shareEndDateTipLab = [[UILabel alloc] init];
+    shareEndDateTipLab.font = [UIFont systemFontOfSize:14.f];
+    [shareEndDateTipLab setTextColor:[UIColor hwColor:@"#999999"]];
+    shareEndDateTipLab.text =  NSLocalizedString(@"copy_share_link_Invalid_tip3",nil);
+    [_shareEndDateBgView addSubview:shareEndDateTipLab];
+    
+    [shareEndDateTipLab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(15);
+        make.width.mas_equalTo(80);
+        make.top.mas_equalTo(0);
+        make.bottom.mas_equalTo(0);
+    }];
+    
+
     _shareEndDateLabel = [[UILabel alloc] init];
     //_shareEndDateLabel.text = @"2024/04/25 19:45";
-    _shareEndDateLabel.textAlignment = NSTextAlignmentCenter;
+    //_shareEndDateLabel.textAlignment = NSTextAlignmentCenter;
     _shareEndDateLabel.textColor = HW0A132BColor;
     _shareEndDateLabel.font = [UIFont systemFontOfSize:14.0];
-    [_whiteBgView addSubview:_shareEndDateLabel];
+    [_shareEndDateBgView addSubview:_shareEndDateLabel];
+    //_shareEndDateLabel.backgroundColor = [UIColor greenColor];
     
     [_shareEndDateLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(_extractCodeBgView.mas_bottom).offset(15.f);
-        make.left.mas_equalTo(15);
-        make.right.mas_equalTo(-15);
-        make.height.mas_equalTo(15);
+        make.left.mas_equalTo(shareEndDateTipLab.mas_right);
+        make.right.mas_equalTo(-20);
+        make.top.mas_equalTo(0);
+        make.bottom.mas_equalTo(0);
     }];
     
     CGFloat shareButW = (SCREEN_W - 20 -20 -15)/2.0;
@@ -305,8 +338,7 @@
         }
         else{
             //失效时间
-            NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip3",nil);
-            _shareEndDateLabel.text = [[NSString alloc] initWithFormat:@"%@: %@",tipStr,_dataModel.expirationTime];
+            _shareEndDateLabel.text = _dataModel.expirationTime;
         }
     }
     else{
@@ -314,9 +346,9 @@
         _shareLinkCopyButton.hidden = YES;
         
         //失效时间
-        NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip3",nil);
         NSString *tipStr2 = NSLocalizedString(@"copy_share_link_Invalid_tip",nil);
-        _shareEndDateLabel.text = [[NSString alloc] initWithFormat:@"%@: %@",tipStr,tipStr2];
+        _shareEndDateLabel.text = tipStr2;
+        _shareEndDateLabel.textColor = [UIColor hwColor:@"#DD4E4E"];
     }
     
     
@@ -347,11 +379,11 @@
         
         _extractCodeBgView.hidden = NO;
         
-        [_shareEndDateLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(_extractCodeBgView.mas_bottom).offset(15.f);
-            make.left.mas_equalTo(15);
-            make.right.mas_equalTo(-15);
-            make.height.mas_equalTo(15);
+        [_shareEndDateBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(50);
+            make.right.mas_equalTo(-50);
+            make.top.equalTo(_extractCodeBgView.mas_bottom).offset(15);
+            make.height.mas_equalTo(40);
         }];
     }
     else{
@@ -365,11 +397,11 @@
         
         _extractCodeBgView.hidden = YES;
         
-        [_shareEndDateLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(_checkShareLinkButton.mas_bottom).offset(15.f);
-            make.left.mas_equalTo(15);
-            make.right.mas_equalTo(-15);
-            make.height.mas_equalTo(15);
+        [_shareEndDateBgView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(50);
+            make.right.mas_equalTo(-50);
+            make.top.equalTo(_checkShareLinkButton.mas_bottom).offset(15);
+            make.height.mas_equalTo(40);
         }];
     }
 }

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

@@ -493,7 +493,7 @@
 "copy_share_link_suc_tip"   = "复制连接成功";
 "copy_share_link_Invalid_tip"   = "已失效";
 "copy_share_link_Invalid_tip2"   = "失效";
-"copy_share_link_Invalid_tip3"   = "失效日期";
+"copy_share_link_Invalid_tip3"   = "失效时间";
 "share_expiration_date_unit_day_tip"   = "天后";
 "share_expiration_date_unit_hour_tip"   = "小时后";
 "share_expiration_date_unit_min_tip"   = "分钟后";