Sign up password check logic is inconsistent with the prompt information -- sign up 密码判断逻辑和提示信息不一致 resolve: #19

RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -730,8 +730,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "111"
-            endingLineNumber = "111"
+            startingLineNumber = "112"
+            endingLineNumber = "112"
             landmarkName = "-onSignUpClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -746,8 +746,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "96"
-            endingLineNumber = "96"
+            startingLineNumber = "97"
+            endingLineNumber = "97"
             landmarkName = "-onSignUpClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -964,7 +964,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "AAA951D8-135C-408A-B2AE-8653BB18A8FC"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/About/AboutViewController.m"
@@ -980,7 +980,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "5C6BB60F-1B65-4C62-8B20-336ADC633FBB"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/About/AboutViewController.m"
@@ -996,7 +996,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "EAD49121-7006-468C-9BE3-E6B9B4DF8BB4"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
@@ -1072,5 +1072,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7988C622-ED9B-447B-AC4F-B288BC9CF280"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/SignUp/SignupViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "89"
+            endingLineNumber = "89"
+            landmarkName = "-onSignUpClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1A82154B-E529-468C-9650-0F348DFF0677"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/SignUp/SignupViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "95"
+            endingLineNumber = "95"
+            landmarkName = "-onSignUpClick:"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "1A82154B-E529-468C-9650-0F348DFF0677 - 804efb281da06b2a"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[SignupViewController onSignUpClick:]"
+                  moduleName = "RA TradeFiling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/ruizhang/Documents/CODE_IOS/ERPSuiteIOS/RA%20TradeFiling/RA%20TradeFiling/SignUp/SignupViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "95"
+                  endingLineNumber = "95"
+                  offsetFromSymbolStart = "1022">
+               </Location>
+               <Location
+                  uuid = "1A82154B-E529-468C-9650-0F348DFF0677 - 845561727e52cadd"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__38-[SignupViewController onSignUpClick:]_block_invoke"
+                  moduleName = "RA TradeFiling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/ruizhang/Documents/CODE_IOS/ERPSuiteIOS/RA%20TradeFiling/RA%20TradeFiling/SignUp/SignupViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "97"
+                  endingLineNumber = "97"
+                  offsetFromSymbolStart = "54">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RA TradeFiling/RA TradeFiling/SignUp/SignupViewController.m

@@ -74,6 +74,7 @@
         return;
     }
     
+    
     bool email_valid=[RAUtils validateEmail:email];
     
     if(!email_valid)
@@ -85,7 +86,7 @@
     bool pass_valid =[RAUtils checkPassword:password];
     if(!pass_valid)
     {
-        [RAUtils message_alert:@"PASSWORD is invalid.\r\nPassword must 8-16 characters, include letter,number and capital letter." title:@"ERROR" controller:self];
+        [RAUtils message_alert:@"PASSWORD is invalid.\r\nPassword must 8-16 characters, letters, numbers and uppercase letters are allowed." title:@"ERROR" controller:self];
         return;
     }
     

common/RAUtils.m

@@ -1073,10 +1073,11 @@ done:
 }
 + (BOOL)checkPassword:(NSString *) password
 {
-    NSString *pattern = @"^(?![0-9]+$)(?![a-zA-Z]+$)[a-zA-Z0-9]{6,18}";
-    NSString *pattern1 = @"^(?=.*)(?=.*[a-z])(?=.*[~!@#$%^&*:;,.=?$\x22]).{8,16}$";
+    NSString *pattern = @"^(?![0-9]+$)(?![a-zA-Z]+$)[a-zA-Z0-9]{8,16}";
+//    NSString *pattern1 = @"^(?=.*)(?=.*[a-z])(?=.*[~!@#$%^&*:;,.=?$\x22]).{8,16}$";
     NSPredicate *pred = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", pattern];
-    NSPredicate *pred1 = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", pattern1];
+//    NSPredicate *pred1 = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", pattern1];
+    
     BOOL isMatch = [pred evaluateWithObject:password];//||[pred evaluateWithObject:password];
     return isMatch;