root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V5.0.0bug修复

Browse Source
This commit is contained in:
wbzhan
2019-08-29 14:07:40 +08:00
parent 23c5d6f60d
commit 685a2b8676
17 changed files with 247 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/HotBar/Views/IFishWaterChangeView.m
+11 -10
View File
@@ -229,6 +229,7 @@ Strong UIImageView *sepImage;
self.openBtn.hidden = YES;
[self.data1 removeAllObjects];
[self.data2 removeAllObjects];
self.titleLabel.text=@"请设置加热温度：";
if (viewType==0) {// 设置水温
self.topUiPick.hidden=NO;
[self.data1 addObjectsFromArray:self.templetrueArr];
@@ -280,7 +281,6 @@ Strong UIImageView *sepImage;
self.titleLabel.text=@"换水周期选择：";
self.selectVaule2=self.data1[0];
if (self.hotVo.heater.heaterCycle!=nil) {
[self.bottomUiPicker selectRow:[self.hotVo.heater.heaterCycle integerValue]-1 inComponent:0 animated:NO];
self.selectVaule2=self.hotVo.heater.heaterCycle;
}else{
@@ -300,7 +300,7 @@ Strong UIImageView *sepImage;
//点击open按钮
- (void)openBtnClick:(UIButton *)sender {
sender.selected=!sender.selected;
if(self.viewType==0){
if(self.viewType==1){//设置预警温度
self.hotVo.wornCode=sender.selected?@"01":@"00";
[self.myDelegate clickWormCode:self.hotVo.wornCode];
}
@@ -312,15 +312,16 @@ Strong UIImageView *sepImage;
//点击确定按钮
- (void)sureBtnClick:(UIButton *)sender{
self.hidden=YES;
if(_viewType==5){
[self.myDelegate didSelectRow1:self.selectVaule2 andRow2:self.selectVaule3];
}else if (_viewType==0){
// [self.myDelegate didSelectTeamptrue:self.selectVaule2];
// if(_viewType==5){
// [self.myDelegate didSelectRow1:self.selectVaule2 andRow2:self.selectVaule3];
// }else
if (_viewType==0) {//设置加热温度
[self.myDelegate didChangeTemperature:self.selectVaule1];
}
if (_viewType==1){//设置预警温度
NSString*code=self.openBtn.selected?@"01":@"00";
[self.myDelegate didSelectTeamptrue:self.selectVaule3 andDown:self.selectVaule2 andT:self.selectVaule1 andWarnCode:code];
}else if(_viewType==4){
// [self.myDelegate didSelectRemindTime:self.selectVaule2];
[self.myDelegate didSelectTeamptrue:self.selectVaule3 andDown:self.selectVaule2 andWarnCode:code];
}else if(_viewType==4){//设置换水周期
if(self.openBtn.selected==NO){
[self.myDelegate didSelectRow1:self.selectVaule2 andRow2:@""];
}else{