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

修复一些问题

Browse Source
This commit is contained in:
xuemh
2018-05-11 12:50:14 +08:00
parent 7c02da06fe
commit 91ee01351c
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiBackMsgUtils.m
+9 -9
View File
@@ -130,19 +130,19 @@
// 加热制冷 状态 1字节
NSString*stateString6=[backModel.heatStickState substringWithRange:NSMakeRange(0, 2)];
UInt64 mac=[dataContorl hexToTen:backModel.heatTemperature];
float TPlabel=mac/10;
int temp= (int)(TPlabel+0.5);
NSString *stringFloat = [NSString stringWithFormat:@"%d",temp];
[jiaReBang setImage:nil forState:UIControlStateNormal];
if ([stateString6 isEqualToString:@"01"]){
//加热
[jiaReBang setImage:[UIImage imageNamed:@"JiaReBang_on"] forState:UIControlStateNormal];
jiaReBang.selected=YES;
[jiaReBang setTitleColor:JWUIColorFromRGB(0x38b9fc) forState:UIControlStateNormal];
}else{
//制冷
[jiaReBang setImage:[UIImage imageNamed:@"JiaReBang_off"] forState:UIControlStateNormal];
jiaReBang.selected=NO;
[jiaReBang setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
}
[jiaReBang setTitle:stringFloat forState:UIControlStateNormal];
}
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiViewController.m
+3 -3
View File
@@ -113,7 +113,7 @@
-(void)initControlNormalBtn
{
NSArray*nameArr=@[@"PFLight1_off.png",@"PFLight1_off.png",@"PFkilLlight_off.png",@"O2_off.png",@"JiaReBang_off"];
NSArray*nameArr=@[@"PFLight1_off.png",@"PFLight1_off.png",@"PFkilLlight_off.png",@"O2_off.png",@"JiaReBang"];
CGFloat btnControlWith = 70;
CGFloat btnControlPlace = (kScreenSize.width - 3*btnControlWith )/4;
@@ -165,7 +165,7 @@
self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -25 -5 , btnControlWith, btnControlWith + 11);
[self.button setImage:[UIImage imageNamed:nameArr[i+3]]forState:UIControlStateNormal];
[self.button setBackgroundImage:[UIImage imageNamed:nameArr[i+3]]forState:UIControlStateNormal];
self.button.tag= 6003+i;
[self.button addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside];
@@ -506,7 +506,7 @@
if (!_backmodel.heatStickState) {
_backmodel.heatStickState = @"00";
}
UInt64 mac=[dataContorl hexToTen:_backmodel.heatTemperature];
UInt64 mac=[dataContorl hexToTen:_backmodel.shiwen];
float TPlabel=mac/10;
int temp= (int)(TPlabel+0.5);
NSString *stringFloat = [NSString stringWithFormat:@"%d°C",temp];