diff --git a/.DS_Store b/.DS_Store
index 70f2f18..3444832 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 95f7677..2777bce 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 f7452af..3ba545a 100644
--- a/Ifish/Info.plist
+++ b/Ifish/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.6.2</string>
+	<string>4.6.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4.6.1</string>
+	<string>4.6.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
index e7824d4..4be0528 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
@@ -489,7 +489,6 @@
     [RuSun84BackMsgUtils readSoketDataWithBaackMassgModel:_backmodel addWithBackData:data];
     
     // 温度 等状态
-    
     dispatch_async(dispatch_get_main_queue(), ^{
         [RuSun84BackMsgUtils setTemperaturelabel:self.temperature addbubleImge:self.bubble WithBackData:data addWithBackMassageModel:_backmodel addWithTableview:self.tableView];
         
@@ -527,6 +526,7 @@
         
     });
     
+    
     // 刷新设置界面
     dispatch_async(dispatch_get_main_queue(), ^{
         
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
index 7900d8d..f130df4 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
@@ -3528,7 +3528,6 @@
     }
     
     
-    
     //开始渲染
       self.isReject = NO;
      [NSThread detachNewThreadSelector:@selector(renderView) toTarget:self withObject:nil];
@@ -4520,7 +4519,6 @@
     NSString *stringFloat = [NSString stringWithFormat:@"%d",temp];
     NSLog(@"%@",stringFloat);
     
-    
     NSArray*wenDuArr=[_ruSunPicview.picArr objectAtIndex:0];
     
     //主线程名字和炫多通用 _xutoMainQueue 无影响
@@ -4560,7 +4558,7 @@
 -(void)selectRuSun84Index:(NSIndexPath*)index withbackModle:(RunSun84Protocol *)backModel
 {
     //有加热制冷
-    [self showRunHotCoolPic];
+    [self showRunHotCoolPic:backModel];
     [self ruSun84MianQueWith];
     
 }
@@ -4609,13 +4607,20 @@
 
 #pragma mark - 制冷 制热 类型 温度选择
 
--(void)showRunHotCoolPic
+-(void)showRunHotCoolPic:(RunSun84Protocol *)backModel
 {
     _ruSunPicview=[[HaveHotCoolWenDuPicview alloc] init];
     _ruSunPicview.frame=CGRectMake(0, 0, kScreenSize.width, kScreenSize.height);
     [_ruSunPicview.sureBtn addTarget:self action:@selector(hotCoolBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     [self.view.window addSubview:_ruSunPicview];
     _ruSunPicview.wenDuPicviewDelegate = self;
+    NSString *stateStr =nil;
+    if ([backModel.hotCool isKindOfClass:[NSNull class]]||!backModel.hotCool) {
+        backModel.hotCool = @"0000";
+    }
+    stateStr = [backModel.hotCool substringWithRange:NSMakeRange(2, 2)];
+    [_ruSunPicview initCateBtnSate:stateStr];
+    
     if (!_xutoMainQueue) {
         _xutoMainQueue = dispatch_get_main_queue();
     }
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
index a7f2847..7f3d80c 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
@@ -1598,12 +1598,11 @@
         }
         [RuSun84BackMsgUtils readSoketDataWithBaackMassgModel:_ruSun84Back addWithBackData:data];
         
-        self.temperature = [BootomViewSoketBackMasgConreol getTempNewWayWithSoketData:data adddeviceType:DECICE_TYPE_THREETMP];
+        self.temperature = [BootomViewSoketBackMasgConreol getTempNewWayWithSoketData:data adddeviceType:DECICE_TYPE_RUSUN2A];
         
         [self.collectionView reloadData];
         
-        NSArray *timerArr=[RuSunBackMessageUtils refreshRuSunTimerAddTemperatureWithBackMassageModel:_ruSunBack];
-        
+        NSArray *timerArr=[RuSun84BackMsgUtils  refreshRuSunTimerAddTemperatureWithBackMassageModel:_ruSun84Back];
         [self.MonitorBottomDelegate setTimeVCReloadDatawithTimerArr:timerArr
                                                            withData:self.device
                                                      addMassglength:string1.length];