From 40d2244f5c32052121dc1a3ee931a414ab7fb121 Mon Sep 17 00:00:00 2001 From: kai60 Date: Thu, 9 Jul 2020 14:36:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 4 ++-- .../ConnectAauariumVC/ConnectingAquarVC.m | 18 ++++++++++-------- .../SecondConnectWifiController.m | 1 + 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 7ca3648..fea6941 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -15753,7 +15753,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 27; 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 = 25; + CURRENT_PROJECT_VERSION = 27; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; diff --git a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m index ebc5d24..c121954 100644 --- a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m +++ b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m @@ -173,8 +173,10 @@ Copy NSString *deviceId; msg=@"绑定失败"; } - [self.view makeToast:msg]; - [self.navigationController popViewControllerAnimated:YES]; + self.HUD.labelText = msg; + [self.progressView endProgressWithString:msg]; + [self.HUD hide:YES afterDelay:2]; + }else if ([resultDic[@"result"] isEqualToString:@"301"]){ [self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"]; @@ -343,7 +345,7 @@ Copy NSString *deviceId; [self.storeNameView removeFromSuperview]; [self.mask removeFromSuperview]; [self.progressView endProgressWithString:@"绑定已经取消..."]; - [self.navigationController popViewControllerAnimated:YES]; + } -(void)showStoreNameView { @@ -443,7 +445,7 @@ Copy NSString *deviceId; }else if ([resultDic[@"result"] isEqualToString:@"101"]){ [self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"]; - self.HUD.labelText = @"绑定失败"; + self.bakbutton.userInteractionEnabled=YES; NSString*msg= resultDic[@"data"]; @@ -456,10 +458,10 @@ Copy NSString *deviceId; msg=@"绑定失败"; } - [self.view makeToast:msg]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.navigationController popViewControllerAnimated:YES]; - }); + self.HUD.labelText = msg; + [self.progressView endProgressWithString:msg]; + [self.HUD hide:YES afterDelay:2]; + }else if ([resultDic[@"result"] isEqualToString:@"301"]){ [self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"]; diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m index c38e631..0c8a5d1 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m @@ -286,6 +286,7 @@ extern BOOL isfromCameraView; [self.view addSubview:_maclabel]; [self.view bringSubviewToFront:_maclabel]; + self.bakbutton.userInteractionEnabled=YES; [self mmPogressHUDdismiss]; [self connectNormalView]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{