代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

WeiChat/build.gradle

@@ -17,16 +17,17 @@ def getVersionCode() {
         versionProps.load(new FileInputStream(versionFile))
         def versionCode = versionProps['versionCode'].toInteger()
         def runTasks = gradle.startParameter.taskNames        //仅在assembleRelease任务是增加版本号
-        if (':app:assembleRelease' in runTasks) {
+//        if (':app:assembleRelease' in runTasks) {
             versionProps['versionCode'] = (++versionCode).toString()
             versionProps.store(versionFile.newWriter(), null)
-        }
+//        }
         
         return versionCode
     } else {
         throw new GradleException("Could not find version.properties!")
     }
 }
+def currentVersionCode = getVersionCode()
 
 android {
     compileOptions {
@@ -45,7 +46,7 @@ android {
     buildToolsVersion rootProject.ext.android.buildToolsVersion
 
     defaultConfig {
-        def currentVersionCode = getVersionCode()
+   
         applicationId project.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -101,7 +102,7 @@ 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+"(Build"+currentVersionCode+")"
                     fileName = "WeiChat_${variant.mergedFlavor.versionName}_release.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name

WeiChat/version.properties

@@ -1,2 +1,2 @@
-versionCode=125
-
+#Wed Nov 15 17:06:38 CST 2017
+versionCode=131