From 11873c9e484f49ef34252a504bb27e12e70d5fc0 Mon Sep 17 00:00:00 2001
From: zhangaotian <8474238@qq.com>
Date: Tue, 3 Dec 2024 13:09:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93=E6=89=93=E5=8C=85=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjectNLD/Assets/PhxhSDK                     |  2 +-
 Tool/build_env/jenkins_android_dev.groovy     | 14 ++++++++------
 Tool/build_env/jenkins_android_release.groovy |  9 +++++++--
 Tool/build_tools                              |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ProjectNLD/Assets/PhxhSDK b/ProjectNLD/Assets/PhxhSDK
index 4abbb3d47c3..bd50942ea90 160000
--- a/ProjectNLD/Assets/PhxhSDK
+++ b/ProjectNLD/Assets/PhxhSDK
@@ -1 +1 @@
-Subproject commit 4abbb3d47c301b1124451830e6499e27e1061c80
+Subproject commit bd50942ea9053cef5c0c3330bc93e0102ced73f3
diff --git a/Tool/build_env/jenkins_android_dev.groovy b/Tool/build_env/jenkins_android_dev.groovy
index 559477e2aaf..67afcf04fd4 100644
--- a/Tool/build_env/jenkins_android_dev.groovy
+++ b/Tool/build_env/jenkins_android_dev.groovy
@@ -10,6 +10,8 @@ def DEBUGBUILD_PARAM = params.DebugBuild
 def HOTUPDATE_PARAM = params.Enable_Hot_Update
 def AAB_PARAM = params.AAB
 def OSS_PARAM = false
+def ANDROIDKEYSTORE = "/Users/mayuanzheng/key/phxh_android.keystore"
+def ANDROIDKEYALIAS = "aa"
 
 // Jenkins 归档地址
 def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAME}/"
@@ -61,10 +63,10 @@ def ParseBuildLogError(logPath){
 }
 
 pipeline {
-    parameters 
-    {
-        string (defaultValue: GetNextVersion(), description: '版本号', name: 'VERSION', trim: true)
-    }
+    //parameters 
+    //{
+        //string (defaultValue: GetNextVersion(), description: '版本号', name: 'VERSION', trim: true)
+    //}
     
     agent any
     stages {
@@ -117,11 +119,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}", 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} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS}", 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} ${OSS_PARAM}", 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} ${OSS_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS}", returnStatus: true, returnStdout: false)
                     
                     // 打包失败
                     if(build_result != 0)
diff --git a/Tool/build_env/jenkins_android_release.groovy b/Tool/build_env/jenkins_android_release.groovy
index b1a8ed67f9a..f5cf4c46ea5 100644
--- a/Tool/build_env/jenkins_android_release.groovy
+++ b/Tool/build_env/jenkins_android_release.groovy
@@ -10,6 +10,9 @@ def DEBUGBUILD_PARAM = params.DebugBuild
 def HOTUPDATE_PARAM = params.Enable_Hot_Update
 def AAB_PARAM = params.AAB
 def OSS_PARAM = IsOSS()
+// release 先不签名
+def ANDROIDKEYSTORE = ""
+def ANDROIDKEYALIAS = ""
 
 // Jenkins 归档地址
 def ARTIFACT_URL = "http://${env.PHXH_BUILDER_IP_ADDRESS}:8080/job/${env.JOB_NAME}/"
@@ -54,6 +57,8 @@ def GetRemote(){
         return 'tap_release'
     else if('ReleaseTest' == params.Channel)
         return 'main'
+    else if('StableDev' == params.Channel)
+        return 'tap_release';
     else
         return 'stable_dev';
 }
@@ -121,11 +126,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}", 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} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS}", 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} ${OSS_PARAM}", 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} ${OSS_PARAM} ${ANDROIDKEYSTORE} ${ANDROIDKEYALIAS}", returnStatus: true, returnStdout: false)
                     
                     // 打包失败
                     if(build_result != 0)
diff --git a/Tool/build_tools b/Tool/build_tools
index d3856d09dd0..6178f8fb741 160000
--- a/Tool/build_tools
+++ b/Tool/build_tools
@@ -1 +1 @@
-Subproject commit d3856d09dd036b61e46b86ed74eab63b417386c8
+Subproject commit 6178f8fb741ad3c6f91db4086cc9e9490617f363