Skip to content

Commit cbda0ff

Browse files
调整String扩展函数的几种正则匹配
1 parent ab63d96 commit cbda0ff

File tree

1 file changed

+3
-4
lines changed
  • lite/src/main/java/com/pengxh/kt/lite/extensions

1 file changed

+3
-4
lines changed

lite/src/main/java/com/pengxh/kt/lite/extensions/String.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ fun String.formatToYearMonthDay(): String {
145145
* 判断输入的是否是数字
146146
*/
147147
fun String.isNumber(): Boolean {
148-
val regex = Regex("[-+]?\\d+(\\.\\d+)?")
148+
val regex = Regex("([-+])?\\d+(\\.\\d+)?")
149149
return this.matches(regex)
150150
}
151151

@@ -181,8 +181,7 @@ fun String.isPhoneNumber(): Boolean {
181181
return if (this.length != 11) {
182182
false
183183
} else {
184-
val regExp =
185-
"^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}\$"
184+
val regExp = "^1[3-9]\\d{9}\$"
186185
val regex = Regex(regExp)
187186
this.matches(regex)
188187
}
@@ -195,7 +194,7 @@ fun String.isEmail(): Boolean {
195194
return if (this.isBlank()) {
196195
false
197196
} else {
198-
val regExp = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*\$"
197+
val regExp = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}\$"
199198
val regex = Regex(regExp)
200199
this.matches(regex)
201200
}

0 commit comments

Comments
 (0)