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

# Conflicts:
#	WeiChat/build.gradle
#	app_modular/appcontact/src/main/java/com/uas/appcontact/manager/ContactsManager.java
#	app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/ContactsFragment.java
#	app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java
#	app_modular/appworks/src/main/AndroidManifest.xml
#	version.gradle

WeiChat/build.gradle

@@ -28,6 +28,7 @@ def getVersionCode() {
         if(':WeiChat:assembleBaiduDebug'in runTasks){
             println 'runTasks:'+'debug模式打包apk'
             versionProps['debugCode'] = (++debugCode).toString()
+            versionProps['debugName'] = (++debugName).toString()
             versionProps.store(versionFile.newWriter(), null)
         }
         if(':WeiChat:assembleBaiduRelease'in runTasks){
@@ -133,7 +134,7 @@ android {
 
                 } else if (variant.buildType.name.equals('debug')) {
                     //赋值app属性版本名
-                    //variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+                    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"
 

WeiChat/src/main/res/layout/activity_client.xml

@@ -14,7 +14,7 @@
         android:orientation="horizontal"
         android:padding="10dp"
         android:weightSum="4"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"

WeiChat/src/main/res/layout/activity_oamain.xml

@@ -18,7 +18,7 @@
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:orientation="vertical"
-            android:visibility="gone">
+            android:visibility="visible">
             <!--头布局-->
             <LinearLayout
                 android:id="@+id/oa_rl_choose"
@@ -28,7 +28,7 @@
                 android:background="#6A6A6A"
                 android:orientation="vertical"
                 android:paddingTop="10dp"
-                android:visibility="gone">
+                android:visibility="visible">
 
                 <LinearLayout
                     android:layout_width="match_parent"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Nov 29 18:27:33 CST 2017
-debugName=1
-versionName=621
-debugCode=212
-versionCode=121
+#Thu Nov 30 08:54:09 CST 2017
+debugName=9
+versionName=608
+debugCode=9
+versionCode=147

app_core/common/src/main/res/layout/activity_client.xml

@@ -13,7 +13,7 @@
         android:orientation="horizontal"
         android:padding="10dp"
         android:weightSum="4"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"

app_core/common/src/main/res/layout/activity_oamain.xml

@@ -18,7 +18,7 @@
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:orientation="vertical"
-            android:visibility="gone">
+            android:visibility="visible">
             <!--头布局-->
             <LinearLayout
                 android:id="@+id/oa_rl_choose"
@@ -28,7 +28,7 @@
                 android:background="#6A6A6A"
                 android:orientation="vertical"
                 android:paddingTop="10dp"
-                android:visibility="gone">
+                android:visibility="visible">
 
                 <LinearLayout
                     android:layout_width="match_parent"

version.gradle

@@ -9,10 +9,10 @@ ext {
             compileSdkVersion: 26,
             buildToolsVersion: '27.0.0',
             minSdkVersion    : 14,
-            targetSdkVersion : 26,\
+            targetSdkVersion : 26,
             javaVersion      : JavaVersion.VERSION_1_8,
             versionCode      : 130,
-            versionName      : '6.0.6',
+            versionName      : '6.0.7',
     ]
 
     depsVersion = [