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

一键喂鱼开关

This commit is contained in:
祝发冬 2022-05-23 18:56:52 +08:00
parent 20d110de4a
commit e906be6c71
1 changed files with 67 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,6 +183,7 @@
[self.controlBtn setTitle:@"一键喂鱼" forState:UIControlStateNormal]; [self.controlBtn setTitle:@"一键喂鱼" forState:UIControlStateNormal];
[self.controlBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor lightGrayColor]] forState:UIControlStateNormal]; [self.controlBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor lightGrayColor]] forState:UIControlStateNormal];
[self.controlBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor cyanColor]] forState:UIControlStateSelected]; [self.controlBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor cyanColor]] forState:UIControlStateSelected];
[self.controlBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor cyanColor]] forState:UIControlStateHighlighted];
[self.cameraBtn setTitle:@"功率" forState:UIControlStateNormal]; [self.cameraBtn setTitle:@"功率" forState:UIControlStateNormal];
[self.cameraBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor lightGrayColor]] forState:UIControlStateNormal]; [self.cameraBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor lightGrayColor]] forState:UIControlStateNormal];
[self.cameraBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor cyanColor]] forState:UIControlStateHighlighted]; [self.cameraBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor cyanColor]] forState:UIControlStateHighlighted];
@ -453,55 +454,83 @@
- (IBAction)cameraBtnClick:(id)sender { - (IBAction)cameraBtnClick:(id)sender {
if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F])//一键喂鱼
{
NSMutableArray *guanxiiArr= [[DataCenter defaultDtacenter] valueForKey:@"devicamerArr"]; }
NSString*cameraId=nil; else if([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
{
NSMutableArray *guanxiiArr= [[DataCenter defaultDtacenter] valueForKey:@"devicamerArr"];
NSString*cameraId=nil;
for (DeviceCameraModel *model in guanxiiArr) { for (DeviceCameraModel *model in guanxiiArr) {
if (model.deviceId == self.currentDevice.deviceId ) { if (model.deviceId == self.currentDevice.deviceId ) {
cameraId=model.cameraId; cameraId=model.cameraId;
break; break;
}
} }
} if (cameraId)
if (cameraId)
{
IfishCameraModel *camera;
NSArray*array=[[DataCenter defaultDtacenter]valueForKey:@"cameraArr"];
for (IfishCameraModel*model in array) {
if ([model.cameraId isEqualToString:cameraId])
{
camera=model;
break;
}
}
if (camera)
{ {
[[Socketsingleton sharedInstance] cutOffSocket]; IfishCameraModel *camera;
//进入摄像头页面 NSArray*array=[[DataCenter defaultDtacenter]valueForKey:@"cameraArr"];
IfishP2PMonitorController *p2pVC=[[IfishP2PMonitorController alloc] init]; for (IfishCameraModel*model in array) {
p2pVC.contact = camera;
[self.navigationController pushViewController:p2pVC animated:YES]; if ([model.cameraId isEqualToString:cameraId])
{
camera=model;
break;
}
}
if (camera)
{
[[Socketsingleton sharedInstance] cutOffSocket];
//进入摄像头页面
IfishP2PMonitorController *p2pVC=[[IfishP2PMonitorController alloc] init];
p2pVC.contact = camera;
[self.navigationController pushViewController:p2pVC animated:YES];
}
else
{
[self.view makeToast:@"暂无关联的摄像头"];
}
} }
else else
{ {
[self.view makeToast:@"暂无关联的摄像头"]; [self.view makeToast:@"暂无关联的摄像头"];
} }
} }
else
{
[self.view makeToast:@"暂无关联的摄像头"];
}
} }
- (IBAction)controlBtnClick:(id)sender { - (IBAction)controlBtnClick:(UIButton*)sender {
if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F])//一键喂鱼
{
sender.selected=!sender.selected;
baseModel*readModel=[[baseModel alloc]init];
readModel.sendmacId =self.currentDevice.macAddress;
readModel.resavemacId =self.currentDevice.macAddress;
readModel.functionCode=@"0c";
readModel.massagelegth=@"12";
NSString*readString=[NSString stringWithFormat:@"%@%@%@",readModel.description,[self.dataModel.fishFeedStatus isEqualToString:@"00"]?@"01":@"00",@"0000"];
NSData*readData=[dataContorl stringToHexData:readString];
[[Socketsingleton sharedInstance] soketWriteData:readData];
[_indicatorView startAnimating];
}
else if([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
{
FormatTankAddCamera*model=[[DataCenter defaultDtacenter] valueForKey:@"currentStore"]; FormatTankAddCamera*model=[[DataCenter defaultDtacenter] valueForKey:@"currentStore"];
@ -514,6 +543,7 @@
[self.navigationController pushViewController:store animated:YES]; [self.navigationController pushViewController:store animated:YES];
} }
}
} }
- (IBAction)btnActions:(UIButton *)btn { - (IBAction)btnActions:(UIButton *)btn {
if (self.dataModel.gasPump) { if (self.dataModel.gasPump) {