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

提示修改

This commit is contained in:
kai60 2020-07-09 14:36:21 +08:00
parent 2c5b0ce881
commit 40d2244f5c
3 changed files with 13 additions and 10 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 = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 25; CURRENT_PROJECT_VERSION = 27;
DEVELOPMENT_TEAM = WFX8GD5HFX; DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
@ -15871,7 +15871,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 25; CURRENT_PROJECT_VERSION = 27;
DEVELOPMENT_TEAM = WFX8GD5HFX; DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;

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

@ -173,8 +173,10 @@ Copy NSString *deviceId;
msg=@"绑定失败"; msg=@"绑定失败";
} }
[self.view makeToast:msg]; self.HUD.labelText = msg;
[self.navigationController popViewControllerAnimated:YES]; [self.progressView endProgressWithString:msg];
[self.HUD hide:YES afterDelay:2];
}else if ([resultDic[@"result"] isEqualToString:@"301"]){ }else if ([resultDic[@"result"] isEqualToString:@"301"]){
[self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"]; [self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"];
@ -343,7 +345,7 @@ Copy NSString *deviceId;
[self.storeNameView removeFromSuperview]; [self.storeNameView removeFromSuperview];
[self.mask removeFromSuperview]; [self.mask removeFromSuperview];
[self.progressView endProgressWithString:@"绑定已经取消..."]; [self.progressView endProgressWithString:@"绑定已经取消..."];
[self.navigationController popViewControllerAnimated:YES];
} }
-(void)showStoreNameView -(void)showStoreNameView
{ {
@ -443,7 +445,7 @@ Copy NSString *deviceId;
}else if ([resultDic[@"result"] isEqualToString:@"101"]){ }else if ([resultDic[@"result"] isEqualToString:@"101"]){
[self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"]; [self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"];
self.HUD.labelText = @"绑定失败";
self.bakbutton.userInteractionEnabled=YES; self.bakbutton.userInteractionEnabled=YES;
NSString*msg= resultDic[@"data"]; NSString*msg= resultDic[@"data"];
@ -456,10 +458,10 @@ Copy NSString *deviceId;
msg=@"绑定失败"; msg=@"绑定失败";
} }
[self.view makeToast:msg]; self.HUD.labelText = msg;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [self.progressView endProgressWithString:msg];
[self.navigationController popViewControllerAnimated:YES]; [self.HUD hide:YES afterDelay:2];
});
}else if ([resultDic[@"result"] isEqualToString:@"301"]){ }else if ([resultDic[@"result"] isEqualToString:@"301"]){
[self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"]; [self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"];

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

@ -286,6 +286,7 @@ extern BOOL isfromCameraView;
[self.view addSubview:_maclabel]; [self.view addSubview:_maclabel];
[self.view bringSubviewToFront:_maclabel]; [self.view bringSubviewToFront:_maclabel];
self.bakbutton.userInteractionEnabled=YES;
[self mmPogressHUDdismiss]; [self mmPogressHUDdismiss];
[self connectNormalView]; [self connectNormalView];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{