From 91ef51ff8288cd10785f1aa3bcf5817c8646177b Mon Sep 17 00:00:00 2001
From: jiangxuefei718 <ex_wljr_jiangxuefei@pingan.com.cn>
Date: Thu, 21 Mar 2019 20:20:57 +0800
Subject: [PATCH] =?UTF-8?q?fixed:1.wifi=E9=A2=91=E6=AE=B5=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 Ifish/Info.plist                              |   2 +-
 .../YooseeNextConnectViewController.mm        |  13 ++++++-------
 .../SecondConnectWifiController.m             |  14 ++++++--------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index bfaba153e64e6a1aa7f49de11b375a762cb57e93..30526d0ea561a14df216052c42ca2c8ea1c19ba5 100644
GIT binary patch
delta 23
fcmZoMXfc?un^~3JW8yx2MzxI}#n>0Ka0mbZV1Wlt

delta 25
hcmZoMXfc?un_2Dc&WZc<nbaR_{3yo0nU&)|KLCy&3YP!?

diff --git a/Ifish/Info.plist b/Ifish/Info.plist
index 1ed4b50..aaac507 100644
--- a/Ifish/Info.plist
+++ b/Ifish/Info.plist
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>539</string>
+	<string>540</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
index 3f1226b..0d3f526 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
@@ -704,7 +704,12 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
 #pragma mark- 点击确定
 
 -(void)sBtn:(UIButton*)btn{
-    
+    NSString *ssidName = [self.wifiName substringWithRange:NSMakeRange(self.wifiName.length-2, 2)];
+    if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
+        UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:nil, nil];
+        [alert show];
+        return;
+    }
     UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"提示" message:@"即将使用声波连接，请调大手机音量，并靠近设备,在听到“等待连接“后再点击确认" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil];
     alert.tag = ALERT_TAG_B_SURE;
     
@@ -963,12 +968,6 @@ withFilterContext:(id)filterContext
                 
                 return;
             }
-            NSString *ssidName = [self.wifiName substringWithRange:NSMakeRange(self.wifiName.length-2, 2)];
-            if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
-                UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:nil, nil];
-                [alert show];
-                return;
-            }
             //旧连接效果已去
             //[self initMMProgressHUD];
             //最新连接效果
diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
index 0135cba..215d039 100644
--- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
+++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
@@ -396,7 +396,12 @@ extern BOOL isfromCameraView;
     
     
     [_wifiTextFiled resignFirstResponder];
-    
+    NSString *ssidName = [_ssid substringWithRange:NSMakeRange(_ssid.length-2, 2)];
+    if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
+        UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:nil, nil];
+        [alert show];
+        return;
+    }
 //    BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text];
 //
 //    if (!isRight) {
@@ -409,13 +414,6 @@ extern BOOL isfromCameraView;
     [self tapConfirmForResults];
 
    // [self initMMProgressHUD];
-    NSString *ssidName = [_ssid substringWithRange:NSMakeRange(_ssid.length-2, 2)];
-    if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
-        UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:nil, nil];
-        [alert show];
-        return;
-    }
-    
     [self connectNotNormalView];
     
     if (_maclabel) {