see 11/30 log

Blankj · Blankj · commit 4d3d5cd24d64 · 2019-11-30T18:12:15.000+08:00
diff --git a/buildSrc/src/main/groovy/Config.groovy b/buildSrc/src/main/groovy/Config.groovy
@@ -67,7 +67,7 @@ class Config {
             leakcanary_android_no_op   : new DepConfig("com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"),
             leakcanary_support_fragment: new DepConfig("com.squareup.leakcanary:leakcanary-support-fragment:$leakcanary_version"),
 
-            free_proguard              : new DepConfig("com.blankj:free-proguard:1.0.1"),
+            free_proguard              : new DepConfig("com.blankj:free-proguard:1.0.2"),
             swipe_panel                : new DepConfig("com.blankj:swipe-panel:1.2"),
 
             gson                       : new DepConfig("com.google.code.gson:gson:2.8.6"),
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/RegexUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/RegexUtils.java
@@ -47,7 +47,33 @@ public static boolean isMobileSimple(final CharSequence input) {
      * @return {@code true}: yes<br>{@code false}: no
      */
     public static boolean isMobileExact(final CharSequence input) {
-        return isMatch(RegexConstants.REGEX_MOBILE_EXACT, input);
+        return isMobileExact(input, null);
+    }
+
+    /**
+     * Return whether input matches regex of exact mobile.
+     *
+     * @param input       The input.
+     * @param newSegments The new segments of mobile number.
+     * @return {@code true}: yes<br>{@code false}: no
+     */
+    public static boolean isMobileExact(final CharSequence input, List<String> newSegments) {
+        boolean match = isMatch(RegexConstants.REGEX_MOBILE_EXACT, input);
+        if (match) return true;
+        if (newSegments == null) return false;
+        if (input == null || input.length() != 11) return false;
+        String content = input.toString();
+        for (char c : content.toCharArray()) {
+            if (!Character.isDigit(c)) {
+                return false;
+            }
+        }
+        for (String newSegment : newSegments) {
+            if (content.startsWith(newSegment)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
diff --git a/lib/utilcode/src/test/java/com/blankj/utilcode/util/RegexUtilsTest.java b/lib/utilcode/src/test/java/com/blankj/utilcode/util/RegexUtilsTest.java
@@ -26,6 +26,7 @@ public void isMobileSimple() {
     public void isMobileExact() {
         assertFalse(RegexUtils.isMobileExact("11111111111"));
         assertTrue(RegexUtils.isMobileExact("13888880000"));
+        assertTrue(RegexUtils.isMobileExact("12088880000", CollectionUtils.newArrayList("120")));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public void isMobileSimple() {`
`26`	`26`	`public void isMobileExact() {`
`27`	`27`	`assertFalse(RegexUtils.isMobileExact("11111111111"));`
`28`	`28`	`assertTrue(RegexUtils.isMobileExact("13888880000"));`
	`29`	`+ assertTrue(RegexUtils.isMobileExact("12088880000", CollectionUtils.newArrayList("120")));`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`@Test`