diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj
index f1f1e43..b7aad42 100644
--- a/Ifish.xcodeproj/project.pbxproj
+++ b/Ifish.xcodeproj/project.pbxproj
@@ -16025,7 +16025,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -16145,7 +16145,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
diff --git a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
index ab3b55b..15dba51 100644
--- a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
+++ b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
@@ -279,7 +279,7 @@ Copy NSString *deviceId;
         }
         else
         {
-            if (self.isBindingDevice) {
+            if (self.isBindingDevice||self.storeNameView) {
                 return;
             }
             if (self.macAddress.length == 0) {
@@ -357,6 +357,7 @@ Copy NSString *deviceId;
 {
     [self.storeNameView removeFromSuperview];
     [self.mask removeFromSuperview];
+    self.storeNameView =nil;
     [self.progressView endProgressWithString:@"绑定已经取消..."];
    
 }
@@ -364,14 +365,20 @@ Copy NSString *deviceId;
 {
     [self.HUD hide:YES];
     [self.storeNameView removeFromSuperview];
+    if (self.bindTimer) {
+        [self.bindTimer invalidate];
+        self.bindTimer = nil;
+    }
     StoreNameView*store=[[[NSBundle mainBundle] loadNibNamed:@"StoreNameView" owner:self options:nil] lastObject];
     store.frame=CGRectMake((SCREEN_WIDTH-280)/2.0, 100, 280, 280);
     
     self.storeNameView=store;
+    
     WEAK_SELF;
     store.cancelBlock=^(){
         [weakSelf.mask removeFromSuperview];
          [weakSelf.storeNameView removeFromSuperview];
+        weakSelf.storeNameView =nil;
         [weakSelf.HUD show:YES];
         [weakSelf.progressView endProgressWithString:@"绑定已经取消..."];
         
@@ -385,6 +392,7 @@ Copy NSString *deviceId;
         }
         [weakSelf.mask removeFromSuperview];
          [weakSelf.storeNameView removeFromSuperview];
+        weakSelf.storeNameView =nil;
         weakSelf.storeName=name;
         [self bindDeviceWithSsid:self.macAddress];
          [weakSelf.HUD show:YES];
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m
index 2505083..6023e35 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m
@@ -187,7 +187,13 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
     label.textColor=[UIColor whiteColor];
     label.font=[UIFont systemFontOfSize:12];
     label.numberOfLines=0;
-    label.text=@"将设备关联至一键喂鱼功能后,点击一键喂鱼开关时,所有关联的设备会同时按照设置好的操作执行，如您将循环泵、增氧泵、灯光1三个设备关联至一键喂鱼功能,并将循环泵设置关闭,增氧泵设置关闭,灯光1设置打开，喂鱼时，点击一键喂鱼按钮，系统将会把循环泵和增氧泵进行关闭，灯光1打开，方便鱼儿进食10分钟后，喂鱼结束，系统会自动恢复喂鱼前的设备状态(如果关联的设备有定时,会按照定时执行)。";
+    NSString*lightname=@"增氧泵";
+    if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO5F])
+    {
+        lightname=@"蛋分器";
+    }
+
+    label.text=[NSString stringWithFormat:@"将设备关联至一键喂鱼功能后,点击一键喂鱼开关时,所有关联的设备会同时按照设置好的操作执行，如您将循环泵、%@、灯光1三个设备关联至一键喂鱼功能,并将循环泵设置关闭,%@设置关闭,灯光1设置打开，喂鱼时，点击一键喂鱼按钮，系统将会把循环泵和%@进行关闭，灯光1打开，方便鱼儿进食10分钟后，喂鱼结束，系统会自动恢复喂鱼前的设备状态(如果关联的设备有定时,会按照定时执行)。",lightname,lightname,lightname];
     CGSize size= [label.text boundingRectWithSize:CGSizeMake(300, MAXFLOAT) options:(NSStringDrawingUsesFontLeading | NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName: label.font} context:NULL].size;
     label.frame=CGRectMake((kScreenWidth-size.width)/2.0, CGRectGetMaxY(self.tableView.frame)+20, size.width, size.height);
     [self.view addSubview:label];