代码冲突

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/src/main/res/drawable/bg_bule_btn.xml

@@ -3,21 +3,21 @@
     <item android:state_pressed="true">
         <shape>
             <solid android:color="@color/btn_orange_press" />
-            <corners android:radius="8dp" />
+            <corners android:radius="3dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item android:state_enabled="false">
         <shape>
             <solid android:color="@color/btn_orange_press" />
-            <corners android:radius="8dp" />
+            <corners android:radius="3dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item>
         <shape>
             <solid android:color="@color/titleBlue" />
-            <corners android:radius="8dp" />
+            <corners android:radius="3dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>

app_core/common/src/main/res/drawable/bg_bule_btn.xml

@@ -3,21 +3,21 @@
     <item android:state_pressed="true">
         <shape>
             <solid android:color="@color/btn_orange_press" />
-            <corners android:radius="8dp" />
+            <corners android:radius="1dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item android:state_enabled="false">
         <shape>
             <solid android:color="@color/btn_orange_press" />
-            <corners android:radius="8dp" />
+            <corners android:radius="1dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item>
         <shape>
             <solid android:color="@color/titleBlue" />
-            <corners android:radius="8dp" />
+            <corners android:radius="1dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>

app_modular/appbooking/src/main/res/layout/header_bservices_grid.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/item_line"
+    android:background="#EBE9EA"
     android:orientation="vertical">
     <!--android:layout_marginTop="80dp"-->
     <com.core.widget.view.MyGridView
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:horizontalSpacing="0.5dp"
-        android:background="@color/item_line"
+        android:background="#EBE9EA"
         android:numColumns="3"
         android:paddingTop="5dp"
         android:scrollbars="none"

app_modular/appbooking/src/main/res/layout/item_bservice_list.xml

@@ -42,7 +42,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="center"
+                android:gravity="right"
                 android:text="餐饮"
                 android:textSize="10sp" />
         </LinearLayout>