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

更换热点链接方式

Browse Source
This commit is contained in:
wbzhan
2019-09-30 13:30:50 +08:00
parent 41e5233e1f
commit bfdf208899
10 changed files with 259 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/HotBar/IfishHotBarVc.m
+9 -3
View File
@@ -172,7 +172,7 @@ Assign BOOL isInitHostoryView;
temp=[temp stringByReplacingOccurrencesOfString:@"°c" withString:@""];
IfishHotBarVo*vo=self.datas[0];
self.vo.heaterNum=[NSString stringWithFormat:@"%f",temp.floatValue];
vo.title=[NSString stringWithFormat:@"设置温度 %.1f°c",[self.vo.heaterNum floatValue]];
vo.subTitle=[NSString stringWithFormat:@"%.1f°c",[self.vo.heaterNum floatValue]];
[self.mainTableView reloadData];
[self setHeatTeapWith:temp];
}
@@ -367,6 +367,8 @@ Assign BOOL isInitHostoryView;
self.historyView.datas=self.vo.phs;
self.historyView.hidden=YES;
}
//去除鱼缸容积
IfishHotBarVo*vo1=self.datas[4];
if (self.vo.heater.heaterCycle.length) {
@@ -473,9 +475,13 @@ Assign BOOL isInitHostoryView;
self.vo.heaterNum=[NSString stringWithFormat:@"%f",num];
IfishHotBarVo*vo=self.datas[0];
vo.title=[NSString stringWithFormat:@"设置温度 %.1f°c",[self.vo.heaterNum floatValue]];
vo.subTitle=[NSString stringWithFormat:@"%.1f°c",[self.vo.heaterNum floatValue]];
//设置预警温度区间
IfishHotBarVo*vo1=self.datas[1];
if (!IsEmptyStr(self.vo.upTeamp)) {
vo1.subTitle = [NSString stringWithFormat:@"%.1f°c到%.1f°c",[self.vo.downTeamp floatValue],[self.vo.upTeamp floatValue]];
}
self.vo.wornCode=[info substringWithRange:NSMakeRange(44, 2)];
// self.vo.wornCode=[NSString stringWithFormat:@"%llu",[dataContorl hexToTen:self.vo.wornCode]];
Ifish/controllers/HotBar/Views/IFishHotBarCell.m
+2 -2
View File
@@ -40,10 +40,10 @@
self.subTitleLable.text=vo.subTitle;
self.iconImgV.image=[UIImage imageNamed:vo.iconUrl];
self.arrowImgV.hidden=!vo.isShowArrow;
if (vo.phv!=499) {//无水
[self.subTitleLable setTextColor:[UIColor colorWithRed:109/255.0 green:109/255.0 blue:109/255.0 alpha:1.0]];
if ((vo.phv!=499)&&[vo.title isEqualToString:@"水泵流量"]) {//水泵流量无水
[self.subTitleLable setTextColor:[UIColor redColor]];
}else{//正常
[self.subTitleLable setTextColor:[UIColor colorWithRed:109/255.0 green:109/255.0 blue:109/255.0 alpha:1.0]];
}
}