root
/
ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed:1.wifi频段弹框判断逻辑修改

This commit is contained in:
jiangxuefei718 2019-03-21 20:20:57 +08:00
parent d781e7d901
commit 91ef51ff82
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

2
Ifish/Info.plist
View File

@ -70,7 +70,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>539</string> <string>540</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>

13
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
View File

@ -704,7 +704,12 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
#pragma mark- 点击确定 #pragma mark- 点击确定
-(void)sBtn:(UIButton*)btn{ -(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]; UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"提示" message:@"即将使用声波连接，请调大手机音量，并靠近设备,在听到“等待连接“后再点击确认" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil];
alert.tag = ALERT_TAG_B_SURE; alert.tag = ALERT_TAG_B_SURE;
@ -963,12 +968,6 @@ withFilterContext:(id)filterContext
return; 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]; //[self initMMProgressHUD];
//最新连接效果 //最新连接效果

14
Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
View File

@ -396,7 +396,12 @@ extern BOOL isfromCameraView;
[_wifiTextFiled resignFirstResponder]; [_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]; // BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text];
// //
// if (!isRight) { // if (!isRight) {
@ -409,13 +414,6 @@ extern BOOL isfromCameraView;
[self tapConfirmForResults]; [self tapConfirmForResults];
// [self initMMProgressHUD]; // [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]; [self connectNotNormalView];
if (_maclabel) { if (_maclabel) {