From 31ae8d0ad058d52cbbebbc27e4c94a36171f672d Mon Sep 17 00:00:00 2001
From: zhangaotian <8474238@qq.com>
Date: Fri, 29 May 2026 12:26:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0NLD=5Fandroid=5Fdebug=20jenki?=
 =?UTF-8?q?ns=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tool/build_env/jenkins_android_dev.groovy | 27 ++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/Tool/build_env/jenkins_android_dev.groovy b/Tool/build_env/jenkins_android_dev.groovy
index 05dcd816b68..13f329c1e69 100644
--- a/Tool/build_env/jenkins_android_dev.groovy
+++ b/Tool/build_env/jenkins_android_dev.groovy
@@ -6,7 +6,7 @@ def APK_NAME = "NLDBuild.apk"
 // 构建时候的参数 
 def CHANNEL_PARAM = params.Channel
 def DEBUGBUILD_PARAM = params.DebugBuild
-def HOTUPDATE_PARAM = params.Enable_Hot_Update
+def HOTUPDATE_PARAM = true
 def AAB_PARAM = params.AAB
 def OBFUZ = params.Obfuz
 def DEV_PARAM = true
@@ -14,6 +14,9 @@ def ANDROIDKEYSTORE = "/Users/mayuanzheng/key/phxh_android.keystore"
 def ANDROIDKEYALIAS = "avery"
 def UPLOAD_SYMBOL = params.UploadSymbol
 def PACKAGE_HARDENING = params.PackageHardening
+def PackDefaultRes = params.PackDefaultRes
+def PackDllRes = params.PackDllRes
+def PackConfigRes = params.PackConfigRes
 
 // Jenkins 归档地址
 def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAME}/"
@@ -28,8 +31,12 @@ def BUILD_PATH
 def log_path
 
 def GetRemote(){
+    if('TapTapDev' == params.Channel)
+        return 'dev';
     if('VinnyTest' == params.Channel)
         return 'feature/VinnyTest';
+    if ('Dev_RaceGame' == params.Channel)
+        return 'feature/race_game';
     if('Zhanhui' == params.Channel)
         return 'zhanhui';
     if('Dev' == params.Channel)
@@ -41,9 +48,9 @@ def GetRemote(){
     if('MarketTest_Official' == params.Channel)
         return 'release/official_0_9_0';
     if('MarketTest_Tap' == params.Channel)
-        return 'release/tap_0_9_0';    
+        return 'release/release_0_9_0';    
     if('QA_Dev' == params.Channel)
-        return 'qa_dev';
+        return 'release/release_1_0_0';
     else
         return params.Channel;
 }
@@ -55,7 +62,7 @@ def CheckRemoteBranchExists(repoUrl, branchName) {
     ).trim()
     
     if (result == '') {
-        echo "警告: 远程分支 ${branchName} 不存在于 ${repoUrl}"
+        echo "警告: 远程分支 ${branchName} 不存在于 ${repoUrl}, 可以在GetRemote函数中添加映射, 或者检查分支名称是否正确"
         return false
     }
     
@@ -113,9 +120,9 @@ pipeline {
                         echo "获取到分支名字：${remote}"
                         // 检查远程分支是否存在
                         if (!CheckRemoteBranchExists(repoUrl, remote)) {
-                            def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】远程分支 ${remote} 不存在,使用默认分支 dev"
+                            def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】NLDClient 远程分支 ${remote} 不存在"
                             SendMessageToWechat(message)
-                            remote = 'dev'  // 回退到默认分支
+                            error("Failure of the '拉最新工程' stage")
                         }
 
                         echo "拉取分支：${remote}"
@@ -140,9 +147,9 @@ pipeline {
 		                def branch = GetRemote();
                         // 检查远程分支是否存在
                         if (!CheckRemoteBranchExists(gameplayUrl, branch)) {
-                            def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】远程分支 ${branch} 不存在,使用默认分支 dev"
+                            def message = "【${PLATFORM_PARAM}】【${VERSION_PARAM}】【Debug】【${CHANNEL_PARAM}】GamePlay 远程分支 ${branch} 不存在"
                             SendMessageToWechat(message)
-                            branch = 'dev'  // 回退到默认分支
+                            error("Failure of the '拉最新工程' stage")
                         }
 
 		                sh "chmod +x ${WORKSPACE}/Tool/build_tools/git_pull_gameplay.sh"
@@ -285,11 +292,11 @@ pipeline {
                         PROFILE_PARAM="AllLocal"
                     
                     if(params.Build_InitApp == false){
-                        build_result=sh(script: "$WORKSPACE/Tool/build_tools/hot_update.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${PROFILE_PARAM} ${CHANNEL_PARAM} ${HOTUPDATE_PARAM} ${DEBUGBUILD_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS} ${OBFUZ}", returnStatus: true, returnStdout: false)
+                        build_result=sh(script: "$WORKSPACE/Tool/build_tools/hot_update.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${PROFILE_PARAM} ${CHANNEL_PARAM} ${HOTUPDATE_PARAM} ${DEBUGBUILD_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS} ${OBFUZ} ${PackDefaultRes} ${PackDllRes} ${PackConfigRes}", returnStatus: true, returnStdout: false)
                         log_path="$BUILD_PATH/UpdatePreviousBuild.log"
                     }
                     else
-                        build_result=sh(script: "$WORKSPACE/Tool/build_tools/build_unity.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${PROFILE_PARAM} ${CHANNEL_PARAM} ${HOTUPDATE_PARAM} ${DEBUGBUILD_PARAM} ${AAB_PARAM} ${DEV_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS} ${OBFUZ} ${UPLOAD_SYMBOL}", returnStatus: true, returnStdout: false)
+                        build_result=sh(script: "$WORKSPACE/Tool/build_tools/build_unity.sh ${VERSION_PARAM} ${PLATFORM_PARAM} ${PROFILE_PARAM} ${CHANNEL_PARAM} ${HOTUPDATE_PARAM} ${DEBUGBUILD_PARAM} ${AAB_PARAM} ${DEV_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS} ${OBFUZ} ${UPLOAD_SYMBOL} ${PackDefaultRes} ${PackDllRes} ${PackConfigRes}", returnStatus: true, returnStdout: false)
                     
                     def parse_log = "../../$log_path"
                     // 打包失败