Skip to content

Commit fd4ebf8

Browse files
author
ccharlesren
committed
生效选择自定义时间保存问题
https://docs.qq.com/doc/DRWVqbnNJcHdJVHdB Change-Id: Ib41bcb7dcd9d2d66852b9bfda65384c2d205541c
1 parent f7f0585 commit fd4ebf8

File tree

1 file changed

+33
-4
lines changed

1 file changed

+33
-4
lines changed

Source/LinkApp/Classes/Module/Intelligent/View/TIoTAutoCustomTimePeriodView.m

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ - (void)setPreviousSelectedTime:(NSString *)previousSelectedTime {
136136
_previousSelectedTime = previousSelectedTime;
137137

138138
//对于传入的时间字符串需要拆解,按内容显示
139-
if (![NSString isNullOrNilWithObject:self.previousSelectedTime]) {
140-
if ([self.previousSelectedTime containsString:@"-"]) {
141-
NSArray *previousArray = [self.previousSelectedTime componentsSeparatedByString:@"-"];
139+
if (![NSString isNullOrNilWithObject:previousSelectedTime]) {
140+
if ([previousSelectedTime containsString:@"-"]) {
141+
NSArray *previousArray = [previousSelectedTime componentsSeparatedByString:@"-"];
142142
if ([previousArray.firstObject containsString:@":"]) {
143143
NSArray *fromArray = [previousArray.firstObject componentsSeparatedByString:@":"];
144144
NSString *fromHour = fromArray.firstObject;
@@ -173,7 +173,11 @@ - (void)setPreviousSelectedTime:(NSString *)previousSelectedTime {
173173
[self.pickView selectRow:toMInutArray.count - 1 inComponent:4 animated:NO];
174174
}
175175

176-
self.choiceTimePeriod = [NSString stringWithFormat:@"00:00-23:59"];
176+
if ([NSString isNullOrNilWithObject:previousSelectedTime]) {
177+
self.choiceTimePeriod = [NSString stringWithFormat:@"00:00-23:59"];
178+
}else {
179+
self.choiceTimePeriod = previousSelectedTime;
180+
}
177181
}
178182

179183
#pragma mark - event
@@ -230,6 +234,31 @@ - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComp
230234
NSString *line = @"-";
231235
NSInteger toHour = toHourArray.count - 1;
232236
NSInteger toMinut = toMInutArray.count - 1;
237+
238+
if (![NSString isNullOrNilWithObject:self.choiceTimePeriod]) {
239+
if ([self.choiceTimePeriod containsString:@"-"]) {
240+
NSArray *previousArray = [self.choiceTimePeriod componentsSeparatedByString:@"-"];
241+
if ([previousArray.firstObject containsString:@":"]) {
242+
NSArray *fromArray = [previousArray.firstObject componentsSeparatedByString:@":"];
243+
NSString *fromHourString = fromArray.firstObject;
244+
NSString *fromMinutString = fromArray.lastObject;
245+
246+
fromHour = fromHourString.intValue;
247+
fromMinut = fromMinutString.intValue;
248+
}
249+
250+
if ([previousArray.lastObject containsString:@":"]) {
251+
NSArray *toArray = [previousArray.lastObject componentsSeparatedByString:@":"];
252+
NSString *toHourString = toArray.firstObject;
253+
NSString *toMinutStirng = toArray.lastObject;
254+
255+
toHour = toHourString.intValue;
256+
toMinut = toMinutStirng.intValue;
257+
}
258+
}
259+
}
260+
261+
233262
if (component == 0) {
234263
fromHour = row;
235264
}else if (component == 1){

0 commit comments

Comments
 (0)