From 3471449872326d49e124096c575a40d63f0eae40 Mon Sep 17 00:00:00 2001
From: kai60 <zhufadong@163.com>
Date: Thu, 9 Jul 2020 20:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=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 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj
index fea6941..e23ad37 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 = 27;
+				CURRENT_PROJECT_VERSION = 28;
 				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 = 27;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
diff --git a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
index f2ca321..a1748fa 100644
--- a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
+++ b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
@@ -173,10 +173,10 @@ Copy NSString *deviceId;
                            msg=@"设备类型不匹配,请重新选择入口绑定";
                        }
                        
-                    self.HUD.labelText = msg;
-             [self.progressView endProgressWithString:msg];
-                       [self.HUD hide:YES afterDelay:2];
-                       
+                    [self.HUD hide:YES];
+
+                    [self.view makeToast:msg];
+
             
         }else if ([resultDic[@"result"] isEqualToString:@"301"]){
             [self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"];
@@ -384,6 +384,7 @@ Copy NSString *deviceId;
 #pragma mark - bind
 -(void)bindDeviceWithSsid:(NSString*)bssid{
     NSLog(@"设备bssid_%@",bssid);
+    bssid=@"ecfabc6f9329";
     [self appendTrakContent:@"=================进入绑定函数================="];
     NSString *userId = [dataContorl dataControlGetUserIdInfo];
     self.HUD.labelText = @"正在绑定设备";
@@ -457,10 +458,9 @@ Copy NSString *deviceId;
             {
                 msg=@"设备类型不匹配,请重新选择入口绑定";
             }
-            
-            self.HUD.labelText = msg;
-             [self.progressView endProgressWithString:msg];
-             [self.HUD hide:YES afterDelay:2];
+            [self.HUD hide:YES];
+
+            [self.view makeToast:msg];
             
             
         }else if ([resultDic[@"result"] isEqualToString:@"301"]){
@@ -479,7 +479,7 @@ Copy NSString *deviceId;
         
         
     } failure:^(NSError *err) {
-        if (self.retryTimes < 3) {
+        if (self.retryTimes < 6) {
             [self bindDeviceWithSsid:self.macAddress];
             self.retryTimes += 1;
         } else {