diff --git a/Ifish/Assets.xcassets/绚多设备/jiare_normal.imageset/jiare_normal@2x.png b/Ifish/Assets.xcassets/绚多设备/jiare_normal.imageset/jiare_normal@2x.png
index 18ab005..244134d 100644
Binary files a/Ifish/Assets.xcassets/绚多设备/jiare_normal.imageset/jiare_normal@2x.png and b/Ifish/Assets.xcassets/绚多设备/jiare_normal.imageset/jiare_normal@2x.png differ
diff --git a/Ifish/Assets.xcassets/绚多设备/jiare_selected.imageset/jiare_selected@2x.png b/Ifish/Assets.xcassets/绚多设备/jiare_selected.imageset/jiare_selected@2x.png
index 0febe88..f5dbd47 100644
Binary files a/Ifish/Assets.xcassets/绚多设备/jiare_selected.imageset/jiare_selected@2x.png and b/Ifish/Assets.xcassets/绚多设备/jiare_selected.imageset/jiare_selected@2x.png differ
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
index aeea411..871aff6 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
@@ -147,6 +147,20 @@
}else{
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])
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
index cbe7697..0ba2968 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
@@ -814,6 +814,11 @@
Xuanduo3fModel*model=(Xuanduo3fModel*)self.dataModel;
mac=[dataContorl hexToTen:model.heatingTemperature];
}
+ else
+ {
+ Xuanduo2Model*model=(Xuanduo2Model*)self.dataModel;
+ mac=[dataContorl hexToTen:model.heatingTemperature];
+ }
NSLog(@"%llu",mac);
float TPlabel=mac/10;
int temp= (int)(TPlabel+0.5);
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib
index 62f4e2f..7b17e13 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib
@@ -417,8 +417,8 @@
-
-
+
+