1.【IOS端】分享链接已失效，分享记录扔显示“1分钟后失效”

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

@@ -169,10 +169,18 @@
         else{
             //计算失效时间
             NSString *expDateStr = [iTools getTimeStringToExpirationDate:_dataModel.expirationTime];
-            NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip2",nil);
-            _stateLabel.text = [[NSString alloc] initWithFormat:@"%@%@",expDateStr,tipStr];
+            //NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip2",nil);
+            //_stateLabel.text = [[NSString alloc] initWithFormat:@"%@%@",expDateStr,tipStr];
+            _stateLabel.text = [[NSString alloc] initWithFormat:@"%@",expDateStr];
         }
-        [_stateLabel setTextColor:[UIColor hwColor:@"#01B7EA"]];
+        NSString *tipStr =  NSLocalizedString(@"copy_share_link_Invalid_tip",nil);
+        if([_stateLabel.text isEqualToString:tipStr]){
+            [_stateLabel setTextColor:[UIColor hwColor:@"#666666"]];
+        }
+        else{
+            [_stateLabel setTextColor:[UIColor hwColor:@"#01B7EA"]];
+        }
+        
     }
     
     ShareFileDataModel *fileModel = _dataModel.fileListVOS.firstObject;

创维盒子/双子星云手机/Helpers/iTools.m

@@ -156,24 +156,27 @@ static const char encodingTable[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopq
 //        if(validSecond % daySecond >0){
 //            day += 1;
 //        }
-        
-        return [[NSString alloc] initWithFormat:@"%ld%@",day,NSLocalizedString(@"share_expiration_date_unit_day_tip",nil)];
+        NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip2",nil);
+        return [[NSString alloc] initWithFormat:@"%ld%@%@",day,NSLocalizedString(@"share_expiration_date_unit_day_tip",nil),tipStr];
     }
     else if(validSecond >= hourSecond){
         NSInteger day = validSecond/hourSecond;
 //        if(validSecond % daySecond >0){
 //            day += 1;
 //        }
-        
-        return [[NSString alloc] initWithFormat:@"%ld%@",day,NSLocalizedString(@"share_expiration_date_unit_hour_tip",nil)];
+        NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip2",nil);
+        return [[NSString alloc] initWithFormat:@"%ld%@%@",day,NSLocalizedString(@"share_expiration_date_unit_hour_tip",nil),tipStr];
     }
     else if(validSecond >= minSecond){
         NSInteger day = validSecond/minSecond;
 //        if(validSecond % daySecond >0){
 //            day += 1;
 //        }
-        
-        return [[NSString alloc] initWithFormat:@"%ld%@",day,NSLocalizedString(@"share_expiration_date_unit_min_tip",nil)];
+        NSString *tipStr = NSLocalizedString(@"copy_share_link_Invalid_tip2",nil);
+        return [[NSString alloc] initWithFormat:@"%ld%@%@",day,NSLocalizedString(@"share_expiration_date_unit_min_tip",nil),tipStr];
+    }
+    else if(validSecond <0){
+        return  NSLocalizedString(@"copy_share_link_Invalid_tip",nil);
     }
  
     return [[NSString alloc] initWithFormat:@"1%@",NSLocalizedString(@"share_expiration_date_unit_min_tip",nil)];