Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_fix

# Conflicts:
#	WeiChat/version.properties
#	app_modular/apputils/build.gradle

WeiChat/build.gradle

@@ -120,29 +120,29 @@ android {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
 
-//    applicationVariants.all { variant ->
-//        variant.outputs.each { output ->
-//            def outputFile = output.outputFile
-//            def fileName
-//            if (outputFile != null && outputFile.name.endsWith('.apk')) {
-//                if (variant.buildType.name.equals('release')) {
-//                    //赋值app属性版本名
-//                    //variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
-//                    //variant.mergedFlavor.versionName ="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
-//                    def releaseInfo= "v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)+ "_" + variant.productFlavors[0].name+"(Build"+versionArray[1]+")"
-//                    fileName = "WeiChat_${releaseInfo}_release.apk"
-//
-//                } else if (variant.buildType.name.equals('debug')) {
-//                    //赋值app属性版本名
-//                    variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"+"_debug"
-//                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"
-//                    fileName = "WeiChat_${debugInfo}_debug.apk"
-//
-//                }
-//                output.outputFile = new File(outputFile.parent, fileName)
-//            }
-//        }
-//    }
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            def outputFile = output.outputFile
+            def fileName
+            if (outputFile != null && outputFile.name.endsWith('.apk')) {
+                if (variant.buildType.name.equals('release')) {
+                    //赋值app属性版本名
+                    //variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+                    //variant.mergedFlavor.versionName ="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
+                    def releaseInfo= "v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)+ "_" + variant.productFlavors[0].name+"(Build"+versionArray[1]+")"
+                    fileName = "WeiChat_${releaseInfo}_release.apk"
+
+                } else if (variant.buildType.name.equals('debug')) {
+                    //赋值app属性版本名
+                    variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"+"_debug"
+                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"
+                    fileName = "WeiChat_${debugInfo}_debug.apk"
+
+                }
+                output.outputFile = new File(outputFile.parent, fileName)
+            }
+        }
+    }
 }
 
 dependencies {

WeiChat/version.properties

@@ -1,8 +1,8 @@
-#Fri Dec 29 16:36:19 CST 2017
-debugName=363
->>>>>>>=ee498070608d5e9e61ea28c6cea1571216fbad83
+#Tue Jan 02 11:04:08 CST 2018
+debugName=370
 versionName=613
-debugCode=363
+>>>>>>>=ee498070608d5e9e61ea28c6cea1571216fbad83
+debugCode=370
 versionCode=152
-=\=\=\=\=\=\=
 <<<<<<<=HEAD
+=\=\=\=\=\=\=