From 6431730d449ee48c6e333128d99d9ab7e95c83f9 Mon Sep 17 00:00:00 2001
From: Home <home>
Date: Sun, 29 Mar 2026 01:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4jenkins=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E6=B5=81=E6=B0=B4=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Android/local.properties |  4 ++--
 Jenkinsfile              | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Android/local.properties b/Android/local.properties
index 2a5b0d37..a537bc61 100644
--- a/Android/local.properties
+++ b/Android/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Jul 14 18:35:19 CST 2025
-sdk.dir=C\:\\Users\\1\\AppData\\Local\\Android\\Sdk
+#Sun Mar 29 00:53:29 CST 2026
+sdk.dir=C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk
diff --git a/Jenkinsfile b/Jenkinsfile
index 39418999..ed7ece07 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
         UNIAPP_APP_ID = '__UNI__EDE0E52'
         ANDROID_ASSETS_DIR = "Android/simpleDemo/src/main/assets/apps/${UNIAPP_APP_ID}/www"
         // Android 构建环境
-        ANDROID_HOME = '/usr/local/android-sdk' // 你的 Jenkins 服务器 SDK 路径
+        ANDROID_SDK = '/opt/android-sdk' // 安卓 SDK 路径
         GRADLE_OPTS = '-Dorg.gradle.daemon=false -Dorg.gradle.parallel=true'
     }
     stages {
@@ -51,6 +51,26 @@ pipeline {
                 echo "✅ 资源复制完成"
             }
         }
+        // ====================== 构建 APK ======================
+        stage('配置SDK & 赋予权限 & 编译Android') {
+            steps {
+                // 1. 生成 local.properties 指定 SDK 路径
+                sh "echo 'sdk.dir=${ANDROID_SDK}' > Android/local.properties"
+
+                // 2. 直接给 gradlew 加权限（不进入目录）
+                sh "chmod +x Android/gradlew"
+
+                // 3. 直接执行编译（核心：Android/gradlew）
+                sh "Android/gradlew assembleRelease --offline -g ${WORKSPACE}/gradle-home -p Android"
+            }
+        }
+
+//        stage('查看APK & 归档') {
+//            steps {
+//                sh "ls -lh Android/app/build/outputs/apk/release/"
+//                archiveArtifacts artifacts: 'Android/app/build/outputs/apk/release/*.apk', fingerprint: true
+//            }
+//        }
 
     }