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

提示语修改

This commit is contained in:
kai60 2020-07-09 20:14:07 +08:00
parent 3e761fb35b
commit 3471449872
2 changed files with 11 additions and 11 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 = 27; CURRENT_PROJECT_VERSION = 28;
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 = 27; CURRENT_PROJECT_VERSION = 28;
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,10 +173,10 @@ Copy NSString *deviceId;
msg=@"设备类型不匹配,请重新选择入口绑定"; msg=@"设备类型不匹配,请重新选择入口绑定";
} }
self.HUD.labelText = msg; [self.HUD hide:YES];
[self.progressView endProgressWithString:msg];
[self.HUD hide:YES afterDelay:2]; [self.view makeToast:msg];
}else if ([resultDic[@"result"] isEqualToString:@"301"]){ }else if ([resultDic[@"result"] isEqualToString:@"301"]){
[self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"]; [self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"];
@ -384,6 +384,7 @@ Copy NSString *deviceId;
#pragma mark - bind #pragma mark - bind
-(void)bindDeviceWithSsid:(NSString*)bssid{ -(void)bindDeviceWithSsid:(NSString*)bssid{
NSLog(@"设备bssid_%@",bssid); NSLog(@"设备bssid_%@",bssid);
bssid=@"ecfabc6f9329";
[self appendTrakContent:@"=================进入绑定函数================="]; [self appendTrakContent:@"=================进入绑定函数================="];
NSString *userId = [dataContorl dataControlGetUserIdInfo]; NSString *userId = [dataContorl dataControlGetUserIdInfo];
self.HUD.labelText = @"正在绑定设备"; self.HUD.labelText = @"正在绑定设备";
@ -457,10 +458,9 @@ Copy NSString *deviceId;
{ {
msg=@"设备类型不匹配,请重新选择入口绑定"; msg=@"设备类型不匹配,请重新选择入口绑定";
} }
[self.HUD hide:YES];
self.HUD.labelText = msg;
[self.progressView endProgressWithString:msg]; [self.view makeToast:msg];
[self.HUD hide:YES afterDelay:2];
}else if ([resultDic[@"result"] isEqualToString:@"301"]){ }else if ([resultDic[@"result"] isEqualToString:@"301"]){
@ -479,7 +479,7 @@ Copy NSString *deviceId;
} failure:^(NSError *err) { } failure:^(NSError *err) {
if (self.retryTimes < 3) { if (self.retryTimes < 6) {
[self bindDeviceWithSsid:self.macAddress]; [self bindDeviceWithSsid:self.macAddress];
self.retryTimes += 1; self.retryTimes += 1;
} else { } else {