Merge pull request #470 from OpenWebGAL/dev

4.5.15

Author: MakinoharaShoko

.github/workflows/build-terre.yml

@@ -51,7 +51,6 @@ jobs:
         run: sh release-linux-arm64.sh         
       - name: Compress
         run: 7z a -tzip release/WebGAL_Terre_Linux_Arm64.zip release/*
-      
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -122,3 +121,48 @@ jobs:
         with:
           name: WebGAL_Terre_Windows_Setup
           path: bundle/WebGal_Terre_Setup.exe
+  build-android:
+    name: Build Android APK
+    runs-on: ubuntu-latest
+    env:
+      KEYSTORE: ${{ secrets.KEYSTORE }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: package.json
+          cache: 'yarn'
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: 21
+      - name: Decode and save keystore
+        if: ${{ env.KEYSTORE != '' }}
+        run: |
+          echo "${{ secrets.KEYSTORE }}" | base64 --decode > packages/terre-android/app/keystore.jks
+      - name: Save key.properties
+        if: ${{ env.KEYSTORE != '' }}
+        run: |
+          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> packages/terre-android/key.properties
+          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> packages/terre-android/key.properties
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> packages/terre-android/key.properties
+          echo "storeFile=keystore.jks" >> packages/terre-android/key.properties
+      - name: Build
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: sh release-android.sh
+      - name: Upload Release Artifact
+        if: ${{ env.KEYSTORE != '' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: WebGAL_Terre_Android
+          path: release/WebGAL_Terre_Android.apk
+      - name: Upload Debug Artifact
+        if: ${{ env.KEYSTORE == '' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: WebGAL_Terre_Android_debug
+          path: release/WebGAL_Terre_Android_debug.apk

.github/workflows/release.yml

@@ -188,10 +188,55 @@ jobs:
         with:
           name: WebGAL_Terre_Windows_Setup
           path: bundle/WebGal_Terre_Setup.exe
+  build-android:
+    name: Build Android APK
+    runs-on: ubuntu-latest
+    env:
+      KEYSTORE: ${{ secrets.KEYSTORE }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: package.json
+          cache: 'yarn'
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: 21
+      - name: Decode and save keystore
+        if: ${{ env.KEYSTORE != '' }}
+        run: |
+          echo "${{ secrets.KEYSTORE }}" | base64 --decode > packages/terre-android/app/keystore.jks
+      - name: Save key.properties
+        if: ${{ env.KEYSTORE != '' }}
+        run: |
+          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> packages/terre-android/key.properties
+          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> packages/terre-android/key.properties
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> packages/terre-android/key.properties
+          echo "storeFile=keystore.jks" >> packages/terre-android/key.properties
+      - name: Build
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: sh release-android.sh
+      - name: Upload Release Artifact
+        if: ${{ env.KEYSTORE != '' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: WebGAL_Terre_Android
+          path: release/WebGAL_Terre_Android.apk
+      - name: Upload Debug Artifact
+        if: ${{ env.KEYSTORE == '' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: WebGAL_Terre_Android_debug
+          path: release/WebGAL_Terre_Android_debug.apk
   release:
     name: Release
     runs-on: ubuntu-latest
-    needs: ['build-linux','build-arm64','build-mac','build-windows','build-windows-nsis']
+    needs: ['build-linux','build-arm64','build-mac','build-windows','build-windows-nsis','build-android']
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -260,3 +305,15 @@ jobs:
           asset_path: WebGAL_Terre_Windows_Setup/WebGal_Terre_Setup.exe
           asset_name: WebGAL_Terre_Windows_Setup_${{ github.ref_name }}.exe
           asset_content_type: application/vnd.microsoft.portable-executable
+
+      - name: Upload Android Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          KEYSTORE: ${{ secrets.KEYSTORE }}
+        if: ${{ env.KEYSTORE != '' }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: WebGAL_Terre_Android/WebGAL_Terre_Android.apk
+          asset_name: WebGAL_Terre_Android_${{ github.ref_name }}.apk
+          asset_content_type: application/vnd.android.package-archive

assets/icon.ico

@@ -0,0 +1,51 @@
+# 安装依赖
+yarn install --frozen-lockfile --network-timeout=300000
+
+# 清理
+rm -rf release
+
+mkdir release
+
+# 进入 Terre 目录
+cd packages/terre2
+yarn run build-standalone:intl
+cd dist
+cp -r main.js  ../../../release
+rm main.js
+cd ../
+cp -r public assets ../../release
+cd ../../
+
+# 进入 Origine 目录
+cd packages/origine2
+yarn run build
+cp -rf dist/* ../../release/public/
+cd ../../
+
+# 克隆 WebGAL Android 模板
+cd release/assets/templates/
+git clone https://github.com/nini22P/WebGAL-Android.git
+mv WebGAL-Android WebGAL_Android_Template
+# MainActivity.kt 移动到主文件夹防止误删
+mv WebGAL_Android_Template/app/src/main/java/com/openwebgal/demo/MainActivity.kt WebGAL_Android_Template/app/src/main/java/MainActivity.kt
+cd ../../../
+
+cd release
+
+# 删除冗余文件
+rm -rf public/games/*
+rm -rf public/games/.gitkeep
+rm -rf assets/templates/WebGAL_Template/game/video/*
+rm -rf assets/templates/WebGAL_Template/game/video/.gitkeep
+rm -rf assets/templates/WebGAL_Android_Template/.github
+rm -rf assets/templates/WebGAL_Android_Template/.git
+rm -rf assets/templates/WebGAL_Android_Template/.gitattributes
+rm -rf assets/templates/WebGAL_Android_Template/app/src/main/assets/webgal/.gitkeep
+rm -rf assets/templates/WebGAL_Android_Template/app/src/main/java/com
+
+cd ../
+
+# 压缩文件
+rm -rf packages/terre-android/app/src/main/assets/
+mkdir packages/terre-android/app/src/main/assets/
+tar -cvf packages/terre-android/app/src/main/assets/terre.tar -C release .

assets/nsis.ico

@@ -1,33 +1,33 @@
-; 依赖
+; 依赖
 !include MUI2.nsh
 
 
-; 变量
+; 变量
 
 
-; 常量
+; 常量
 !define NAME "WebGal_Terre"
-!define VERSION "4.5.13" ; 版本号变量
+!define VERSION "4.5.13" ; 版本号变量
 !define PRODUCT_VERSION "${VERSION}.0"
-!define COPYRIGHT "Mahiru - https://github.com/MakinoharaShoko" ; 版权信息
-!define ICON_PATH ".\assets\nsis.ico"
-!define UNINSTALL_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall${NAME}" ; 软件注册
-!define RELEASE_PATH ".\release" ; 构建文件所在位置
+!define COPYRIGHT "Mahiru - https://github.com/MakinoharaShoko" ; 版权信息
+!define ICON_PATH ".\assets\icon.ico"
+!define UNINSTALL_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall${NAME}" ; 软件注册
+!define RELEASE_PATH ".\release" ; 构建文件所在位置
 
 
-; 安装信息
-Name "${NAME} v${version} Setup" ; 安装程序名称
-OutFile "./bundle/WebGal_Terre_Setup.exe" ; 安装包输出路径
-RequestExecutionLevel admin ; 设置安装包以管理员权限运行
-; 图标
+; 安装信息
+Name "${NAME} v${version} Setup" ; 安装程序名称
+OutFile "./bundle/WebGal_Terre_Setup.exe" ; 安装包输出路径
+RequestExecutionLevel admin ; 设置安装包以管理员权限运行
+; 图标
 Icon "${ICON_PATH}"
 !define MUI_ICON "${ICON_PATH}"
 !define MUI_UNICON "${ICON_PATH}"
-!define MUI_ABORTWARNING ; 退出时警告
-; 默认安装路径
+!define MUI_ABORTWARNING ; 退出时警告
+; 默认安装路径
 InstallDir "$LOCALAPPDATA\${NAME}"
 
-; 版本信息
+; 版本信息
 VIAddVersionKey ProductName "${NAME} Installer" ; product name
 VIAddVersionKey ProductVersion "${VERSION}" ; product version
 VIAddVersionKey Comments "${NAME} is WebGal's web graphics editor." ; description
@@ -60,19 +60,19 @@ VIProductVersion "${PRODUCT_VERSION}" ; product verion(actual replace FileVersio
 Section -Install
     SetOutPath $INSTDIR
 
-    ; 可覆写情况
+    ; 可覆写情况
     SetOverwrite ifnewer
 
-    ; 卸载程序
+    ; 卸载程序
     WriteUninstaller "$INSTDIR\uninstall.exe"
 
-    ; 安装包内文件
+    ; 安装包内文件
     File /r "${RELEASE_PATH}\*.*"
 
-    ; 快捷方式
+    ; 快捷方式
     CreateShortCut "$DESKTOP\${NAME}.lnk" "$INSTDIR\${NAME}.exe"
 
-    ; 开始菜单
+    ; 开始菜单
     CreateShortCut "$SMPROGRAMS\${NAME}.lnk" "$INSTDIR\${NAME}.exe"
 
     ; Register the installed software
@@ -82,7 +82,7 @@ Section -Install
     WriteRegStr HKLM "${UNINSTALL_KEY}" "DisplayIcon" "$INSTDIR\resources\uninstallerIcon.ico"
     WriteRegStr HKLM "${UNINSTALL_KEY}" "DisplayVersion" "${VERSION}"
 
-    ; 让程序以管理员身份运行
+    ; 让程序以管理员身份运行
     WriteRegStr HKCU "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" "$INSTDIR\WebGal_Terre.exe" "RUNASADMIN"
 SectionEnd
 
@@ -110,6 +110,6 @@ SectionEnd
 !insertmacro MUI_LANGUAGE "SimpChinese"
 
 
-; 初始化函数
+; 初始化函数
 Function .onInit
 FunctionEnd

build-android-assets.sh

@@ -1,6 +1,6 @@
 {
   "name": "webgal-terre",
-  "version": "4.5.14",
+  "version": "4.5.15",
   "private": true,
   "scripts": {
     "dev": "concurrently \"yarn dev:terre\" \"yarn dev:origine\" \"yarn dev:start-dev-server\"",
@@ -33,5 +33,9 @@
   "engines": {
     "node": ">=18"
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]",
+  "resolutions": {
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0"
+  }
 }

clone-android.sh

@@ -1,10 +1,9 @@
 {
   "name": "webgal-electron-project",
   "version": "1.0.0",
-  "description": "WebGAL Electron Support",
+  "description": "WebGAL Electron",
   "main": "main.js",
-  "repository": "https://github.com/WebGAL-Technical-Committee/WebGAL-Electron-Project.git",
-  "author": "Mahiru <[email protected]>",
+  "author": "OpenWebGAL <[email protected]>",
   "license": "MPL-2.0",
   "scripts": {
     "start": "electron .",
@@ -13,13 +12,13 @@
     "build:arm64": "electron-builder --arm64"
   },
   "devDependencies": {
-    "electron": "^29.0.0",
+    "electron": "^29.3.3",
     "electron-builder": "^24.12.0"
   },
   "build": {
     "productName": "WebGAL",
     "appId": "com.openwebgal.webgal",
-    "copyright": "webgal",
+    "copyright": "Copyright © 2022 OpenWebGAL. All rights reserved.",
     "directories": {
       "output": "build"
     },
@@ -37,7 +36,7 @@
       ]
     },
     "mac": {
-      "icon": "public/icon-mac.ico"
+      "icon": "public/icon.ico"
     },
     "electronDownload": {
       "mirror": "https://npmmirror.com/mirrors/electron/"