Merge branch 'feature_raomeng' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/version.properties

WeiChat/build.gradle

@@ -3,7 +3,8 @@ apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'me.tatarka.retrolambda'
 //定义时间
 def releaseTime() {
-    return new Date().format("yyyyMMdd.HHmm.ss")
+   // return new Date().format("yyyyMMdd.HHmm.ss")
+    return new Date().format("yyyyMMdd.HHmm")
 }
 //设置发布的显示的版本号
 def getVersionName(){
@@ -81,12 +82,11 @@ android {
             def fileName
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
-                    variant.mergedFlavor.versionName = getVersionName()+"_"+variant.productFlavors[0].name
+                    variant.mergedFlavor.versionName = getVersionName()+"_"+variant.productFlavors[0].name+"_release"
                     fileName = "WeiChat_${variant.mergedFlavor.versionName}_release.apk"
                 } else if (variant.buildType.name.equals('debug')) {
-                   // variant.mergedFlavor.versionName = getVersionName()+"_"+releaseTime()+ "_"+variant.productFlavors[0].name
-                   // fileName = "WeiChat_${variant.mergedFlavor.versionName}_debug.apk"
-                    fileName = "WeiChat_debug.apk"
+                    variant.mergedFlavor.versionName = getVersionName()+"_"+releaseTime()+ "_"+variant.productFlavors[0].name+"_debug"
+                    fileName = "WeiChat_${variant.mergedFlavor.versionName}_debug.apk"
                 }
                 output.outputFile = new File(outputFile.parent, fileName)
             }