宠物笼绑定界面修改，不同类型弹框

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 = 21;
+				CURRENT_PROJECT_VERSION = 23;
 				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 = 21;
+				CURRENT_PROJECT_VERSION = 23;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;

Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m

@@ -320,7 +320,7 @@ Copy NSString *deviceId;
         mask.alpha=0.5;
         _mask=mask;
         UITapGestureRecognizer*tap=[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(dismissStore)];
-        [mask addGestureRecognizer:tap];
+        //[mask addGestureRecognizer:tap];
     }
     
     return _mask;
@@ -330,6 +330,7 @@ Copy NSString *deviceId;
     [self.storeNameView removeFromSuperview];
     [self.mask removeFromSuperview];
     [self.progressView endProgressWithString:@"绑定已经取消..."];
+    [self.navigationController popViewControllerAnimated:YES];
 }
 -(void)showStoreNameView
 {
@@ -349,9 +350,10 @@ Copy NSString *deviceId;
     };
     store.sureBlock=^(NSString*name)
     {
-        if (!name)
+        if (!name.length)
         {
-            name=@"宠物店";
+            [weakSelf.view makeToast:@"请设置或者选择名称！"];
+            return ;
         }
         [weakSelf.mask removeFromSuperview];
          [weakSelf.storeNameView removeFromSuperview];
@@ -430,6 +432,18 @@ 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];
             
         }else if ([resultDic[@"result"] isEqualToString:@"301"]){
             [self appendTrakContent:@"绑定返回状态码错误。设备信息为:%@"];

Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm

@@ -523,26 +523,9 @@ self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像
            [self.view makeToast:[NSString stringWithFormat:@"WiFi连接失败，请确保手机连接到%@",self.wifiName]];
         }
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-               
+            
-            UIViewController*choosewifi=nil;
+            [self.navigationController popViewControllerAnimated:YES];
-            for (UIViewController*controller in self.navigationController.viewControllers) {
+        });
-                
-                if ([controller isKindOfClass:[ConAquarNowWiFiPwdVC class]])
-                {
-                    choosewifi=controller;
-                    break;
-                }
-            }
-            if (choosewifi)
-            {
-                [self.navigationController popToViewController:choosewifi animated:YES];
-            }
-            else
-            {
-                [self connectNormalView];
-            }
-               
-           });
         
     }
     else if(!self.deviceID.length)

Ifish/controllers/leftcontrollers/ConnectWifiViewController.m

@@ -472,7 +472,18 @@ extern BOOL formLogIn;//连接页面是否来自登录界面
                
         
             }else if ([resultDic[@"result"] isEqualToString:@"101"]){
-                [self showTitle:@"" messsage:@"绑定失败"];
+               NSString*msg= resultDic[@"data"];
+                           
+                           if ([msg isKindOfClass:[NSString class]]&&msg.length&&![msg isEqualToString:@"null"])
+                           {
+                               
+                           }
+                           else
+                           {
+                               msg=@"绑定失败";
+                           }
+                           
+                           [self.view makeToast:msg];
                 self.bakbutton.userInteractionEnabled=YES;
             }else if ([resultDic[@"result"] isEqualToString:@"301"]){
                 [self showTitle:@"" messsage:@"请求验证失败，请重新登录"];

Ifish/controllers/leftcontrollers/SecondConnectWifiController.m

@@ -699,7 +699,7 @@ extern BOOL isfromCameraView;
         mask.alpha=0.5;
         _mask=mask;
         UITapGestureRecognizer*tap=[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(dismissStore)];
-        [mask addGestureRecognizer:tap];
+       // [mask addGestureRecognizer:tap];
     }
     
     return _mask;
@@ -727,6 +727,11 @@ extern BOOL isfromCameraView;
     };
     store.sureBlock=^(NSString*name)
     {
+        if (!name.length)
+        {
+            [weakSelf.view makeToast:@"请设置或者选择名称！"];
+            return ;
+        }
         [weakSelf.mask removeFromSuperview];
         [weakSelf.storeNameView removeFromSuperview];
         weakSelf.storeName=name;
@@ -828,7 +833,18 @@ extern BOOL isfromCameraView;
             
         }else if ([resultDic[@"result"] isEqualToString:@"101"]){
     
-            [self.view makeToast:@"绑定失败"];
+            NSString*msg= resultDic[@"data"];
+            
+            if ([msg isKindOfClass:[NSString class]]&&msg.length&&![msg isEqualToString:@"null"])
+            {
+                
+            }
+            else
+            {
+                msg=@"绑定失败";
+            }
+            
+            [self.view makeToast:msg];
             self.bakbutton.userInteractionEnabled=YES;
             NSString *str =[NSString stringWithFormat:@"mac%@错误吗101",bssid];
             [self initMacIdString:str];