diff --git a/Ifish/Info.plist b/Ifish/Info.plist
index 014ced4..1ed4b50 100644
--- a/Ifish/Info.plist
+++ b/Ifish/Info.plist
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>535</string>
+	<string>539</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
index 3fe8b40..79b168f 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
@@ -170,7 +170,7 @@
     ;
    
     [self.rightPopButton setImage:MyEquipmentImage forState:UIControlStateNormal];
-    self.rightPopButton.frame=CGRectMake(0,0,60,44);
+    self.rightPopButton.frame=CGRectMake(kScreenWidth-60,0,60,44);
     [self.rightPopButton setImageEdgeInsets:UIEdgeInsetsMake(0, 30, 0, 0)];
     
     [self.rightPopButton addTarget:self action:@selector(presentPopView) forControlEvents:UIControlEventTouchUpInside];
@@ -378,8 +378,7 @@
     
     popover.arrowSize = CGSizeMake(0.0,0.0);
     
-    [popover showAtView:self.rightPopButton withContentView:pop];
-    
+    [popover showAtView:self.setImag withContentView:pop];    
     NSLog(@"设备右侧pop");
     
 }
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
index 036e4d3..3f1226b 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
@@ -963,6 +963,12 @@ withFilterContext:(id)filterContext
                 
                 return;
             }
+            NSString *ssidName = [self.wifiName substringWithRange:NSMakeRange(self.wifiName.length-2, 2)];
+            if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
+                UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:nil, nil];
+                [alert show];
+                return;
+            }
             //旧连接效果已去
             //[self initMMProgressHUD];
             //最新连接效果
@@ -1054,10 +1060,6 @@ withFilterContext:(id)filterContext
     self.sBtn.hidden = YES;
     self.nodImg.hidden = YES;
     self.redTipLable.hidden=YES;
-    NSString *ssidName = [self.wifiName substringWithRange:NSMakeRange(self.wifiName.length-2, 2)];
-    if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
-        UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:@"", nil];
-    }
 }
 
 -(void)wifiviewkeyboardWillHide:(NSNotification *)notify{
diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
index 7ff104c..0135cba 100644
--- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
+++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
@@ -253,10 +253,6 @@ extern BOOL isfromCameraView;
     self.shareButton.hidden = YES;
     self.nodImg.hidden = YES;
     self.redTextLable.hidden=YES;
-    NSString *ssidName = [_ssid substringWithRange:NSMakeRange(_ssid.length-2, 2)];
-    if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
-        UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:@"", nil];
-    }
 
 }
 
@@ -413,6 +409,12 @@ extern BOOL isfromCameraView;
     [self tapConfirmForResults];
 
    // [self initMMProgressHUD];
+    NSString *ssidName = [_ssid substringWithRange:NSMakeRange(_ssid.length-2, 2)];
+    if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
+        UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:nil, nil];
+        [alert show];
+        return;
+    }
     
     [self connectNotNormalView];