update flavor

build.gradle

@@ -257,7 +257,8 @@ task hot{
 }
 
 group 'com.qmai.android.plugin'
-version '1.110.29'
+version '1.110.33'
+
 
 gradlePublish {
 

src/main/groovy/com/qmai/android/plugin/MultiUploadBean.groovy

@@ -7,4 +7,5 @@ class MultiUploadBean {
     String appName
     String versionCode
     String versionName
+    String apkName
 }

src/main/groovy/com/qmai/android/plugin/OssAndPygerPlugin.groovy

@@ -15,41 +15,24 @@ class OssAndPygerPlugin implements Plugin<Project> {
         project.afterEvaluate {
             Map<String, String> params = System.getenv()
             String type = params.getOrDefault("build_type", "release")
-            String flavor = params.get("abi_flter") // 如果没有取到值，不设置默认值
-
+            String flavor = params.getOrDefault("abi_flter", "") // 如果没有取到值，不设置默认值
             type = firstLetterLower(type)
-
             String dirName = "${project.layout.buildDirectory.asFile.get()}/outputs/apk/"
-            if (flavor != null) {
+            String apkName = ossUploadFileBean.apkName
+            if (flavor != null && !flavor.isEmpty()) {
+                flavor = firstLetterLower(flavor)
                 dirName += "$flavor/"
+                apkName += "_$flavor"
             }
             dirName += "$type/"
-
-            File apkDir = new File(dirName)
-
-            // 查找 .apk 文件
-            def apkFiles = project.fileTree(dir: dirName, include: '**/*.apk').files
-            apkFiles(new FileFilter() {
-                @Override
-                boolean accept(File pathname) {
-                    return pathname.endsWith(".apk")
-                }
-            })
-
-
-            if (apkFiles == null || apkFiles.length == 0) {
-                throw new GradleException("No APK found in directory: " + dirName)
-            }
-
-            File uploadFile = apkFiles[0] // 可按需排序选择最新的或唯一的
-
-            println("-OssAndPygerPlugin--found apk: ${uploadFile.getAbsolutePath()}")
-
-            project.getTasks().register("uploadApkOss", OssUploadTask.class,
-                    uploadFile, ossUploadFileBean.ossPath, type, flavor, ossUploadFileBean.appName)
-
-            project.getTasks().register("uploadApkPyger", PygerUploadTask.class,
-                    uploadFile, type, pygerBean.key, flavor, ossUploadFileBean.appName)
+            apkName += "_${type}_${ossUploadFileBean.versionCode}_${ossUploadFileBean.versionName}.apk"
+            def uploadFile = new File(dirName + apkName)
+            print("-OssAndPygerPlugin--dirName apkName:${dirName + apkName}")
+            project.getTasks().register("uploadApkOss", OssUploadTask.class, uploadFile, ossUploadFileBean.ossPath, type,
+                    flavor, ossUploadFileBean.appName)
+            project.getTasks().register("uploadApkPyger",
+                    PygerUploadTask.class, uploadFile,
+                    type, pygerBean.key, flavor, ossUploadFileBean.appName)
         }
 
     };