From 426a234175b2e9f2b406e00ebe6cb37ba1da325d Mon Sep 17 00:00:00 2001
From: SuperMonster003 <wu2du2mo2gu0@gmail.com>
Date: Fri, 7 Jul 2023 01:41:38 +0800
Subject: [PATCH] =?UTF-8?q?6.3.2=20-=20Fix=20-=20=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autojs/autojs/network/entity/VersionInfo.kt   | 15 +++++----------
 version.properties                                |  6 +++---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/network/entity/VersionInfo.kt b/app/src/main/java/org/autojs/autojs/network/entity/VersionInfo.kt
index b24acbbb..e95a34c2 100644
--- a/app/src/main/java/org/autojs/autojs/network/entity/VersionInfo.kt
+++ b/app/src/main/java/org/autojs/autojs/network/entity/VersionInfo.kt
@@ -33,21 +33,16 @@ class VersionInfo : ExtendedVersionInfo {
         val versionNameKey = str(R.string.property_key_app_version_name)
         val versionCodeKey = str(R.string.property_key_app_version_code)
 
-        val regexVersionName = "$versionNameKey(</\\w+>)?=.+".toRegex()
-        val regexVersionCode = "$versionCodeKey(</\\w+>)?=.+".toRegex()
+        val regexVersionName = "$versionNameKey(?:</\\w+>)?=([\\w.]+)".toRegex()
+        val regexVersionCode = "$versionCodeKey(?:</\\w+>)?=(\\d+)".toRegex()
 
-        for (string in propertiesFileRawString.split("\n".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()) {
+        for (string in propertiesFileRawString.split("\\n".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()) {
             if (versionName.isEmpty() && string.contains(regexVersionName)) {
-                string.split("$versionNameKey(</\\w+>)?=".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()[1]
-                    .replace("<.+?>".toRegex(), "")
-                    .takeIf { it.isNotEmpty() }?.let { versionName = it }
+                versionName = regexVersionName.find(string)?.groupValues?.get(1) ?: ""
                 Log.d(TAG, "versionName: $versionName")
             }
             if (versionCode <= 0 && string.contains(regexVersionCode)) {
-                string.split("$versionCodeKey(</\\w+>)?=".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()[1]
-                    .replace("<.+?>".toRegex(), "")
-                    .toInt()
-                    .takeIf { it > 0 }?.let { versionCode = it }
+                versionCode = regexVersionCode.find(string)?.groupValues?.get(1)?.toInt() ?: -1
                 Log.d(TAG, "versionCode: $versionCode")
             }
             if (versionName.isNotEmpty() && versionCode > 0) {
diff --git a/version.properties b/version.properties
index 58b9be30..a3ee7381 100644
--- a/version.properties
+++ b/version.properties
@@ -1,8 +1,8 @@
-#Fri Jul 07 00:40:51 CST 2023
-BUILD_TIME=1688661651706
+#Fri Jul 07 01:39:02 CST 2023
+BUILD_TIME=1688665142214
 COMPILE_SDK_VERSION=33
 JAVA_VERSION=20
 MIN_SDK_VERSION=24
 TARGET_SDK_VERSION=33
-VERSION_BUILD=1997
+VERSION_BUILD=1999
 VERSION_NAME=6.3.2