bug修复
This commit is contained in:
+11
-10
@@ -28,20 +28,21 @@
|
||||
|
||||
NSString*start=[NSString stringWithFormat:@"%ld%02ld%02ld%02ld%02ld",model.year,model.month,model.day,model.hour,model.minute];
|
||||
NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
|
||||
formatter.dateFormat = @"yyyyMMddHHmm";
|
||||
NSDate*date=[formatter dateFromString:start];
|
||||
formatter.dateFormat = @"yyyyMMddHHmmss";
|
||||
NSDate*date=model.date;
|
||||
if (!date
|
||||
) {
|
||||
date= [formatter dateFromString:[start stringByAppendingFormat:@"%02ld",model.second]];
|
||||
|
||||
}
|
||||
|
||||
NSString*end=[NSString stringWithFormat:@"%ld%02ld%02ld%02ld%02ld",model.year,model.month,model.day,model.hour,model.minute];
|
||||
if (date)
|
||||
{
|
||||
if ([model.cType isEqualToString:@"S"])
|
||||
{
|
||||
date=[date dateByAddingTimeInterval:model.time];
|
||||
}
|
||||
else
|
||||
{
|
||||
date=[date dateByAddingTimeInterval:model.time*60];
|
||||
}
|
||||
|
||||
date=[date dateByAddingTimeInterval:model.time];
|
||||
|
||||
formatter.dateFormat=@"yyyyMMddHHmm";
|
||||
end=[formatter stringFromDate:date];
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user