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

加热棒展示温度

This commit is contained in:
祝发冬 2022-06-25 16:47:04 +08:00
parent 7b143bcdfc
commit 80b50dd783
5 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Ifish/Assets.xcassets/绚多设备/jiare_normal.imageset/jiare_normal@2x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
Ifish/Assets.xcassets/绚多设备/jiare_selected.imageset/jiare_selected@2x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 24 KiB

14
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
View File

@ -147,6 +147,20 @@
}else{ }else{
heatLightBtn.selected = NO; heatLightBtn.selected = NO;
} }
// 恒温
UInt64 mac=[dataContorl hexToTen:backModel.heatingTemperature];
//float TPlabel=mac/10+(mac%10)*0.1;
float temp = mac/10.0;
NSString *stringTemp = [NSString stringWithFormat:@"%.1f℃",temp];
UIImage*imageTempNomal=[UIImage imageNamed:@"jiare_normal"];
imageTempNomal=[imageTempNomal imageWaterMarkWithString:stringTemp rect:CGRectMake(20, 25, 60, 40) attribute:@{NSForegroundColorAttributeName:[UIColor redColor],NSFontAttributeName:[UIFont systemFontOfSize:25]}];
[heatLightBtn setImage:imageTempNomal forState:UIControlStateNormal];
UIImage*imageTempsel=[UIImage imageNamed:@"jiare_selected"];
imageTempsel=[imageTempsel imageWaterMarkWithString:stringTemp rect:CGRectMake(20, 25, 60, 40) attribute:@{NSForegroundColorAttributeName:[UIColor redColor],NSFontAttributeName:[UIFont systemFontOfSize:18]}];
[heatLightBtn setImage:imageTempsel forState:UIControlStateSelected];
} }
else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F]) else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F])

5
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
View File

@ -814,6 +814,11 @@
Xuanduo3fModel*model=(Xuanduo3fModel*)self.dataModel; Xuanduo3fModel*model=(Xuanduo3fModel*)self.dataModel;
mac=[dataContorl hexToTen:model.heatingTemperature]; mac=[dataContorl hexToTen:model.heatingTemperature];
} }
else
{
Xuanduo2Model*model=(Xuanduo2Model*)self.dataModel;
mac=[dataContorl hexToTen:model.heatingTemperature];
}
NSLog(@"%llu",mac); NSLog(@"%llu",mac);
float TPlabel=mac/10; float TPlabel=mac/10;
int temp= (int)(TPlabel+0.5); int temp= (int)(TPlabel+0.5);

4
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib
View File

@ -417,8 +417,8 @@
<image name="dengguang_selected" width="52" height="52"/> <image name="dengguang_selected" width="52" height="52"/>
<image name="huli_noraml" width="52" height="52"/> <image name="huli_noraml" width="52" height="52"/>
<image name="huli_selected" width="52" height="52"/> <image name="huli_selected" width="52" height="52"/>
<image name="jiare_normal" width="52" height="52"/> <image name="jiare_normal" width="100" height="100"/>
<image name="jiare_selected" width="52" height="52"/> <image name="jiare_selected" width="100" height="100"/>
<image name="shajun_normal" width="52.5" height="52.5"/> <image name="shajun_normal" width="52.5" height="52.5"/>
<image name="shajun_selected" width="52.5" height="52.5"/> <image name="shajun_selected" width="52.5" height="52.5"/>
<image name="xuanduo_bg" width="375" height="322.5"/> <image name="xuanduo_bg" width="375" height="322.5"/>