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

# Conflicts:
#	WeiChat/version.properties

WeiChat/build.gradle

@@ -84,8 +84,9 @@ android {
                     variant.mergedFlavor.versionName = getVersionName()+"_"+variant.productFlavors[0].name
                     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"
+                   // variant.mergedFlavor.versionName = getVersionName()+"_"+releaseTime()+ "_"+variant.productFlavors[0].name
+                   // fileName = "WeiChat_${variant.mergedFlavor.versionName}_debug.apk"
+                    fileName = "WeiChat_debug.apk"
                 }
                 output.outputFile = new File(outputFile.parent, fileName)
             }