fix: 移除多余的 name 参数

revert 删除 .gitea/workflows/android-build.yml

.gitea/workflows/android-build.yml

@@ -1,67 +0,0 @@
-name: Android Build
-
-on:
-  push:
-    branches: [ master, main ]
-  pull_request:
-    branches: [ master, main ]
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: android
-    
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Setup Java 17
-      run: |
-        export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
-        export PATH=$JAVA_HOME/bin:$PATH
-        echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
-        echo "=== 使用 Java 17 ==="
-        java -version
-
-    - name: Build Debug APK
-      run: |
-        # 验证环境
-        echo "=== 环境检查 ==="
-        java -version
-        gradle --version
-        
-        # 设置 Android SDK 环境变量
-        export ANDROID_HOME=/opt/android-sdk
-        export ANDROID_SDK_ROOT=$ANDROID_HOME
-        export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/34.0.0:$PATH
-        
-        # 使用 ARM64 版本的 aapt2（来自 lzhiyong/android-sdk-tools）
-        export CUSTOM_AAPT2_PATH=/usr/bin/aapt2
-        echo "=== 使用 ARM64 aapt2 (35.0.2) ==="
-        
-        # 创建 gradle.properties 配置
-        echo "org.gradle.jvmargs=-Xmx2g -XX:+UseG1GC -XX:MaxMetaspaceSize=512m" >> gradle.properties
-        echo "org.gradle.daemon=false" >> gradle.properties
-        # 使用自定义 aapt2 路径
-        echo "android.aapt2FromMavenOverride=$CUSTOM_AAPT2_PATH" >> gradle.properties
-        
-        # 直接使用系统 Gradle 8.14.4 编译（使用 ARM64 aapt2）
-        echo "=== 开始编译 ==="
-        gradle assembleDebug \
-          --no-daemon \
-          --stacktrace \
-          --no-watch-fs \
-          --no-configuration-cache \
-          --no-build-cache \
-          -Dfile.encoding=UTF-8
-        
-        # 验证输出
-        echo "=== 编译完成 ==="
-        ls -lh app/build/outputs/apk/debug/
-
-    - name: Upload APK
-      uses: actions/upload-artifact@v3
-      with:
-        name: app-debug
-        path: app/build/outputs/apk/debug/app-debug.apk
-        retention-days: 7

.gitea/workflows/android-release-signed.yml

@@ -0,0 +1,126 @@
+name: Android Release (Signed)
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: android
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Setup Java 17
+      run: |
+        export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
+        export PATH=$JAVA_HOME/bin:$PATH
+        echo '=== Java 环境 ==='
+        java -version
+
+    - name: Setup Keystore
+      run: |
+        echo '=== 配置签名证书 ==='
+        mkdir -p app
+        echo '${{ secrets.KEYSTORE_BASE64 }}' | base64 -d > app/release.keystore
+        echo '证书已解压'
+        ls -lh app/release.keystore
+
+    - name: Setup Gradle Properties
+      run: |
+        echo '=== 创建 gradle.properties ==='
+        echo 'android.aapt2FromMavenOverride=/usr/bin/aapt2' > gradle.properties
+        echo 'org.gradle.daemon=false' >> gradle.properties
+        echo 'org.gradle.jvmargs=-Xmx2g' >> gradle.properties
+        echo 'org.gradle.java.home=/usr/lib/jvm/java-17-openjdk' >> gradle.properties
+        echo 'android.useAndroidX=true' >> gradle.properties
+        cat gradle.properties
+
+    - name: Copy Signed build.gradle
+      run: |
+        echo '=== 复制签名版 build.gradle ==='
+        cp .gitea/workflows/build.gradle.signed app/build.gradle
+        echo '已复制'
+
+    - name: Build Signed Release APK
+      env:
+        KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+      run: |
+        echo '=== 编译签名 Release APK ==='
+        export ANDROID_HOME=/opt/android-sdk
+        export ANDROID_SDK_ROOT=$ANDROID_HOME
+        export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH
+        
+        gradle assembleRelease --no-daemon --stacktrace
+        
+        VERSION=${GITHUB_REF#refs/tags/}
+        cp app/build/outputs/apk/release/app-release.apk app/build/outputs/apk/release/app-${VERSION}-signed.apk
+        echo "APK_NAME=app-${VERSION}-signed.apk" >> $GITHUB_ENV
+        
+        echo ''
+        echo '编译完成！'
+        ls -lh app/build/outputs/apk/release/
+
+    - name: Create Gitea Release
+      run: |
+        echo '=== 创建 Gitea Release ==='
+        VERSION=${GITHUB_REF#refs/tags/}
+        
+        # 先检查 Release 是否已存在
+        EXISTING=$(curl -s "https://gitea.kg8.net/api/v1/repos/${{ github.repository }}/releases/tags/$VERSION" \
+          -H "Authorization: token ${{ secrets.ACTIONS_TOKEN }}")
+        
+        RELEASE_ID=$(echo "$EXISTING" | grep -o '"id":[0-9]*' | head -1 | cut -d':' -f2)
+        
+        if [ -n "$RELEASE_ID" ] && [ "$RELEASE_ID" != "null" ]; then
+            echo "Release 已存在，ID: $RELEASE_ID"
+        else
+            echo '创建新 Release...'
+            RESPONSE=$(curl -s -X POST \
+              "https://gitea.kg8.net/api/v1/repos/${{ github.repository }}/releases" \
+              -H "Authorization: token ${{ secrets.ACTIONS_TOKEN }}" \
+              -H "Content-Type: application/json" \
+              -d "{\"tag_name\":\"$VERSION\",\"name\":\"Release $VERSION\",\"body\":\"## 自动发布的签名版本\\n\\n- ✅ 已签名\\n- 🔐 开发者证书签名\",\"draft\":false,\"prerelease\":false}")
+            
+            RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | head -1 | cut -d':' -f2)
+            echo "新 Release 创建成功，ID: $RELEASE_ID"
+        fi
+        
+        echo "RELEASE_ID=$RELEASE_ID" >> $GITHUB_ENV
+        echo "RELEASE_ID: $RELEASE_ID"
+
+    - name: Upload Signed APK
+      run: |
+        echo '=== 上传签名 APK ==='
+        echo "APK: ${{ env.APK_NAME }}"
+        echo "Release ID: ${{ env.RELEASE_ID }}"
+        
+        # Gitea 上传 API: POST /repos/{owner}/{repo}/releases/{id}/assets
+        # 注意：Gitea 只需要 attachment 参数，文件名从文件自动获取
+        UPLOAD_RESPONSE=$(curl -s -X POST \
+          "https://gitea.kg8.net/api/v1/repos/${{ github.repository }}/releases/${{ env.RELEASE_ID }}/assets" \
+          -H "Authorization: token ${{ secrets.ACTIONS_TOKEN }}" \
+          -F "attachment=@app/build/outputs/apk/release/${{ env.APK_NAME }}")
+        
+        echo "上传响应: $UPLOAD_RESPONSE"
+        
+        if echo "$UPLOAD_RESPONSE" | grep -q '"browser_download_url"'; then
+            echo ''
+            echo '✅ APK 上传成功！'
+            echo "$UPLOAD_RESPONSE" | grep -o '"browser_download_url":"[^"]*"'
+        else
+            echo '❌ 上传失败'
+            echo "$UPLOAD_RESPONSE"
+            exit 1
+        fi
+
+    - name: Verify Signature
+      run: |
+        echo '=== 验证 APK 签名 ==='
+        $ANDROID_HOME/build-tools/34.0.0/apksigner verify --print-certs \
+          app/build/outputs/apk/release/${{ env.APK_NAME }} || true
+        echo '验证完成'

.gitea/workflows/android-release.yml

@@ -1,98 +0,0 @@
-name: Android Release
-
-on:
-  push:
-    tags:
-      - 'v*'  # 监听所有 v 开头的标签（如 v1.0.0, v2.1.3）
-
-jobs:
-  release:
-    runs-on: android
-    
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Setup Java 17
-      run: |
-        export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
-        export PATH=$JAVA_HOME/bin:$PATH
-        echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
-        echo "=== 使用 Java 17 ==="
-        java -version
-
-    - name: Build Release APK
-      run: |
-        # 设置 Android SDK 环境变量
-        export ANDROID_HOME=/opt/android-sdk
-        export ANDROID_SDK_ROOT=$ANDROID_HOME
-        export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/34.0.0:$PATH
-        
-        # 使用 ARM64 版本的 aapt2（来自 lzhiyong/android-sdk-tools）
-        export CUSTOM_AAPT2_PATH=/usr/bin/aapt2
-        echo "=== 使用 ARM64 aapt2 (35.0.2) ==="
-        
-        # 创建 gradle.properties 配置
-        echo "org.gradle.jvmargs=-Xmx2g -XX:+UseG1GC -XX:MaxMetaspaceSize=512m" >> gradle.properties
-        echo "org.gradle.daemon=false" >> gradle.properties
-        # 使用自定义 aapt2 路径
-        echo "android.aapt2FromMavenOverride=$CUSTOM_AAPT2_PATH" >> gradle.properties
-        
-        # 编译 Release APK（带签名配置）
-        echo "=== 开始编译 Release APK ==="
-        gradle assembleRelease \
-          --no-daemon \
-          --stacktrace \
-          --no-watch-fs \
-          --no-configuration-cache \
-          --no-build-cache \
-          -Dfile.encoding=UTF-8
-        
-        # 验证输出（未签名的 APK）
-        echo "=== 编译完成 ==="
-        ls -lh app/build/outputs/apk/release/
-        
-        # 重命名 APK 包含版本号（使用未签名的 APK）
-        VERSION=${GITHUB_REF#refs/tags/}
-        cp app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-${VERSION}-unsigned.apk
-        echo "APK_NAME=app-${VERSION}-unsigned.apk" >> $GITHUB_ENV
-        echo "APK_VERSION=$VERSION" >> $GITHUB_ENV
-        echo "⚠️ 注意：生成的是未签名 APK，仅用于测试。生产环境请配置签名。"
-
-    - name: Create Gitea Release
-      id: create_release
-      run: |
-        VERSION=${GITHUB_REF#refs/tags/}
-        echo "Creating release: $VERSION"
-        
-        # 使用 Gitea API 创建 Release
-        RESPONSE=$(curl -s -X POST "https://gitea.kg8.net/api/v1/repos/amos/android-ci-demo/releases" \
-          -H "Authorization: token ${{ secrets.ACTIONS_TOKEN }}" \
-          -H "Content-Type: application/json" \
-          -d "{
-            \"tag_name\": \"$VERSION\",
-            \"name\": \"Release $VERSION\",
-            \"body\": \"## 自动发布的 Release\n\n- 版本：$VERSION\n- 提交：${{ github.sha }}\n\n### 变更\n${{ github.event.head_commit.message }}\",
-            \"draft\": false,
-            \"prerelease\": false
-          }")
-        
-        echo "Response: $RESPONSE"
-        
-        # 提取 upload_url
-        UPLOAD_URL=$(echo $RESPONSE | grep -o '"upload_url":"[^"]*"' | cut -d'"' -f4)
-        echo "Upload URL: $UPLOAD_URL"
-        echo "UPLOAD_URL=$UPLOAD_URL" >> $GITHUB_ENV
-
-    - name: Upload Release APK
-      run: |
-        echo "Uploading APK: ${{ env.APK_NAME }}"
-        echo "Upload URL: ${{ env.UPLOAD_URL }}"
-        
-        # 上传 APK 到 Release
-        curl -s -X POST "${{ env.UPLOAD_URL }}?name=${{ env.APK_NAME }}" \
-          -H "Authorization: token ${{ secrets.ACTIONS_TOKEN }}" \
-          -H "Content-Type: application/vnd.android.package-archive" \
-          --data-binary "@app/build/outputs/apk/release/${{ env.APK_NAME }}"
-        
-        echo "✅ APK uploaded successfully!"

.gitea/workflows/build.gradle.signed

@@ -0,0 +1,45 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    namespace 'com.example.demo'
+    compileSdk 34
+
+    defaultConfig {
+        applicationId "com.example.demo"
+        minSdk 24
+        targetSdk 34
+        versionCode 1
+        versionName "1.0"
+    }
+
+    signingConfigs {
+        release {
+            storeFile file('release.keystore')
+            storePassword System.getenv('KEYSTORE_PASSWORD')
+            keyAlias System.getenv('KEY_ALIAS')
+            keyPassword System.getenv('KEY_PASSWORD')
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
+    }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
+            minifyEnabled false
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
+}