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

fixed:wifi 5G弹框样式修改

This commit is contained in:
jiangxuefei718 2019-03-20 15:31:16 +08:00
parent a1f9494a73
commit d27709b0cd
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ifish/Info.plist
View File

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

5
Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
View File

@ -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");
}

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

@ -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{

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

@ -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];