Procházet zdrojové kódy

【IOS端】图片分享有效期是永久时,分享记录展示一分钟后,详情未展示失效日期

huangxiaodong před 1 rokem
rodič
revize
2bea146a5b

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

@@ -298,9 +298,16 @@
        _cancelShareLinkButton.hidden = NO;
        _shareLinkCopyButton.hidden = NO;
         
-        //失效时间
-        NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip3",nil);
-        _shareEndDateLabel.text = [[NSString alloc] initWithFormat:@"%@: %@",tipStr,_dataModel.expirationTime];
+        if(_dataModel.expirationDay== 0)
+        {
+            NSString *expDateStr = NSLocalizedString(@"share_expiration_date_forever",nil);
+            _shareEndDateLabel.text = expDateStr;
+        }
+        else{
+            //失效时间
+            NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip3",nil);
+            _shareEndDateLabel.text = [[NSString alloc] initWithFormat:@"%@: %@",tipStr,_dataModel.expirationTime];
+        }
     }
     else{
         _cancelShareLinkButton.hidden = YES;

+ 11 - 4
创维盒子/双子星云手机/Class/Set/previewFile/view/shareRecordTableViewCell.m

@@ -160,10 +160,17 @@
         [_stateLabel setTextColor:HW666666Color]; //#01B7EA
     }
     else{
-        //计算失效时间
-        NSString *expDateStr = [iTools getTimeStringToExpirationDate:_dataModel.expirationTime];
-        NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip2",nil);
-        _stateLabel.text = [[NSString alloc] initWithFormat:@"%@%@",expDateStr,tipStr];
+        if(_dataModel.expirationDay== 0)
+        {
+            NSString *expDateStr = NSLocalizedString(@"share_expiration_date_forever",nil);
+            _stateLabel.text = expDateStr;
+        }
+        else{
+            //计算失效时间
+            NSString *expDateStr = [iTools getTimeStringToExpirationDate:_dataModel.expirationTime];
+            NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip2",nil);
+            _stateLabel.text = [[NSString alloc] initWithFormat:@"%@%@",expDateStr,tipStr];
+        }
         [_stateLabel setTextColor:[UIColor hwColor:@"#01B7EA"]];
     }
     

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

@@ -519,3 +519,5 @@
 "box_receive_file_fail"   = "保存失败";
 "share_max_count_tip1"   = "分享文件最大不能超过20张";
 "share_max_count_tip2"   = "分享文件最大不能超过5张";
+"share_expiration_date_forever"   = "永久有效";
+