From 73b993aea964a24fd4f05894bf290c50a6586fb3 Mon Sep 17 00:00:00 2001 From: jiangxuefei718 Date: Tue, 19 Mar 2019 16:37:57 +0800 Subject: [PATCH] =?UTF-8?q?fixed:1.wifi=E9=A2=91=E6=AE=B5=E5=88=A4?= =?UTF-8?q?=E6=96=AD=20=09=202.=E8=A7=A3=E5=86=B3=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=A1=B5=E9=9D=A2=20iphonex=20=E6=96=87?= =?UTF-8?q?=E5=AD=97=E9=81=AE=E7=9B=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 6148 bytes .../RunSun84biteCenterViewController.m | 8 ++++---- .../YooseeNextConnectViewController.mm | 5 ++++- .../SecondConnectWifiController.m | 4 ++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.DS_Store b/.DS_Store index a641f5583f4b18e4b0f5629efff15a2987fe2f82..bfaba153e64e6a1aa7f49de11b375a762cb57e93 100644 GIT binary patch delta 23 fcmZoMXfc?uhw1IkiTex~A8h<6#=e=A<3B$DfiwzA delta 23 fcmZoMXfc?uhbjBg#C-;g2^&9(v2SMO_|Fdjb&CmM 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]; + } }