diff --git a/.DS_Store b/.DS_Store index bfaba15..30526d0 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish/Info.plist b/Ifish/Info.plist index 1ed4b50..aaac507 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 539 + 540 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index 3f1226b..0d3f526 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -704,7 +704,12 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { #pragma mark- 点击确定 -(void)sBtn:(UIButton*)btn{ - + 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; + } UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"提示" message:@"即将使用声波连接,请调大手机音量,并靠近设备,在听到“等待连接“后再点击确认" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil]; alert.tag = ALERT_TAG_B_SURE; @@ -963,12 +968,6 @@ 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]; //最新连接效果 diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m index 0135cba..215d039 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m @@ -396,7 +396,12 @@ extern BOOL isfromCameraView; [_wifiTextFiled resignFirstResponder]; - + 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; + } // BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text]; // // if (!isRight) { @@ -409,13 +414,6 @@ 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]; if (_maclabel) {