diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
index 7f49a7d..e324469 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
@@ -183,6 +183,7 @@
         [self.controlBtn setTitle:@"一键喂鱼" 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:UIControlStateHighlighted];
         [self.cameraBtn setTitle:@"功率" forState:UIControlStateNormal];
         [self.cameraBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor lightGrayColor]] forState:UIControlStateNormal];
         [self.cameraBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor cyanColor]] forState:UIControlStateHighlighted];
@@ -453,56 +454,84 @@
 
 - (IBAction)cameraBtnClick:(id)sender {
     
-    
-    NSMutableArray *guanxiiArr= [[DataCenter defaultDtacenter] valueForKey:@"devicamerArr"];
-    NSString*cameraId=nil;
-    
-                  for (DeviceCameraModel *model in guanxiiArr) {
-                      
-                      if (model.deviceId == self.currentDevice.deviceId ) {
+    if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F])//一键喂鱼
+    {
+        
+    }
+    else if([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
+    {
+        NSMutableArray *guanxiiArr= [[DataCenter defaultDtacenter] valueForKey:@"devicamerArr"];
+        NSString*cameraId=nil;
+        
+                      for (DeviceCameraModel *model in guanxiiArr) {
                           
-                          
-                          cameraId=model.cameraId;
-                          break;
+                          if (model.deviceId == self.currentDevice.deviceId ) {
+                              
+                              
+                              cameraId=model.cameraId;
+                              break;
+                              
+                          }
                           
                       }
-                      
-                  }
-    
-    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)
+        if (cameraId)
         {
-            [[Socketsingleton sharedInstance] cutOffSocket];
-            //进入摄像头页面
-            IfishP2PMonitorController *p2pVC=[[IfishP2PMonitorController alloc] init];
-            p2pVC.contact = camera;
+            IfishCameraModel *camera;
+            NSArray*array=[[DataCenter defaultDtacenter]valueForKey:@"cameraArr"];
+            for (IfishCameraModel*model in array) {
+                
+                if ([model.cameraId isEqualToString:cameraId])
+                {
+                    camera=model;
+                    break;
+                }
+            }
             
-            [self.navigationController pushViewController:p2pVC animated:YES];
+            if (camera)
+            {
+                [[Socketsingleton sharedInstance] cutOffSocket];
+                //进入摄像头页面
+                IfishP2PMonitorController *p2pVC=[[IfishP2PMonitorController alloc] init];
+                p2pVC.contact = camera;
+                
+                [self.navigationController pushViewController:p2pVC animated:YES];
+            }
+            else
+            {
+                [self.view makeToast:@"暂无关联的摄像头"];
+            }
         }
         else
         {
             [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"];
     
     if (model)
@@ -514,6 +543,7 @@
         [self.navigationController pushViewController:store animated:YES];
         
     }
+    }
 }
 - (IBAction)btnActions:(UIButton *)btn {
     if (self.dataModel.gasPump) {