From 7ed508945ad2819fb7f5340c0ea0478c514126a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A6=E5=90=9B?=
 <73606411+setube@users.noreply.github.com>
Date: Fri, 26 Dec 2025 01:16:08 +0800
Subject: [PATCH] =?UTF-8?q?build:=20Android=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5package.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

android/app/build.gradle中通过读取package.json自动设置versionName与versionCode，实现前后端版本号一致，避免手动同步出错。
---
 android/app/build.gradle | 14 ++++++++++++--
 package.json             |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 17ca780..3350a4b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,5 +1,15 @@
 apply plugin: 'com.android.application'
 
+// 从 package.json 读取版本号
+def packageJsonFile = file('../../package.json')
+def packageJsonText = packageJsonFile.text
+// 使用正则提取版本号
+def versionMatcher = packageJsonText =~ /"version"\s*:\s*"([^"]+)"/
+def appVersionName = versionMatcher ? versionMatcher[0][1] : "1.0.0"
+// 将版本号转换为 versionCode，例如 "1.5.5" -> 1*10000 + 5*100 + 5 = 10505
+def versionParts = appVersionName.split('\\.')
+def appVersionCode = versionParts[0].toInteger() * 10000 + versionParts[1].toInteger() * 100 + versionParts[2].toInteger()
+
 android {
     namespace = "games.wenzi.ogame"
     compileSdk = rootProject.ext.compileSdkVersion
@@ -7,8 +17,8 @@ android {
         applicationId "games.wenzi.ogame"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 15
-        versionName "1.5.0"
+        versionCode appVersionCode
+        versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/package.json b/package.json
index b1c1287..6c5381c 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   },
   "private": true,
   "version": "1.5.5",
-  "buildDate": "2025/12/25 18:23:43",
+  "buildDate": "2025/12/26 01:02:13",
   "main": "dist-electron/main.js",
   "type": "module",
   "scripts": {