fix pyger

build.gradle

@@ -250,7 +250,7 @@ task hot{
 }
 
 group 'com.qmai.android.plugin'
-version '1.99'
+version '1.99.3'
 
 gradlePublish {
 

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

@@ -83,7 +83,7 @@ class OssUploadTask extends DefaultTask {
         //钉钉通知
         MediaType JSON = MediaType.parse("application/json; charset=utf-8");
         def gson = new Gson()
-        def content = "$appName: 下载地址为: https://files.qmai.cn/$ossPath$fileName\n当前分支: ${getBranch()}当前环境: $buildType\n目标cpu: $flavor"
+        def content = "${appName.isEmpty() ? file.name : appName}: 下载地址为: https://files.qmai.cn/$ossPath$fileName\n当前分支: ${getBranch()}当前环境: $buildType\n目标cpu: $flavor"
         def dingDingdetail = new FsDetailInfoModel(content)
         def dingdingInfo = new FsInfoModel(dingDingdetail)
         RequestBody requestBody = RequestBody.create(JSON, gson.toJson(dingdingInfo))

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

@@ -13,19 +13,25 @@ import org.gradle.api.Project
 class PygerBuildAndUploadPlugin implements Plugin<Project> {
     @Override
     void apply(Project project) {
-      PygerBean pygerBean = project.getExtensions().create("BuildAndPygerInfo", PygerBean.class)
-          project.afterEvaluate {
+        PygerBean pygerBean = project.getExtensions().create("BuildAndPygerInfo", PygerBean.class)
+        project.afterEvaluate {
             AppExtension app = project.getExtensions().findByType(AppExtension.class)
             app.getApplicationVariants().all(new Action<ApplicationVariant>() {
                 @Override
                 void execute(ApplicationVariant applicationVariant) {
-                    def name = applicationVariant.getName()
+                    def taskName = applicationVariant.getName()
+                    def buildType = applicationVariant.buildType.name
+                    def flavor = applicationVariant.flavorName.isEmpty() ? "未配置" : applicationVariant.flavorName
+                    def appName = applicationVariant.buildType.manifestPlaceholders.get("app_name", "企迈数店").toString()
+
                     applicationVariant.outputs.all(new Action<BaseVariantOutput>() {
                         @Override
                         void execute(BaseVariantOutput baseVariantOutput) {
-                            def task = project.getTasks().create("BuildAndPyger" + firstLetterUpper(name), PygerUploadTask.class, baseVariantOutput.getOutputFile(),firstLetterUpper(name),pygerBean.key)
+                            def task = project.getTasks().create("BuildAndPyger" + firstLetterUpper(taskName),
+                                    PygerUploadTask.class, baseVariantOutput.getOutputFile(),
+                                    firstLetterUpper(buildType), pygerBean.key,flavor,appName)
                             //先编译
-                            task.dependsOn("assemble" + firstLetterUpper(name))
+                            task.dependsOn("assemble" + firstLetterUpper(taskName))
                         }
                     })
                 }

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

@@ -14,7 +14,7 @@ class PygerUploadPlugin implements Plugin<Project> {
         project.afterEvaluate {
             def uploadFile = new File(pygerBean.filePath)
             println("PygerUploadPlugin file path = "+pygerBean.filePath+" file key = "+pygerBean.key)
-            project.getTasks().create("pygerUpload", PygerUploadTask.class, uploadFile,"1", pygerBean.key)
+            project.getTasks().create("pygerUpload", PygerUploadTask.class, uploadFile,"1", pygerBean.key,"","")
         }
     }
 }

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

@@ -18,15 +18,24 @@ import javax.inject.Inject
 import java.util.concurrent.TimeUnit
 
 class PygerUploadTask extends DefaultTask {
-    @OutputFile File file;
-    @Input String buildType;
-    @Input String key;
+    @OutputFile
+    File file;
+    @Input
+    String buildType;
+    @Input
+    String key;
+    @Input
+    String flavor
+    @Input
+    String appName
 
     @Inject
-    PygerUploadTask(File file, String buildType, String key) {
+    PygerUploadTask(File file, String buildType, String key, String flavor, String appName) {
         this.file = file
         this.buildType = buildType
         this.key = key
+        this.flavor = flavor
+        this.appName = appName
         setGroup("pyger")
     }
 
@@ -65,13 +74,12 @@ class PygerUploadTask extends DefaultTask {
             def branch = ""
             try {
                 branch = getBranch()
-            }catch (Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
-                println("getBranch error = "+e.message)
+                println("getBranch error = " + e.message)
             }
 
-            String content = file.name + ": 下载地址： " + " https://www.pgyer.com/" +
-                    payInfoBean.data.buildShortcutUrl + " \n二维码地址: " + payInfoBean.data.buildQRCodeURL + " \n 当前环境: " + buildType + "\n 当前分支:" + branch
+            String content = "${appName.isEmpty() ? file.name : appName}: 下载地址为: https://www.pgyer.com/$payInfoBean.data.buildShortcutUrl\n二维码地址: $payInfoBean.data.buildQRCodeURL\n当前分支: ${branch}\n当前环境: $buildType\n目标cpu: $flavor"
             println("fs content = ${content}")
             MediaType JSON = MediaType.parse("application/json; charset=utf-8");
             try {
@@ -103,7 +111,7 @@ class PygerUploadTask extends DefaultTask {
     }
 
 
-    void uploadFs(String text){
+    void uploadFs(String text) {
 
     }
 
@@ -125,7 +133,7 @@ class PygerUploadTask extends DefaultTask {
             }
             return str.contains("jenkins")
         }
-        return  false;
+        return false;
     }
 
     //获取当前分支