From c6fbcec2d6f0a0d319f06a11f167a354d087998f Mon Sep 17 00:00:00 2001
From: tanjianbin <632190820@qq.com>
Date: Mon, 11 May 2026 11:41:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(WeworkTextUtil):=20=E6=94=B9=E8=BF=9B?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E6=A0=BC=E5=BC=8F=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E4=BB=A5=E6=94=AF=E6=8C=81=E6=9B=B4=E5=A4=9A=E5=B8=B8?=
 =?UTF-8?q?=E8=A7=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

改进正则表达式以兼容更多常见文件大小格式，如"12M"、"12MB"、"12.5 MB"、"12 kb"等。同时添加空值检查，避免空字符串或null值导致异常。
---
 .../java/org/yameida/worktool/utils/WeworkTextUtil.kt    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/yameida/worktool/utils/WeworkTextUtil.kt b/app/src/main/java/org/yameida/worktool/utils/WeworkTextUtil.kt
index 815abd0..6837139 100644
--- a/app/src/main/java/org/yameida/worktool/utils/WeworkTextUtil.kt
+++ b/app/src/main/java/org/yameida/worktool/utils/WeworkTextUtil.kt
@@ -329,7 +329,12 @@ object WeworkTextUtil {
      * 是否为文件上方时间
      */
     fun isFileSize(size: String?): Boolean {
-        return size?.matches("[0-9\\.]+[BKMG]".toRegex()) ?: false
+        if (size.isNullOrBlank()) return false
+        // 兼容常见文件大小格式: 12M / 12MB / 12.5 MB / 12 kb
+        val normalized = size.trim()
+        return normalized.matches(
+            "^[0-9]+(?:\\.[0-9]+)?[\\s\\u00A0]?(?:B|KB|MB|GB|TB|K|M|G)$".toRegex(RegexOption.IGNORE_CASE)
+        )
     }
 
     /**
@@ -555,4 +560,4 @@ object WeworkTextUtil {
         }
         return null
     }
-}
\ No newline at end of file
+}