From 9a52bac7f1a2394ac29aef05aec3b7c8f8939654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A6=E5=90=9B?=
 <73606411+setube@users.noreply.github.com>
Date: Sat, 20 Dec 2025 02:21:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81Android=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=94=AE=E9=80=80=E5=87=BA=E7=A1=AE=E8=AE=A4=E4=B8=8E?=
 =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增Android端返回键退出确认弹窗，防止误触直接退出应用。各语言包补充退出确认标题与提示语，提升多语言体验。依赖新增@capacitor/app，样式与主题适配同步优化。
---
 android/app/src/main/res/values/styles.xml | 14 ++------
 package.json                               |  1 +
 pnpm-lock.yaml                             | 20 +++++++++---
 src/App.vue                                | 38 ++++++++++++++++++++++
 src/locales/de.ts                          |  4 ++-
 src/locales/en.ts                          |  4 ++-
 src/locales/ja.ts                          |  4 ++-
 src/locales/ko.ts                          |  4 ++-
 src/locales/ru.ts                          |  4 ++-
 src/locales/zh-CN.ts                       |  4 ++-
 src/locales/zh-TW.ts                       |  4 ++-
 src/style.css                              |  5 ---
 12 files changed, 78 insertions(+), 28 deletions(-)

diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index bee05e5..6a6c20a 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -7,24 +7,14 @@
         <item name="colorPrimary">#1a1a2e</item>
         <item name="colorPrimaryDark">#0f0f1a</item>
         <item name="colorAccent">#6366f1</item>
-        <!-- 透明状态栏 -->
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:background">@null</item>
-        <!-- 透明状态栏 -->
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">#1a1a2e</item>
+        <item name="android:navigationBarColor">#1a1a2e</item>
     </style>
 
 
diff --git a/package.json b/package.json
index e5bd24b..75dc586 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@capacitor/android": "^8.0.0",
+    "@capacitor/app": "^8.0.0",
     "@capacitor/cli": "^8.0.0",
     "@capacitor/core": "^8.0.0",
     "@tailwindcss/vite": "^4.1.17",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 37c3fe5..8237289 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ importers:
       '@capacitor/android':
         specifier: ^8.0.0
         version: 8.0.0(@capacitor/core@8.0.0)
+      '@capacitor/app':
+        specifier: ^8.0.0
+        version: 8.0.0(@capacitor/core@8.0.0)
       '@capacitor/cli':
         specifier: ^8.0.0
         version: 8.0.0
@@ -650,6 +653,11 @@ packages:
     peerDependencies:
       '@capacitor/core': ^8.0.0
 
+  '@capacitor/app@8.0.0':
+    resolution: {integrity: sha512-OwzIkUs4w433Bu9WWAEbEYngXEfJXZ9Wmdb8eoaqzYBgB0W9/3Ed/mh6sAYPNBAZlpyarmewgP7Nb+d3Vrh+xA==}
+    peerDependencies:
+      '@capacitor/core': '>=8.0.0'
+
   '@capacitor/cli@8.0.0':
     resolution: {integrity: sha512-v9hEBi69xGxuuZhg55N031bMEenKaPSv71Il8C22VOOH6surDyv/MPeImN0oVfFc7eiklaW3rDFYVz6cmXfJWQ==}
     engines: {node: '>=22.0.0'}
@@ -968,8 +976,8 @@ packages:
     resolution: {integrity: sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==}
     engines: {node: '>=12'}
 
-  '@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2':
-    resolution: {commit: 06b29aafb7708acef8b3669835c8a7857ebc92d2, repo: https://github.com/electron/node-gyp.git, type: git}
+  '@electron/node-gyp@https://codeload.github.com/electron/node-gyp/tar.gz/06b29aafb7708acef8b3669835c8a7857ebc92d2':
+    resolution: {tarball: https://codeload.github.com/electron/node-gyp/tar.gz/06b29aafb7708acef8b3669835c8a7857ebc92d2}
     version: 10.2.0-electron.1
     engines: {node: '>=12.13.0'}
     hasBin: true
@@ -5077,6 +5085,10 @@ snapshots:
     dependencies:
       '@capacitor/core': 8.0.0
 
+  '@capacitor/app@8.0.0(@capacitor/core@8.0.0)':
+    dependencies:
+      '@capacitor/core': 8.0.0
+
   '@capacitor/cli@8.0.0':
     dependencies:
       '@ionic/cli-framework-output': 2.2.8
@@ -5438,7 +5450,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2':
+  '@electron/node-gyp@https://codeload.github.com/electron/node-gyp/tar.gz/06b29aafb7708acef8b3669835c8a7857ebc92d2':
     dependencies:
       env-paths: 2.2.1
       exponential-backoff: 3.1.3
@@ -5475,7 +5487,7 @@ snapshots:
 
   '@electron/rebuild@3.7.0':
     dependencies:
-      '@electron/node-gyp': git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2
+      '@electron/node-gyp': https://codeload.github.com/electron/node-gyp/tar.gz/06b29aafb7708acef8b3669835c8a7857ebc92d2
       '@malept/cross-spawn-promise': 2.0.0
       chalk: 4.1.2
       debug: 4.4.3
diff --git a/src/App.vue b/src/App.vue
index 5da5a8b..99724c6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -428,6 +428,20 @@
       </DialogContent>
     </Dialog>
   </SidebarProvider>
+
+  <!-- Android 退出确认对话框 -->
+  <AlertDialog v-model:open="exitDialogOpen">
+    <AlertDialogContent>
+      <AlertDialogHeader>
+        <AlertDialogTitle>{{ t('common.exitConfirmTitle') }}</AlertDialogTitle>
+        <AlertDialogDescription>{{ t('common.exitConfirmMessage') }}</AlertDialogDescription>
+      </AlertDialogHeader>
+      <AlertDialogFooter>
+        <AlertDialogCancel>{{ t('common.cancel') }}</AlertDialogCancel>
+        <AlertDialogAction @click="exitApp">{{ t('common.confirm') }}</AlertDialogAction>
+      </AlertDialogFooter>
+    </AlertDialogContent>
+  </AlertDialog>
 </template>
 
 <script setup lang="ts">
@@ -528,6 +542,8 @@
   import { checkLatestVersion } from '@/utils/versionCheck'
   import { StarsBackground } from '@/components/ui/bg-stars'
   import { ParticlesBg } from '@/components/ui/particles-bg'
+  import { App as CapacitorApp } from '@capacitor/app'
+  import { Capacitor } from '@capacitor/core'
 
   // 执行数据迁移（在 store 初始化之前）
   migrateGameData()
@@ -570,6 +586,8 @@
   const renameDialogOpen = ref(false)
   const renamingPlanetId = ref<string | null>(null)
   const newPlanetName = ref('')
+  // Android 退出确认对话框状态
+  const exitDialogOpen = ref(false)
   // 功能解锁要求配置
   const featureRequirements: Record<string, { building: BuildingType; level: number }> = {
     '/research': { building: BuildingType.ResearchLab, level: 1 },
@@ -2072,6 +2090,17 @@
           }
         })
       }
+      // Android 返回键退出确认
+      if (Capacitor.isNativePlatform()) {
+        CapacitorApp.addListener('backButton', ({ canGoBack }) => {
+          if (canGoBack) {
+            router.back()
+          } else {
+            exitDialogOpen.value = true
+          }
+        })
+      }
+
       // 启动版本检查定时器（每5分钟被动检查一次）
       versionCheckInterval.value = setInterval(async () => {
         const versionInfo = await checkLatestVersion(gameStore.player.lastVersionCheckTime || 0, (time: number) => {
@@ -2107,7 +2136,16 @@
     // 移除队列取消事件监听
     window.removeEventListener('cancel-build', handleCancelBuildEvent as EventListener)
     window.removeEventListener('cancel-research', handleCancelResearchEvent as EventListener)
+    // 移除 Android 返回键监听
+    if (Capacitor.isNativePlatform()) {
+      CapacitorApp.removeAllListeners()
+    }
   })
+
+  // Android 退出应用
+  const exitApp = () => {
+    CapacitorApp.exitApp()
+  }
 </script>
 
 <style scoped>
diff --git a/src/locales/de.ts b/src/locales/de.ts
index 1141d45..6851bf8 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -46,7 +46,9 @@ export default {
     current: 'Aktuell',
     level: 'Stufe',
     gmModeActivated: 'GM-Modus aktiviert! Überprüfen Sie das Navigationsmenü.',
-    view: 'Anzeigen'
+    view: 'Anzeigen',
+    exitConfirmTitle: 'Spiel beenden',
+    exitConfirmMessage: 'Möchten Sie das Spiel wirklich beenden? Ihr Fortschritt wird automatisch gespeichert.'
   },
   errors: {
     requirementsNotMet: 'Anforderungen nicht erfüllt',
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 2fe6123..c34efe5 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -45,7 +45,9 @@ export default {
     current: 'Current',
     level: 'Level',
     gmModeActivated: 'GM Mode Activated! Check the navigation menu.',
-    view: 'View'
+    view: 'View',
+    exitConfirmTitle: 'Exit Game',
+    exitConfirmMessage: 'Are you sure you want to exit? Your progress is saved automatically.'
   },
   errors: {
     requirementsNotMet: 'Requirements not met',
diff --git a/src/locales/ja.ts b/src/locales/ja.ts
index d547fba..24055f6 100644
--- a/src/locales/ja.ts
+++ b/src/locales/ja.ts
@@ -46,7 +46,9 @@ export default {
     current: '現在',
     level: 'レベル',
     gmModeActivated: 'GMモードが有効になりました！ナビゲーションメニューをご確認ください。',
-    view: '表示'
+    view: '表示',
+    exitConfirmTitle: 'ゲーム終了',
+    exitConfirmMessage: 'ゲームを終了しますか？進行状況は自動的に保存されます。'
   },
   errors: {
     requirementsNotMet: '前提条件を満たしていません',
diff --git a/src/locales/ko.ts b/src/locales/ko.ts
index 4cecac6..90b9572 100644
--- a/src/locales/ko.ts
+++ b/src/locales/ko.ts
@@ -46,7 +46,9 @@ export default {
     current: '현재',
     level: '레벨',
     gmModeActivated: 'GM 모드가 활성화되었습니다! 탐색 메뉴를 확인하세요.',
-    view: '보기'
+    view: '보기',
+    exitConfirmTitle: '게임 종료',
+    exitConfirmMessage: '게임을 종료하시겠습니까? 진행 상황은 자동으로 저장됩니다.'
   },
   errors: {
     requirementsNotMet: '전제 조건 미충족',
diff --git a/src/locales/ru.ts b/src/locales/ru.ts
index 8b1357f..9f29d43 100644
--- a/src/locales/ru.ts
+++ b/src/locales/ru.ts
@@ -46,7 +46,9 @@ export default {
     current: 'Текущий',
     level: 'Уровень',
     gmModeActivated: 'Режим GM активирован! Проверьте навигационное меню.',
-    view: 'Просмотр'
+    view: 'Просмотр',
+    exitConfirmTitle: 'Выйти из игры',
+    exitConfirmMessage: 'Вы уверены, что хотите выйти? Прогресс сохраняется автоматически.'
   },
   errors: {
     requirementsNotMet: 'Требования не выполнены',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 3c955a7..bd9bfdb 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -45,7 +45,9 @@ export default {
     current: '当前',
     level: '等级',
     gmModeActivated: 'GM 模式已激活！请查看导航菜单。',
-    view: '查看'
+    view: '查看',
+    exitConfirmTitle: '退出游戏',
+    exitConfirmMessage: '确定要退出游戏吗？游戏进度会自动保存。'
   },
   errors: {
     requirementsNotMet: '不满足前置条件',
diff --git a/src/locales/zh-TW.ts b/src/locales/zh-TW.ts
index ecff9cc..e349eee 100644
--- a/src/locales/zh-TW.ts
+++ b/src/locales/zh-TW.ts
@@ -46,7 +46,9 @@ export default {
     current: '當前',
     level: '等級',
     gmModeActivated: 'GM 模式已啟用！請查看導航選單。',
-    view: '查看'
+    view: '查看',
+    exitConfirmTitle: '退出遊戲',
+    exitConfirmMessage: '確定要退出遊戲嗎？遊戲進度會自動儲存。'
   },
   errors: {
     requirementsNotMet: '不滿足前置條件',
diff --git a/src/style.css b/src/style.css
index aec244f..d1b0bc8 100644
--- a/src/style.css
+++ b/src/style.css
@@ -126,11 +126,6 @@
     line-height: 1.5;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    /* Android/Capacitor 安全区域适配 - 额外增加 8px 避免太靠近状态栏 */
-    padding-top: calc(env(safe-area-inset-top, 0px) + 8px);
-    padding-bottom: env(safe-area-inset-bottom, 0);
-    padding-left: env(safe-area-inset-left, 0);
-    padding-right: env(safe-area-inset-right, 0);
   }
 
   /* 平滑过渡 */