Merge branch 'dev'

Author: Aparencia

.github/workflows/mobile-release.yml

@@ -98,3 +98,75 @@ jobs:
             sleep 5
             curl -sf https://entropydecrease.com/pwa/ | grep -q "熵减" || exit 1
             echo "PWA deployed: ${{ github.ref_name }}"
+
+  # ---------------------------------------------------------------------------
+  # Android APK（B 方案：TWA 打包）：bubblewrap 基于已部署的 PWA manifest
+  # 生成 TWA 工程并构建签名 APK，上传 GitHub Release + 服务器下载目录
+  # （官网「下载 Android APK」直链 = entropydecrease.com/downloads/entropydecrease.apk）。
+  #
+  # ⚠️ 首次设置（一次性，需 Android/Java 环境，完成后 CI 全自动）：
+  #   1. 生成 keystore：keytool -genkey -v -keystore entropydecrease.keystore
+  #      -alias entropydecrease -keyalg RSA -keysize 2048 -validity 10000
+  #   2. 生成 TWA 工程（读 android/twa-manifest.json 配置）：
+  #      npx @bubblewrap/cli init --manifest
+  #      https://entropydecrease.com/pwa/manifest.webmanifest --directory android/twa
+  #      并把生成的 android/twa/ 提交到仓库（CI 只做非交互 update + build）
+  #   3. GitHub Secrets：ANDROID_KEYSTORE_BASE64（keystore base64）、
+  #      ANDROID_KEYSTORE_PASS（keystore 密码）、ANDROID_KEY_PASS（key 密码）
+  # ---------------------------------------------------------------------------
+  build-apk:
+    needs: deploy
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - uses: android-actions/setup-android@v3
+      - name: Install bubblewrap
+        run: npm i -g @bubblewrap/cli
+      - name: Write signing keystore from secrets
+        env:
+          KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+        run: |
+          if [ -z "$KEYSTORE_B64" ]; then
+            echo "::error::ANDROID_KEYSTORE_BASE64 未配置（见 job 注释首次设置），跳过 APK 构建"
+            exit 0
+          fi
+          echo "$KEYSTORE_B64" | base64 -d > /tmp/entropydecrease.keystore
+      - name: Update TWA project to latest PWA
+        run: |
+          cd android
+          bubblewrap update \
+            --manifest https://entropydecrease.com/pwa/manifest.webmanifest \
+            --directory twa
+      - name: Build signed APK
+        env:
+          KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
+          KEY_PASS: ${{ secrets.ANDROID_KEY_PASS }}
+        run: |
+          cd android/twa
+          bubblewrap build \
+            --keystorePath /tmp/entropydecrease.keystore \
+            --keystorePass "$KEYSTORE_PASS" \
+            --keyAlias entropydecrease \
+            --keyPass "$KEY_PASS"
+      - name: Verify APK artifact
+        run: test -f android/twa/app-release-signed.apk && echo "APK OK"
+      - name: Upload APK to GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: android/twa/app-release-signed.apk
+      - name: Upload APK to server downloads
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          source: android/twa/app-release-signed.apk
+          target: /opt/Entropydecrease/downloads

.gitignore

@@ -73,3 +73,6 @@ missing_ai_context.txt
 
 # 音效源文件备份（42 个 wav，零代码引用，勿再提交）
 client/public/sounds/_backup_original/
+
+# Android ǩ����Կ���Ͻ��ύ��
+android/keystore/

android/twa-manifest.json

@@ -0,0 +1,38 @@
+{
+  "packageId": "com.entropydecrease.app",
+  "host": "entropydecrease.com",
+  "name": "熵减",
+  "launcherName": "熵减",
+  "display": "standalone",
+  "themeColor": "#3B82F6",
+  "navigationColor": "#111827",
+  "backgroundColor": "#111827",
+  "enableNotifications": true,
+  "startUrl": "/pwa/",
+  "iconUrl": "https://entropydecrease.com/pwa/pwa-512x512.png",
+  "maskableIconUrl": "https://entropydecrease.com/pwa/pwa-512x512.png",
+  "splashScreenFadeOutDuration": 300,
+  "signingKey": {
+    "path": "/tmp/entropydecrease.keystore",
+    "alias": "entropydecrease"
+  },
+  "appVersionName": "0.37.0",
+  "appVersionCode": 37,
+  "shortcuts": [],
+  "generatorApp": "bubblewrap-cli",
+  "webManifestUrl": "https://entropydecrease.com/pwa/manifest.webmanifest",
+  "fallbackType": "customtabs",
+  "features": {},
+  "alphaDependencies": {
+    "enabled": false
+  },
+  "enableSiteSettingsShortcut": true,
+  "isChromeOSOnly": false,
+  "isMetaQuest": false,
+  "fullScopeUrl": "https://entropydecrease.com/pwa/",
+  "minSdkVersion": 21,
+  "orientation": "portrait",
+  "fingerprints": [],
+  "additionalTrustedOrigins": [],
+  "retainedBundles": []
+}