增加 RDSDeviceType 枚举，用于替换原先的 isMasterController 属性

Temperature.xcodeproj/project.pbxproj

@@ -214,6 +214,7 @@
 		03D1A3732A8CF5B200106033 /* UIColor+Temperature.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIColor+Temperature.m"; sourceTree = "<group>"; };
 		03DB89142A9789A900718F10 /* RDSDeviceTypeCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RDSDeviceTypeCell.h; sourceTree = "<group>"; };
 		03DB89152A9789A900718F10 /* RDSDeviceTypeCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RDSDeviceTypeCell.m; sourceTree = "<group>"; };
+		03E22E122B1E0FBA00634ECD /* RDSDeviceHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RDSDeviceHeader.h; sourceTree = "<group>"; };
 		220357E5293466D40081B5B8 /* RDSConstant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RDSConstant.m; sourceTree = "<group>"; };
 		220357E8293735BF0081B5B8 /* RDSMemberModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RDSMemberModel.h; sourceTree = "<group>"; };
 		220357E9293735BF0081B5B8 /* RDSMemberModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RDSMemberModel.m; sourceTree = "<group>"; };
@@ -554,6 +555,7 @@
 				0364165A2A9F84BB00FE8629 /* RDSSystemParameterModel.m */,
 				03245AFD2A8E5E2B003DF602 /* RDSDeviceTypeModel.h */,
 				03245AFE2A8E5E2B003DF602 /* RDSDeviceTypeModel.m */,
+				03E22E122B1E0FBA00634ECD /* RDSDeviceHeader.h */,
 			);
 			path = Model;
 			sourceTree = "<group>";

Temperature/AppConfig/RDSConfig.h

@@ -25,10 +25,10 @@
 //#define kBaseUrlHost_test        @"http://114.115.251.196:8299/api/v1" // API地址
 
 // 生产环境
-#define kBaseUrlHost        @"https://app.yongxulvjian.com/api/v1"
-#define kBaseUrlHeadImg     @"https://app.yongxulvjian.com"
-//#define kBaseUrlHost        @"http://114.115.251.196:8299/api/v1"
-//#define kBaseUrlHeadImg     @"http://yongxu.yehaoji.cn:18199"
+//#define kBaseUrlHost        @"https://app.yongxulvjian.com/api/v1"
+//#define kBaseUrlHeadImg     @"https://app.yongxulvjian.com"
+#define kBaseUrlHost        @"http://114.115.251.196:8299/api/v1"
+#define kBaseUrlHeadImg     @"http://yongxu.yehaoji.cn:18199"
 
 
 

Temperature/ControlModule/Home/Controller/RDSAddRoomVC.m

@@ -64,22 +64,31 @@
     [self.view endEditing:YES];
     
 //    if(TheDataManager.rooms.count == 0){
-    if (self.deviceTypeModel.isMasterController) {
-        RDSInputWiFiVC *vc = [[RDSInputWiFiVC alloc] init];
-        vc.roomName = _roomNameTF.text;
-        vc.deviceID = _deviceIDTF.text;
-        vc.deviceTypeModel = self.deviceTypeModel;
-        [self pushViewController:vc animated:YES];
-    }else{
-        RDSBindSubDeviceVC *vc = [[RDSBindSubDeviceVC alloc] init];
-        vc.roomName = _roomNameTF.text;
-        vc.deviceID = _deviceIDTF.text;
-        vc.deviceTypeModel = self.deviceTypeModel;
-        [self pushViewController:vc animated:YES];
+    switch (self.deviceTypeModel.deviceType) {
+        case RDSDeviceType_MasterController: {
+            RDSInputWiFiVC *vc = [[RDSInputWiFiVC alloc] init];
+            vc.roomName = _roomNameTF.text;
+            vc.deviceID = _deviceIDTF.text;
+            vc.deviceTypeModel = self.deviceTypeModel;
+            [self pushViewController:vc animated:YES];
+            break;
+        }
+        case RDSDeviceType_SubController: {
+            RDSBindSubDeviceVC *vc = [[RDSBindSubDeviceVC alloc] init];
+            vc.roomName = _roomNameTF.text;
+            vc.deviceID = _deviceIDTF.text;
+            vc.deviceTypeModel = self.deviceTypeModel;
+            [self pushViewController:vc animated:YES];
+            break;
+        }
+        case RDSDeviceType_IntelligentWaterCollector: {
+            break;
+        }
+        default:
+            break;
     }
     
     
-    
 }
 
 // 扫码返回字符串

Temperature/ControlModule/Home/Controller/RDSHomeVC.m

@@ -318,19 +318,29 @@ static NSString * const RDSRoomCellID = @"RDSRoomCellID";
     [collectionView deselectItemAtIndexPath:indexPath animated:YES];
     
     RDSRoomModel *roomModel = TheDataManager.rooms[indexPath.row];
-    if(roomModel.isMasterController){
-        RDSAirControlVC *vc = [[RDSAirControlVC alloc] init];
-        vc.hidesBottomBarWhenPushed = YES;
-        vc.roomModel = roomModel;
-        [self pushViewController:vc animated:YES];
-    }
-    else{
-        RDSSubControlVC *vc = [[RDSSubControlVC alloc] init];
-        vc.hidesBottomBarWhenPushed = YES;
-        vc.roomModel = roomModel;
-        [self pushViewController:vc animated:YES];
+    switch (roomModel.deviceType) {
+        case RDSDeviceType_MasterController: {
+            RDSAirControlVC *vc = [[RDSAirControlVC alloc] init];
+            vc.hidesBottomBarWhenPushed = YES;
+            vc.roomModel = roomModel;
+            [self pushViewController:vc animated:YES];
+            break;
+        }
+        case RDSDeviceType_SubController: {
+            RDSSubControlVC *vc = [[RDSSubControlVC alloc] init];
+            vc.hidesBottomBarWhenPushed = YES;
+            vc.roomModel = roomModel;
+            [self pushViewController:vc animated:YES];
+            break;
+        }
+        case RDSDeviceType_IntelligentWaterCollector: {
+            break;
+        }
+        default:
+            break;
     }
     
+    
 }
 
 #pragma mark - UICollectionViewDataSource

Temperature/ControlModule/Home/Controller/RDSResetDeviceVC.m

@@ -24,18 +24,33 @@
     self.title = @"添加房间";
     
 //    if(TheDataManager.rooms.count == 0){
-    if (self.deviceTypeModel.isMasterController) {
-        // 添加主控
-        _lab1.text = @"1、主控制器开机状态下，长按『菜单键』3s进入设置界面";
-        _lab2.text = @"2、再次长按『菜单键』，直到显示配网二维码";
-        _imgView1.image = [UIImage imageNamed:@"img_reset_1"];
-        _imgView2.image = [UIImage imageNamed:@"img_reset_2"];
-    } else {
-        // 添加分控
-        _lab1.text = @"1、分控制器开机状态下，长按『菜单键』3s直到界面出现配网二维码";
-        _lab2.text = @"2、使用APP扫码绑定";
-        _imgView1.image = [UIImage imageNamed:@"img_reset_3"];
-        _imgView2.image = [UIImage imageNamed:@"img_reset_4"];
+    switch (self.deviceTypeModel.deviceType) {
+        case RDSDeviceType_MasterController: {
+            // 添加主控
+            _lab1.text = @"1、主控制器开机状态下，长按『菜单键』3s进入设置界面";
+            _lab2.text = @"2、再次长按『菜单键』，直到显示配网二维码";
+            _imgView1.image = [UIImage imageNamed:@"img_reset_1"];
+            _imgView2.image = [UIImage imageNamed:@"img_reset_2"];
+            break;
+        }
+        case RDSDeviceType_SubController: {
+            // 添加分控
+            _lab1.text = @"1、分控制器开机状态下，长按『菜单键』3s直到界面出现配网二维码";
+            _lab2.text = @"2、使用APP扫码绑定";
+            _imgView1.image = [UIImage imageNamed:@"img_reset_3"];
+            _imgView2.image = [UIImage imageNamed:@"img_reset_4"];
+            break;
+        }
+        case RDSDeviceType_IntelligentWaterCollector: {
+            // 添加集分水器
+            _lab1.text = @"1、集分水器开机状态下，长按『菜单键』3s直到界面出现配网二维码";
+            _lab2.text = @"2、使用APP扫码绑定";
+            _imgView1.image = [UIImage imageNamed:@"img_reset_1"];
+            _imgView2.image = [UIImage imageNamed:@"img_reset_2"];
+            break;
+        }
+        default:
+            break;
     }
 }
 

Temperature/ControlModule/Home/Controller/RDSSelectDeviceSubVC.m

@@ -63,10 +63,6 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     RDSDeviceTypeModel *deviceTypeModel = self.dataSource[indexPath.section];
-    if ([deviceTypeModel.code isEqualToString:@"YXK-P/DN-JF-8"]) {
-        [TheAlertCtrl rds_alertWithTitle:@"提示" message:@"该功能正在开发中，敬请期待！"];
-        return;
-    }
     RDSResetDeviceVC *resetDeviceVC = [[RDSResetDeviceVC alloc] init];
     resetDeviceVC.deviceTypeModel = deviceTypeModel;
     [self.parentViewController.navigationController pushViewController:resetDeviceVC animated:YES];

Temperature/ControlModule/Home/Model/RDSDeviceHeader.h

@@ -0,0 +1,19 @@
+//
+//  RDSDeviceHeader.h
+//  Temperature
+//
+//  Created by 姓二名哈字富贵儿 on 2023/12/4.
+//
+
+#ifndef RDSDeviceHeader_h
+#define RDSDeviceHeader_h
+
+#import <Foundation/Foundation.h>
+
+typedef NS_ENUM (NSInteger, RDSDeviceType) {
+    RDSDeviceType_MasterController,             // 主控制器
+    RDSDeviceType_SubController,                // 分控制器
+    RDSDeviceType_IntelligentWaterCollector     // 集分水器
+};
+
+#endif /* RDSDeviceHeader_h */

Temperature/ControlModule/Home/Model/RDSDeviceTypeModel.h

@@ -6,6 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "RDSDeviceHeader.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -16,7 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *code;
 @property (nonatomic, copy) NSString *parent_id;
 @property (nonatomic, copy) NSString *icon;
-@property (nonatomic, assign, readonly) BOOL isMasterController;
+@property (nonatomic, assign) RDSDeviceType deviceType;
+
 
 @property (nonatomic, strong) NSArray<RDSDeviceTypeModel *> *children;
 

Temperature/ControlModule/Home/Model/RDSDeviceTypeModel.m

@@ -12,9 +12,11 @@
 - (void)setCode:(NSString *)code {
     _code = code;
     if ([code isEqualToString:@"YXK-Z/86-FG-A"] || [code isEqualToString:@"YXK-Z/86-FC-B"]) {
-        _isMasterController = YES;
-    } else {
-        _isMasterController = NO;
+        _deviceType = RDSDeviceType_MasterController;
+    } else if ([code isEqualToString:@"YXK-F/86-FG-A"] || [code isEqualToString:@"YXK-F/86-FC-B"]) {
+        _deviceType = RDSDeviceType_SubController;
+    } else if ([code isEqualToString:@"YXK-P/DN-JF-8"]) {
+        _deviceType = RDSDeviceType_IntelligentWaterCollector;
     }
 }
 

Temperature/ControlModule/Room/Controller/RDSRoomVC.m

@@ -213,20 +213,27 @@ static NSString * const RDSRoomCellID = @"RDSRoomCellID";
     if (_isEdit) return;
 
     RDSRoomModel *roomModel = TheDataManager.rooms[indexPath.row];
-    if(roomModel.isMasterController){
-        RDSAirControlVC *vc = [[RDSAirControlVC alloc] init];
-        vc.hidesBottomBarWhenPushed = YES;
-        vc.roomModel = roomModel;
-        [self pushViewController:vc animated:YES];
-    }
-    else{
-        RDSSubControlVC *vc = [[RDSSubControlVC alloc] init];
-        vc.hidesBottomBarWhenPushed = YES;
-        vc.roomModel = roomModel;
-        [self pushViewController:vc animated:YES];
+    switch (roomModel.deviceType) {
+        case RDSDeviceType_MasterController: {
+            RDSAirControlVC *vc = [[RDSAirControlVC alloc] init];
+            vc.hidesBottomBarWhenPushed = YES;
+            vc.roomModel = roomModel;
+            [self pushViewController:vc animated:YES];
+            break;
+        }
+        case RDSDeviceType_SubController: {
+            RDSSubControlVC *vc = [[RDSSubControlVC alloc] init];
+            vc.hidesBottomBarWhenPushed = YES;
+            vc.roomModel = roomModel;
+            [self pushViewController:vc animated:YES];
+            break;
+        }
+        case RDSDeviceType_IntelligentWaterCollector: {
+            break;
+        }
+        default:
+            break;
     }
-    
-    
 
 }
 

Temperature/ControlModule/Room/Model/RDSRoomModel.h

@@ -6,6 +6,7 @@
 //
 
 #import "FFDataBaseModel.h"
+#import "RDSDeviceHeader.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -45,7 +46,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSString *user_id;        //
 
 // 设备状态
-@property (nonatomic, assign, readonly) BOOL isMasterController;
+@property (nonatomic, assign) RDSDeviceType deviceType;
+
 @property (nonatomic, assign) BOOL is_master;           // 是否是主控
 @property (nonatomic, assign) int air_quality;          // 空气质量 pm2.5
 @property (nonatomic, assign) int temperature;          // 温度

Temperature/ControlModule/Room/Model/RDSRoomModel.m

@@ -12,9 +12,11 @@
 - (void)setCode:(NSString *)code {
     _code = code;
     if ([code isEqualToString:@"YXK-Z/86-FG-A"] || [code isEqualToString:@"YXK-Z/86-FC-B"]) {
-        _isMasterController = YES;
-    } else {
-        _isMasterController = NO;
+        _deviceType = RDSDeviceType_MasterController;
+    } else if ([code isEqualToString:@"YXK-F/86-FG-A"] || [code isEqualToString:@"YXK-F/86-FC-B"]) {
+        _deviceType = RDSDeviceType_SubController;
+    } else if ([code isEqualToString:@"YXK-P/DN-JF-8"]) {
+        _deviceType = RDSDeviceType_IntelligentWaterCollector;
     }
 }