新增显示当前分支，及版本环境

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

build.gradle

@@ -151,7 +151,7 @@ uploadArchives {
         }   // 本地仓库路径
         pom.groupId = "com.qmai.android.plugin"// 唯一标识（通常为模块包名，也可以任意）
         pom.artifactId = "AndroidPlugins" // 项目名称（通常为类库模块名称，也可以任意）
-        pom.version = "1.28"      // 版本号
+        pom.version = "1.32"      // 版本号
 
 
 

src/main/groovy/GradlePlugin/PygerBuildAndUploadPlugin.groovy

@@ -26,8 +26,9 @@ class PygerBuildAndUploadPlugin implements Plugin<Project> {
                         @Override
                         void execute(BaseVariantOutput baseVariantOutput) {
                             File flie = baseVariantOutput.getOutputFile()
-                            def task = project.getTasks().create("buildAndPyger" + firstLetterUpper(name), PygerUploadTask.class, flie,PygerBean)
+                            def task = project.getTasks().create("buildAndPyger" + firstLetterUpper(name), PygerUploadTask.class, flie,PygerBean,firstLetterUpper(name))
                             //先编译
+                            //task.dependsOn("clean")
                             task.dependsOn("assemble" + firstLetterUpper(name))
                         }
                     })

src/main/groovy/GradlePlugin/PygerUploadPlugin.groovy

@@ -12,7 +12,7 @@ class PygerUploadPlugin implements Plugin<Project> {
 
         PygerBean pygerBean = project.getExtensions().create("pyger", PygerBean.class)
         project.afterEvaluate {
-            project.getTasks().create("pygerUpload", PygerUploadTask.class, new File(pygerBean.filePath), pygerBean)
+            project.getTasks().create("pygerUpload", PygerUploadTask.class, new File(pygerBean.filePath), pygerBean,"")
         }
     }
 }

src/main/groovy/GradlePlugin/PygerUploadTask.groovy

@@ -24,12 +24,14 @@ import java.util.concurrent.TimeUnit
 
 class PygerUploadTask extends DefaultTask {
     File file;
-    PygerBean pygerBean
+    PygerBean pygerBean;
+    String buildType;
 
     @Inject
-    public PygerUploadTask(File file, PygerBean pygerBean) {
+    public PygerUploadTask(File file, PygerBean pygerBean,String buildType) {
         this.file = file
         this.pygerBean = pygerBean
+        this.buildType = buildType
         setGroup("pyger")
     }
 
@@ -64,7 +66,7 @@ class PygerUploadTask extends DefaultTask {
             println("下载地址为: downloadUrl:" + " https://www.pgyer.com/" + payInfoBean.data.buildShortcutUrl)
             println("二维码地址为:" + payInfoBean.data.buildQRCodeURL)
             System.out.println("upload result: " + result)
-            String content = "qmshopassitant: 下载地址： " + " https://www.pgyer.com/" + payInfoBean.data.buildShortcutUrl + " \n二维码地址: " + payInfoBean.data.buildQRCodeURL
+            String content = "qmshopassitant: 下载地址： " + " https://www.pgyer.com/" + payInfoBean.data.buildShortcutUrl + " \n二维码地址: " + payInfoBean.data.buildQRCodeURL+" 当前环境"+buildType+" 当前分支"+getBranch()
             MediaType JSON = MediaType.parse("application/json; charset=utf-8");
             JSONObject json = new JSONObject()
             try {
@@ -96,4 +98,14 @@ class PygerUploadTask extends DefaultTask {
 
         }
     }
+    //获取当前分支
+    String getBranch(){
+        def byteOut =  new ByteArrayOutputStream()
+        project.exec {
+            it.commandLine("git", "rev-parse", "--abbrev-ref", "HEAD")
+            it.standardOutput = byteOut
+        }
+        def response =  new String(byteOut.toByteArray())
+        return response
+    }
 }

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

@@ -26,8 +26,9 @@ class OssBuildAndUploadPlugin implements Plugin<Project> {
                         @Override
                         void execute(BaseVariantOutput baseVariantOutput) {
                             File flie = baseVariantOutput.getOutputFile()
-                            def task = project.getTasks().create("buildAndOss" + firstLetterUpper(name), OssUploadTask.class, flie,ossBean.ossPath)
+                            def task = project.getTasks().create("buildAndOss" + firstLetterUpper(name), OssUploadTask.class, flie,ossBean.ossPath,firstLetterUpper(name))
                             //先编译
+                           // task.dependsOn("clean")
                             task.dependsOn("assemble" + firstLetterUpper(name))
                         }
                     })

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

@@ -12,7 +12,10 @@ class OssFileUploadPlugin implements Plugin<Project> {
 
             def uploadFile = new File(ossUploadFileBean.localPath)
             println("single upload file "+uploadFile.exists() + "  "+uploadFile.absolutePath)
-            project.getTasks().create("uploadOssFile", OssUploadTask.class, uploadFile,ossUploadFileBean.ossPath)
+            project.getTasks().create("uploadOssFile", OssUploadTask.class, uploadFile,ossUploadFileBean.ossPath,"")
         }
     }
+
+
+
 }

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

@@ -23,11 +23,13 @@ import java.util.concurrent.TimeUnit
 class OssUploadTask extends DefaultTask {
     File file
     String ossPath = "appfile/demo/"
+    String buildType;
 
     @Inject
-    OssUploadTask(File file, String ossPath) {
+    OssUploadTask(File file, String ossPath,buildType) {
         this.file = file
         this.ossPath = ossPath
+        this.buildType = buildType
         setGroup("oss")
 
     }
@@ -74,7 +76,7 @@ class OssUploadTask extends DefaultTask {
         MediaType JSON = MediaType.parse("application/json; charset=utf-8");
         JSONObject json = new JSONObject()
         def gson = new Gson()
-        def content = "qmshopassitant: 下载地址为:  " + "https://files.qmai.cn/" + ossPath + fileName
+        def content = "qmshopassitant: 下载地址为:  " + "https://files.qmai.cn/" + ossPath + fileName+" 当前环境"+buildType +" 当前分支"+getBranch()
         def dingDingdetail = new DingDingDetailInfoModel(content)
         def dingdingInfo = new DingDingInfoModel(dingDingdetail)
         RequestBody requestBody = RequestBody.create(JSON, gson.toJson(dingdingInfo))
@@ -97,6 +99,16 @@ class OssUploadTask extends DefaultTask {
             println("send dingding error = " + e.message)
 
         }
+    }
 
+    String getBranch(){
+        def byteOut =  new ByteArrayOutputStream()
+        project.exec {
+            it.commandLine("git", "rev-parse", "--abbrev-ref", "HEAD")
+            it.standardOutput = byteOut
+        }
+        def response =  new String(byteOut.toByteArray())
+        return response
     }
+
 }

src/main/kotlin/com/qmai/android/plugin/jg/JiaGuTask.kt

@@ -2,6 +2,7 @@ package com.qmai.android.plugin.jg
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction
+import java.io.ByteArrayOutputStream
 import java.io.File
 import javax.inject.Inject
 
@@ -77,5 +78,15 @@ open class JiaGuTask(): DefaultTask() {
 
     }
 
+    fun getBranch():String{
+        val byteOut =  ByteArrayOutputStream()
+        project.exec {
+            it.commandLine("git", "rev-parse", "--abbrev-ref", "HEAD")
+            it.standardOutput = byteOut
+        }
+        val response =  String(byteOut.toByteArray())
+        return response
+    }
+
 
 }
\ No newline at end of file