diff --git a/.DS_Store b/.DS_Store
index a641f55..bfaba15 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
index 4be0528..6fdb753 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
@@ -114,7 +114,7 @@
     for (int i = 0; i < 3; i ++) {
         
         self.button = [[UIButton alloc] init] ;
-        self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -10 - 10 , btnControlWith, btnControlWith +11);
+        self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -(is_iPhone_X?40:20) , btnControlWith, btnControlWith +11);
         
         [self.button setImage:[UIImage imageNamed:nameArr[i]] forState:UIControlStateNormal];
         //self.button.backgroundColor = [UIColor redColor];
@@ -122,7 +122,7 @@
         [self.button  addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside];
         
         
-        self.chName = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -20 + btnControlWith -5 , btnControlWith, btnControlPlace - 5)];
+        self.chName = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -20 + btnControlWith -5-(is_iPhone_X?20:0) , btnControlWith, btnControlPlace - 5)];
         //textLbl.backgroundColor = [UIColor blackColor];
         self.chName.textColor = [UIColor colorWithRed:250/255.0f green:255/255.0f blue:255/254.0f alpha:1];
         self.chName.textAlignment = NSTextAlignmentCenter;
@@ -155,7 +155,7 @@
     
     for (int i = 0; i < 3; i ++) {
         self.button = [[UIButton alloc] init] ;
-        self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -25 -5 , btnControlWith, btnControlWith + 11);
+        self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -(is_iPhone_X?50:30) , btnControlWith, btnControlWith + 11);
         
         
         [self.button setImage:[UIImage imageNamed:nameArr[i+3]]forState:UIControlStateNormal];
@@ -163,7 +163,7 @@
         self.button.tag= 6003+i;
         [self.button  addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside];
         
-        UILabel* textLbl = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -35 + btnControlWith, btnControlWith, btnControlPlace - 5)];
+        UILabel* textLbl = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -35 + btnControlWith-(is_iPhone_X?20:0), btnControlWith, btnControlPlace - 5)];
         //textLbl.backgroundColor = [UIColor blackColor];
         textLbl.textAlignment = NSTextAlignmentCenter;
         textLbl.textColor = [UIColor colorWithRed:250/255.0f green:255/255.0f blue:255/254.0f alpha:1];
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
index 9a03c80..036e4d3 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
@@ -1054,7 +1054,10 @@ 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 26904d0..7ff104c 100644
--- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
+++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
@@ -253,6 +253,10 @@ 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];
+    }
 
 }