From 2220efd0098606d01b46f4e61b5a87e09b0b188a Mon Sep 17 00:00:00 2001
From: ZhanGSKen <zhangsken@188.com>
Date: Mon, 15 Sep 2025 17:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96APK=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E8=AE=BE=E7=BD=AE=EF=BC=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=BD=A2=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .winboll/winboll_app_build.gradle | 30 +++++++++++++++++++-----------
 appbase/build.properties          |  4 ++--
 libappbase/build.properties       |  4 ++--
 winboll.properties-demo           |  3 +++
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.winboll/winboll_app_build.gradle b/.winboll/winboll_app_build.gradle
index 60359e6..66a71f0 100644
--- a/.winboll/winboll_app_build.gradle
+++ b/.winboll/winboll_app_build.gradle
@@ -2,6 +2,11 @@
 //
 
 android {
+	def winbollProps = new Properties()
+    def winbollPropsFile = rootProject.file("${winbollFilePath}")
+    assert(winbollPropsFile.exists())
+    winbollProps.load(new FileInputStream(winbollPropsFile))
+    
     // 读取秘钥配置文件
     //
     def keyProps = new Properties()
@@ -232,20 +237,23 @@ android {
                                 }
                             } //  if(variant.buildType.name == "release"){
                             
-                            // 如果公共目录存在就拷贝到公共目录并重命名为app.apk
+                            // 如果配置了APK额外输出路径，就复制一份拷贝到额外路径。
                             //
-                            File outCommonDir = new File("/sdcard/AppProjects")
-                            String commandAPKName = "app.apk"
-                            if(outCommonDir.exists()) {
-                                copy{
-                                    from file.outputFile
-                                    into outCommonDir
-                                    rename {
-                                        String fileName -> "${commandAPKName}"
+							if(winbollProps['ExtraAPKOutputPath'] != null ) {
+                                File apkFile = new File(winbollProps['ExtraAPKOutputPath'])
+								File outCommonDir = apkFile.getParentFile();
+                                String commandAPKName = apkFile.getName();
+                                if(outCommonDir.exists()) {
+                                    copy{
+                                        from file.outputFile
+                                        into outCommonDir
+                                        rename {
+                                            String fileName -> "${commandAPKName}"
+                                        }
+                                        println "Output APK (Common): " + outCommonDir.getAbsolutePath() + "/${commandAPKName}"
                                     }
-                                    println "Output APK (Common): " + outCommonDir.getAbsolutePath() + "/${commandAPKName}"
                                 }
-                            }
+						    }
                             
                         
                     }
diff --git a/appbase/build.properties b/appbase/build.properties
index 9941f0b..ab27334 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 15 02:06:44 HKT 2025
+#Mon Sep 15 17:31:47 HKT 2025
 stageCount=6
 libraryProject=libappbase
 baseVersion=15.9
 publishVersion=15.9.5
-buildCount=23
+buildCount=44
 baseBetaVersion=15.9.6
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 9941f0b..ab27334 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 15 02:06:44 HKT 2025
+#Mon Sep 15 17:31:47 HKT 2025
 stageCount=6
 libraryProject=libappbase
 baseVersion=15.9
 publishVersion=15.9.5
-buildCount=23
+buildCount=44
 baseBetaVersion=15.9.6
diff --git a/winboll.properties-demo b/winboll.properties-demo
index 6c3233c..6b927a9 100644
--- a/winboll.properties-demo
+++ b/winboll.properties-demo
@@ -3,6 +3,9 @@
 ## library project to WinBoLL Nexus Maven Repository.
 ##
 
+## WinBoLL Extra APK file Output Path
+#ExtraAPKOutputPath=/sdcard/AppProjects/app.apk
+
 ## WinBoLL Nexus UserName
 #Nexus.name=nexustestuser1