1. 修改 tabbar 图标

2. 绑定分控设备失败返回上一页面，绑定主控页面不知道哪个是失败
3. 房间列表用 home 的 is_online 字段判断设备是否离线

Temperature/ControlModule/Home/Controller/RDSBindDeviceVC.m

@@ -118,7 +118,7 @@
 }
 
 - (void)p_updateLocation{
-    RDS_WEAKSELF(weakSelf)
+//    RDS_WEAKSELF(weakSelf)
     [RDSDemoApiHelper rds_updateHomeInfoWithHomeId:TheDataManager.current_home_id name:TheDataManager.current_home_name city:TheMapHelper.userLocation.cityString success:^(id responseObject) {
         if ([responseObject[@"code"] intValue] == 0) {
             DDLog(@"更新城市成功");

Temperature/ControlModule/Home/Controller/RDSBindSubDeviceVC.m

@@ -35,6 +35,7 @@
         
         if ([responseObject[@"code"] intValue] != 0) {
             [RDSHudShower showBottomToast:responseObject[@"message"]];
+            [self.navigationController popViewControllerAnimated:YES];
         }else{
             [weakSelf p_cancelTimeout];
             [RDSHudShower showCenterToast:@"绑定成功"];
@@ -45,6 +46,7 @@
         
     } failure:^(NSError *error) {
         [RDSHudShower showBottomToast:@"连接服务器失败"];
+        [self.navigationController popViewControllerAnimated:YES];
     }];
     
     dispatch_async(dispatch_get_main_queue(), ^{

Temperature/ControlModule/Home/Controller/RDSHomeVC.m

@@ -11,7 +11,7 @@
 #import "RDSHomeRoomView.h"
 #import "RDSRoomCell.h"
 #import "RDSAddRoomView.h"
-#import "RDSResetDeviceVC.h"
+#import "RDSSelectDeviceMainVC.h"
 #import "RDSAirControlVC.h"
 #import "RDSSubControlVC.h"
 #import <MJRefresh/MJRefresh.h>
@@ -48,6 +48,7 @@ static NSString * const RDSRoomCellID = @"RDSRoomCellID";
     
     
     [self p_getCurrentUserInfo];
+//    [self p_getHomeList];
     [self p_setUpTimer];// 初始化轮询
     [self p_setupCollectionView];
     
@@ -84,6 +85,10 @@ static NSString * const RDSRoomCellID = @"RDSRoomCellID";
     }];
 }
 
+//- (void)p_getHomeList {
+//    [RDSHomeModel rds_getHomeListIsAdmin:NO finished:nil];
+//}
+
 - (void)p_getWeather{
     RDS_WEAKSELF(weakSelf)
     [WeatherModel rds_getWeatherFinished:^(WeatherModel * _Nonnull weather, NSError * _Nonnull error) {
@@ -238,7 +243,7 @@ static NSString * const RDSRoomCellID = @"RDSRoomCellID";
         
         RDS_WEAKSELF(weakSelf)
         _addView.onAddClick = ^{
-            RDSResetDeviceVC *vc = [[RDSResetDeviceVC alloc] init];
+            RDSSelectDeviceMainVC *vc = [[RDSSelectDeviceMainVC alloc] init];
             vc.hidesBottomBarWhenPushed = YES;
             [weakSelf pushViewController:vc animated:YES];
             

Temperature/ControlModule/Home/View/RDSRoomCell.m

@@ -51,7 +51,9 @@
     }
     
     self.deviceSwitch.on = model.power;
-    if (model.power) {
+    
+    RDSHomeModel *currentHome = TheDataManager.detailHome;
+    if (currentHome.is_online) {
         self.statusLabel.text = [NSString stringWithFormat:@"温度%@°C 湿度%@%%", @(model.temperature), @(model.humidity)];
         self.statusLabel.textColor = [UIColor colorWithHexString:@"#14C9C8"];
         self.pointView.backgroundColor = [UIColor colorWithHexString:@"#14C9C8"];