Browse Source

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

# Conflicts:
#	WeiChat/version.properties
Arison 7 years ago
parent
commit
b16a096034

+ 5 - 5
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jul 27 15:36:41 CST 2018
-debugName=518
-versionName=641
-debugCode=518
-versionCode=182
+#Fri Jul 27 16:49:30 CST 2018
+debugName=519
+versionName=638
+debugCode=519
+versionCode=179

+ 1 - 0
app_core/common/src/main/res/layout/activity_setting.xml

@@ -533,6 +533,7 @@
 
             <RelativeLayout
                 android:id="@+id/font_us_rl"
+                android:visibility="gone"
                 style="@style/commonSettingItem">
 
                 <TextView