root
/
ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新号段的正则修改

This commit is contained in:
kai60 2021-07-13 10:10:55 +08:00
parent a68c48b8e5
commit 74b1deeb81
5 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ifish.xcodeproj/project.pbxproj
View File

@ -15817,7 +15817,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = WFX8GD5HFX; DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
@ -15892,7 +15892,7 @@
"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
); );
MARKETING_VERSION = 5.1.14; MARKETING_VERSION = 5.1.15;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-ObjC", "-ObjC",
@ -15935,7 +15935,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = WFX8GD5HFX; DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
@ -16010,7 +16010,7 @@
"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
); );
MARKETING_VERSION = 5.1.14; MARKETING_VERSION = 5.1.15;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-ObjC", "-ObjC",

2
Ifish/Utinitys/IfishHttpRequest/IFISHHttpTool.m
View File

@ -307,7 +307,7 @@
dispatch_source_cancel(_timer1); dispatch_source_cancel(_timer1);
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
//设置界面的按钮显示 根据自己需求设置 //设置界面的按钮显示 根据自己需求设置
[timeBtn setTitle:@"语音验证码" forState:UIControlStateNormal]; // [timeBtn setTitle:@"语音验证码" forState:UIControlStateNormal];
timeBtn.userInteractionEnabled = YES; timeBtn.userInteractionEnabled = YES;
//timeBtn.backgroundColor=COLOR_LABEL_TITLE; //timeBtn.backgroundColor=COLOR_LABEL_TITLE;
[timeBtn setBackgroundImage:[UIImage imageNamed:@"registered_icon_validation"] forState:UIControlStateNormal]; [timeBtn setBackgroundImage:[UIImage imageNamed:@"registered_icon_validation"] forState:UIControlStateNormal];

52
Ifish/Utinitys/dataUnity/dataContorl.m
View File

@ -427,32 +427,32 @@
+ (BOOL)valiMobile:(NSString *)mobile + (BOOL)valiMobile:(NSString *)mobile
{ {
return YES;
NSString * MOBILE = @"^[1][3-8]\\d{9}$|^([6|9])\\d{7}$|^[0][9]\\d{8}$|^[6]([8|6])\\d{5}$"; // NSString * MOBILE = @"^[1][3-8]\\d{9}$|^([6|9])\\d{7}$|^[0][9]\\d{8}$|^[6]([8|6])\\d{5}$";
NSPredicate*regextestmobile=[NSPredicate predicateWithFormat:@"SELF MATCHES %@",MOBILE]; // NSPredicate*regextestmobile=[NSPredicate predicateWithFormat:@"SELF MATCHES %@",MOBILE];
BOOL isMacth=[regextestmobile evaluateWithObject:mobile]; // BOOL isMacth=[regextestmobile evaluateWithObject:mobile];
/* 正则表达式：^[1][3-8]\\d{9}$|^([6|9])\\d{7}$|^[0][9]\\d{8}$|^[6]([8|6])\\d{5}$ // /* 正则表达式：^[1][3-8]\\d{9}$|^([6|9])\\d{7}$|^[0][9]\\d{8}$|^[6]([8|6])\\d{5}$
//
规则说明： // 规则说明：
//
中国大陆：开头1 3-8号段，后边跟9位数字 // 中国大陆：开头1 3-8号段，后边跟9位数字
//
台湾：09开头后面跟8位数字 // 台湾：09开头后面跟8位数字
//
香港：9或6开头后面跟7位数字 // 香港：9或6开头后面跟7位数字
//
澳门：66或68开头后面跟5位数字 // 澳门：66或68开头后面跟5位数字
//
注意：以上表达式只验证港澳台及大陆手机号码，不包含座机小灵通及区号等验证 // 注意：以上表达式只验证港澳台及大陆手机号码，不包含座机小灵通及区号等验证
//
*/ // */
if (isMacth) { // if (isMacth) {
//
return YES; // return YES;
}else{ // }else{
//
return NO; // return NO;
} // }
} }

2
Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m
View File

@ -25,7 +25,7 @@
// CFShow((__bridge CFTypeRef)(infoDic)); // CFShow((__bridge CFTypeRef)(infoDic));
NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"]; NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"];
NSLog(@"app_Version%@",app_Version); NSLog(@"app_Version%@",app_Version);
app_Version=@"4.7.14"; app_Version=@"4.7.15";
NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version]; NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version];
NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"]; NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"];
if (buildVersion.length > 0) { if (buildVersion.length > 0) {

4
Ifish/controllers/logAddRegistController/RegistViewController.mm
View File

@ -217,7 +217,7 @@ extern BOOL formLogIn;
#pragma mark-- 获取验证（阿里） #pragma mark-- 获取验证（阿里）使用中
-(void)timeFire{ -(void)timeFire{
[IFISHHTTPTOOL getVerifyCodeWithTimerButton:_timeBtn addPhoneNumber:self.phoneNumberTextField.text addSendType:@"1" backData:^(NSString *verifycode) { [IFISHHTTPTOOL getVerifyCodeWithTimerButton:_timeBtn addPhoneNumber:self.phoneNumberTextField.text addSendType:@"1" backData:^(NSString *verifycode) {
@ -228,7 +228,7 @@ extern BOOL formLogIn;
} }
#pragma mark - 获取验证码新（SMS） #pragma mark - 获取验证码（SMS）
-(void)getVerifycode{ -(void)getVerifycode{