From 4bb3f1dcd5a2f211e18825dac795a72442ed23db Mon Sep 17 00:00:00 2001 From: kai60 Date: Wed, 22 Jul 2020 21:17:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E8=BF=9E=E6=8E=A5=E9=97=AA?= =?UTF-8?q?=E9=80=80=E9=97=AE=E9=A2=98=EF=BC=8C=E7=83=AD=E7=82=B9=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=8F=90=E7=A4=BA=E4=BF=AE=E5=A4=8D=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=AF=BB=E8=AF=BB=E5=8F=96=E5=AE=9A=E6=97=B6=E5=99=A8?= =?UTF-8?q?hud=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m | 5 +++++ .../CenterontrolControllers/XuTo/Xuanduo2SettingController.m | 2 +- Ifish/controllers/leftcontrollers/IFishHotpotUDPHelper.m | 2 +- .../leftcontrollers/SecondConnectWifiController.m | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m index fae6f36..f337e3d 100644 --- a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m +++ b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m @@ -320,6 +320,11 @@ Copy NSString *deviceId; self.HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; self.HUD.mode = MBProgressHUDModeIndeterminate; self.HUD.labelText = msg; + if ([msg isEqualToString:@"Socket连接失败"]) + { + [self.HUD hide:YES afterDelay:3]; + [self endProgress]; + } } -(void)endProgress{ [self.progressView endProgressWithString:@"连接结束"]; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m index f23d97a..0e7cbeb 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m @@ -713,7 +713,7 @@ static NSString *setTimerflag = @"SetTimerCell"; NSLog(@"read str = %@",readString); NSData*readData=[dataContorl stringToHexData:readString]; [[Socketsingleton sharedInstance] soketWriteData:readData]; - [_indicatorView startAnimating]; + ; } else if ([group isKindOfClass: [XuanduoCycleModel class] ]) { diff --git a/Ifish/controllers/leftcontrollers/IFishHotpotUDPHelper.m b/Ifish/controllers/leftcontrollers/IFishHotpotUDPHelper.m index c1870c9..9f2c573 100644 --- a/Ifish/controllers/leftcontrollers/IFishHotpotUDPHelper.m +++ b/Ifish/controllers/leftcontrollers/IFishHotpotUDPHelper.m @@ -166,7 +166,7 @@ -(void)onUdpSocket:(AsyncUdpSocket *)sock didNotReceiveDataWithTag:(long)tag dueToError:(NSError *)error{ NSLog(@"dueToError%@",error); - [self postmsg:error.localizedDescription]; + [self postmsg:@"Socket连接失败"]; } diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m index 0c8a5d1..01f5862 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m @@ -287,7 +287,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(), ^{ [self.view makeToast:@"设备类型不匹配,请重新选择入口绑定"];