diff --git a/.DS_Store b/.DS_Store
index 40142b9..70f2f18 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Ifish.xcodeproj/project.xcworkspace/xcuserdata/imac.xcuserdatad/UserInterfaceState.xcuserstate b/Ifish.xcodeproj/project.xcworkspace/xcuserdata/imac.xcuserdatad/UserInterfaceState.xcuserstate
index 08a3ba6..95f7677 100644
Binary files a/Ifish.xcodeproj/project.xcworkspace/xcuserdata/imac.xcuserdatad/UserInterfaceState.xcuserstate and b/Ifish.xcodeproj/project.xcworkspace/xcuserdata/imac.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Ifish/Info.plist b/Ifish/Info.plist
index 1f67a46..f7452af 100644
--- a/Ifish/Info.plist
+++ b/Ifish/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 4.6.1
+ 4.6.2
CFBundleSignature
????
CFBundleURLTypes
@@ -70,7 +70,7 @@
CFBundleVersion
- 4.6.2
+ 4.6.1
ITSAppUsesNonExemptEncryption
LSApplicationCategoryType
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RuSun84BackMsgUtils.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RuSun84BackMsgUtils.m
index a12c377..ccdacea 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RuSun84BackMsgUtils.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RuSun84BackMsgUtils.m
@@ -143,7 +143,7 @@
}
// 加热制冷 状态 1字节
- NSString*stateString6=[backModel.hotCool substringWithRange:NSMakeRange(2, 2)];
+ NSString*stateString6=[backModel.heatStickState substringWithRange:NSMakeRange(0, 2)];
if ([stateString6 isEqualToString:@"01"]){
//加热
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
index a4126ca..a7f2847 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
@@ -1308,14 +1308,14 @@
LXImageWithImageName(@"bootview_light_off"),
LXImageWithImageName(@"bootview_light_off"),
LXImageWithImageName(@"bootview_light_off"),
- LXImageWithImageName(@"bootview_heat_on")];
+ LXImageWithImageName(@"bootview_heat_off")];
self.btnOnImgArr = @[LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_light_on"),
- LXImageWithImageName(@"bootview_heat_off")];
+ LXImageWithImageName(@"bootview_heat_on")];
}else if ([self.device.type isEqualToString:DECICE_TYPE_JUNENGCC]){
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/YseeCollectionCell/FishControlFourthCell.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/YseeCollectionCell/FishControlFourthCell.m
index 4ab55ad..d3ec595 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/YseeCollectionCell/FishControlFourthCell.m
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/YseeCollectionCell/FishControlFourthCell.m
@@ -387,9 +387,9 @@
//加热棒状态
//加热棒状态 加热还是制冷
//00 加热 01 制冷
- //model.heatStickState 加热棒开关状态 非加热制冷状态注意
+ //model.heatStickState 加热棒开关状态
- NSString*stateString=[model.hotCool substringWithRange:NSMakeRange(2, IFISH_LIGHTBTN_BYTE)];
+ NSString*stateString=[model.heatStickState substringWithRange:NSMakeRange(0, IFISH_LIGHTBTN_BYTE)];
[self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
addOffArr:imgOffArr];
@@ -428,8 +428,8 @@
[self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
addOffArr:imgOffArr];
- }
- else if (index == 4){
+ }else if (index == 4){
+
//加热棒状态
NSString*stateString=[model.heatStickState substringWithRange:NSMakeRange(0, IFISH_LIGHTBTN_BYTE)];
[self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr