diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index d676d60..239669a 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 = 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; diff --git a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m index 6a40c25..d96e1bc 100644 --- a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m +++ b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m @@ -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:@"绑定返回状态码错误。设备信息为:%@"]; diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m index fc0d9c9..12898e2 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m @@ -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 {