root
/
ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

信息读取

This commit is contained in:
kai60 2022-05-10 18:27:46 +08:00
parent 49efbf58df
commit d2ddc8b76a
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
View File

@ -39,6 +39,28 @@
{
xuanduoModel.waterLevel=[dataString substringWithRange:NSMakeRange(84, 2)];
}
}
else if (([type isEqualToString:DECICE_TYPE_XUANDUO4F]||[type isEqualToString:DECICE_TYPE_XUANDUO5F])&&[model isKindOfClass:[Xuanduo2Model class]]&&dataString.length>83)
{
Xuanduo2Model*xuanduoModel=model;
xuanduoModel.gasPump = [dataString substringWithRange:NSMakeRange(30, 4)];
xuanduoModel.light1 = [dataString substringWithRange:NSMakeRange(34, 4)];
xuanduoModel.light2 = [dataString substringWithRange:NSMakeRange(38, 4)];
xuanduoModel.waterPump = [dataString substringWithRange:NSMakeRange(42, 4)];
xuanduoModel.uvLamp = [dataString substringWithRange:NSMakeRange(46, 4)];
xuanduoModel.waveMakingPump = [dataString substringWithRange:NSMakeRange(50, 4)];
xuanduoModel.status = [dataString substringWithRange:NSMakeRange(54, 4)];
xuanduoModel.heatStatus = [dataString substringWithRange:NSMakeRange(58, 2)];
xuanduoModel.waterTemperature = [dataString substringWithRange:NSMakeRange(60, 4)];
xuanduoModel.heatingTemperature = [dataString substringWithRange:NSMakeRange(64, 4)];
xuanduoModel.huliLight = [dataString substringWithRange:NSMakeRange(68, 2)];
xuanduoModel.fishFeed = [dataString substringWithRange:NSMakeRange(70, 2)];
xuanduoModel.powerRating = [dataString substringWithRange:NSMakeRange(72, 4)];
xuanduoModel.alarmSwitch = [dataString substringWithRange:NSMakeRange(76, 2)];
xuanduoModel.miniTemp = [dataString substringWithRange:NSMakeRange(78, 4)];
xuanduoModel.maxTemp = [dataString substringWithRange:NSMakeRange(82, 4)];
}
else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F]&&[model isKindOfClass:[Xuanduo3fModel class]]&&dataString.length>67)
{
@ -66,7 +88,7 @@
+(void)resetNewXuanduoButtonState:(UIButton*)uvLightBtn gasPumpLight:(UIButton*)gasLightBtn light1:(UIButton*)light1Btn light2:(UIButton*)light2Btn waveLight:(UIButton*)waveLightBtn huliLight:(UIButton*)huliLightBtn waterLight:(UIButton*)waterLightBtn heatLight:(UIButton*)heatLightBtn withModel:(Xuanduo2Model*)model type:(nonnull NSString *)type{
if ([type isEqualToString:DECICE_TYPE_XUANDUO2F])
if ([type isEqualToString:DECICE_TYPE_XUANDUO2F]||[type isEqualToString:DECICE_TYPE_XUANDUO4F]||[type isEqualToString:DECICE_TYPE_XUANDUO5F])
{
Xuanduo2Model*backModel=model;

4
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2Model.h
View File

@ -67,6 +67,10 @@ bfec crc16校验码
/// 最高温
@property (nonatomic, strong) NSString *maxTemp;
@property (nonatomic, strong) NSString *waterLevel;//水位报警开关
/// 一键喂鱼 4 5 f有
@property (nonatomic, strong) NSString *fishFeed;
/// 功率 4 5 f有
@property (nonatomic, strong) NSString *powerRating;

13
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
View File

@ -867,7 +867,7 @@
UInt64 mac = 0;
NSLog(@"%llu",mac);
if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO2F]) {
if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F]||[self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO4F]) {
Xuanduo2Model*model=(Xuanduo2Model*)self.dataModel;
mac=[dataContorl hexToTen:model.waterTemperature];
}
@ -1076,13 +1076,18 @@
- (id)dataModel {
if (!_dataModel) {
_dataModel = nil;
if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO2F]) {
if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
{
_dataModel=[[Xuanduo3fModel alloc]init];
}
else if([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO2F]) {
_dataModel=[[Xuanduo2Model alloc]init];
}
else if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
else
{
_dataModel=[[Xuanduo3fModel alloc]init];
_dataModel=[[Xuanduo2Model alloc]init];
}
}
return _dataModel;