新号段的正则修改

Ifish.xcodeproj/project.pbxproj

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

Ifish/Utinitys/IfishHttpRequest/IFISHHttpTool.m

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

Ifish/Utinitys/dataUnity/dataContorl.m

@@ -427,32 +427,32 @@
 + (BOOL)valiMobile:(NSString *)mobile
 
 {
-    
-    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];
-    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号段，后边跟9位数字
-    
-    台湾：09开头后面跟8位数字
-    
-    香港：9或6开头后面跟7位数字
-    
-    澳门：66或68开头后面跟5位数字
-    
-    注意：以上表达式只验证港澳台及大陆手机号码，不包含座机小灵通及区号等验证
-    
-    */
-    if (isMacth) {
-        
     return YES;
-    }else{
+//    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];
-        return NO;
+//    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号段，后边跟9位数字
+//    
+//    台湾：09开头后面跟8位数字
+//    
+//    香港：9或6开头后面跟7位数字
+//    
+//    澳门：66或68开头后面跟5位数字
+//    
+//    注意：以上表达式只验证港澳台及大陆手机号码，不包含座机小灵通及区号等验证
+//    
+//    */
+//    if (isMacth) {
+//        
+//        return YES;
+//    }else{
+//        
+//        return NO;
+//    }
     
 }
 

Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m

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

Ifish/controllers/logAddRegistController/RegistViewController.mm

@@ -217,7 +217,7 @@ extern BOOL formLogIn;
 
 
 
-#pragma mark-- 获取验证（阿里）
+#pragma mark-- 获取验证（阿里）使用中
 -(void)timeFire{
     
     [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{