diff --git a/Ifish/Info.plist b/Ifish/Info.plist index d7674d7..b8adc97 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 6 + 9 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Ifish/Utinitys/dataUnity/dataContorl.m b/Ifish/Utinitys/dataUnity/dataContorl.m index ab92885..d9f83c0 100644 --- a/Ifish/Utinitys/dataUnity/dataContorl.m +++ b/Ifish/Utinitys/dataUnity/dataContorl.m @@ -660,9 +660,14 @@ //判断是否包含特殊字符串 即非数字字母下划线 +(BOOL)isIncludeSpecialCharact:(NSString *)str { - NSString *regex =@"(^[a-zA-Z0-9_\u4e00-\u9fa5]+$)"; - NSPredicate * pred = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regex]; - BOOL isRight = [pred evaluateWithObject:str]; +// NSString *regex =@"(^[a-zA-Z0-9_\u4e00-\u9fa5]+$)"; +// NSPredicate * pred = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regex]; +// BOOL isRight = [pred evaluateWithObject:str]; + + BOOL isRight=YES;//仅有“‘不可以 + if ([str containsString:@"’"]||[str containsString:@"”"]||[str containsString:@"'"]||[str containsString:@"\""]) { + isRight=NO; + } return isRight; } diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.m b/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.m index d1dc6db..101342c 100644 --- a/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.m +++ b/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.m @@ -230,7 +230,7 @@ Strong UIButton *nextBtn; BOOL isRight =[dataContorl isIncludeSpecialCharact:self.wifiPwdTextField.text]; if (!isRight) { - [self.view makeToast:@"路由器密码不能包含特殊字符，只能为数字、字母或下划线"]; + [self.view makeToast:@"您输入的密码带特殊符号，请更改路由器密码。"]; return; } [self.wifiPwdTextField resignFirstResponder]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.h b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.h index f14d9bb..148f9da 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.h +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.h @@ -8,6 +8,7 @@ #import #import "GCDAsyncUdpSocket.h" +#import "dataContorl.h" #define ALERT_TAG_SET_FAILED 0 #define ALERT_TAG_SET_SUCCESS 1 #define ALERT_TAG_B_SURE 2 @@ -15,6 +16,7 @@ #import "MMProgressHUD.h" #import "MMProgressHUDOverlayView.h" #import "ConAquarNowWiFiPwdVC.h" + enum { conectType_Intelligent, diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index d0a42f1..764f3c6 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -198,8 +198,10 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { CGFloat wifiFileH=wifiFileW*percentHbiW; self.wifiSecFiled=[[UITextField alloc] initWithFrame:CGRectMake(10,CGRectGetMaxY(self.wifilabel.frame) + 10, wifiFileW, wifiFileH)]; + self.wifiSecFiled.placeholder = @"请输入WiFi密码"; self.wifiSecFiled.delegate=self; + self.wifiSecFiled.keyboardType=UIKeyboardTypeAlphabet; self.wifiSecFiled.layer.masksToBounds=YES; self.wifiSecFiled.layer.cornerRadius=5; if (@available(iOS 13.0, *)){//iOS13之后，设置颜色的方便变更 @@ -258,7 +260,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { self.attentionLabel.font=[UIFont systemFontOfSize:13]; self.attentionLabel.textColor=[UIColor blackColor]; self.attentionLabel.numberOfLines=0; -self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像头。\n2、若Wifi名称有中文，请改成英文字母加数字。\n3、Wifi密码不能包含特殊符号（如,.’“!@等）。\n4、若多次智能连接未成功，请尝试热点模式连接。"; +self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像头。\n2、若Wifi名称有中文，请改成英文字母加数字。\n3、Wifi密码不能包含特殊符号（如‘“等）。\n4、若多次智能连接未成功，请尝试热点模式连接。"; [self.view addSubview:self.waveProgressView]; [self.view bringSubviewToFront:self.waveProgressView]; [self.view addSubview:self.attentionLabel]; @@ -317,6 +319,12 @@ self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像 [alert show]; return; } + BOOL isRight =[dataContorl isIncludeSpecialCharact:self.wifiSecFiled.text]; + + if (!isRight) { + [self.view makeToast:@"您输入的密码带特殊符号，请更改路由器密码。"]; + return; + } UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"提示" message:@"即将使用声波连接，请调大手机音量，并靠近设备,确认设备已经重置（按复位小孔，听到“等待连接“或者“滴”）后再点击确认" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil]; alert.tag = ALERT_TAG_B_SURE; diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m index 3e756d8..57e5338 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m @@ -161,7 +161,7 @@ Copy NSString *wifiName;//当前wifi名称 BOOL isRight =[dataContorl isIncludeSpecialCharact:self.pwdTf.text]; if (!isRight) { - [self.view makeToast:@"路由器密码不能包含特殊字符，只能为数字字母下划线"]; + [self.view makeToast:@"您输入的密码带特殊符号，请更改路由器密码。"]; return; } diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m index 28316e4..4e62661 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m @@ -402,13 +402,13 @@ extern BOOL isfromCameraView; [alert show]; return; } -// BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text]; -// -// if (!isRight) { -// [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"]; -// -// return; -// } + BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text]; + + if (!isRight) { + [self.view makeToast:@"您输入的密码带特殊符号，请更改路由器密码。"]; + + return; + } [self savePassw]; [self tapConfirmForResults]; diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib index 6496494..52c9ba2 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib @@ -37,7 +37,7 @@ - +