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

不匹配设备提示修改

This commit is contained in:
kai60 2020-07-08 17:46:23 +08:00
parent f9b3f4074f
commit 85b94bccf8
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ifish.xcodeproj/project.pbxproj
View File

@ -15753,7 +15753,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 23;
CURRENT_PROJECT_VERSION = 24;
DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES;
@ -15871,7 +15871,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 23;
CURRENT_PROJECT_VERSION = 24;
DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES;

14
Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
View File

@ -162,6 +162,19 @@ Copy NSString *deviceId;
[self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"];
self.HUD.labelText = @"绑定失败";
self.bakbutton.userInteractionEnabled=YES;
NSString*msg= resultDic[@"data"];
if ([msg isKindOfClass:[NSString class]]&&msg.length&&![msg isEqualToString:@"null"])
{
}
else
{
msg=@"绑定失败";
}
[self.view makeToast:msg];
[self.navigationController popViewControllerAnimated:YES];
}else if ([resultDic[@"result"] isEqualToString:@"301"]){
[self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"];
@ -444,6 +457,7 @@ Copy NSString *deviceId;
}
[self.view makeToast:msg];
[self.navigationController popViewControllerAnimated:YES];
}else if ([resultDic[@"result"] isEqualToString:@"301"]){
[self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"];

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

@ -286,6 +286,11 @@ extern BOOL isfromCameraView;
[self.view addSubview:_maclabel];
[self.view bringSubviewToFront:_maclabel];
[self mmPogressHUDdismiss];
[self connectNormalView];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self.view makeToast:@"设备类型不匹配,请重新选择入口绑定"];
});
}
- (void)didReceiveMemoryWarning {