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

微信登陆，bug修改

Browse Source
This commit is contained in:
kai60
2020-01-09 09:25:43 +08:00
parent 82590f8fba
commit bfb68dd81c
62 changed files with 5105 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
+22 -15
View File
@@ -12,21 +12,28 @@
+(void)readSocketDataWithBackMsgModel:(Xuanduo2Model*)xuanduoModel addWithBackData:(NSData*)data{
NSString *dataString = [dataContorl dataToHexString:data];// 转十六进制
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.electricity = [dataString substringWithRange:NSMakeRange(70, 4)];
xuanduoModel.alarmSwitch = [dataString substringWithRange:NSMakeRange(74, 2)];
xuanduoModel.miniTemp = [dataString substringWithRange:NSMakeRange(76, 4)];
xuanduoModel.maxTemp = [dataString substringWithRange:NSMakeRange(80, 4)];
@try {
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.electricity = [dataString substringWithRange:NSMakeRange(70, 4)];
xuanduoModel.alarmSwitch = [dataString substringWithRange:NSMakeRange(74, 2)];
xuanduoModel.miniTemp = [dataString substringWithRange:NSMakeRange(76, 4)];
xuanduoModel.maxTemp = [dataString substringWithRange:NSMakeRange(80, 4)];
} @catch (NSException *exception) {
} @finally {
}
}
+(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*)backModel{
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
+1 -1
View File
@@ -99,7 +99,7 @@
[self initCHNames];
[Socketsingleton sharedInstance].communiteDelegate = self;
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tempSwitch)];
[self.tempLabel addGestureRecognizer:tap];
// [self.tempLabel addGestureRecognizer:tap];
[self creatRefreshView];
}