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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Dec 26 08:42:29 CST 2017
-debugName=251
+#Tue Dec 26 09:41:38 CST 2017
+debugName=253
 versionName=613
-debugCode=251
+debugCode=253
 versionCode=152

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -1394,7 +1394,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         }
                     }
 
-                    tvSeatsRight .setCompoundDrawables(null,null,null,null);
+                    tv_food_seats .setCompoundDrawables(null,null,null,null);
                     tv_food_peoples .setCompoundDrawables(null,null,null,null);
                     tv_food_times .setCompoundDrawables(null,null,null,null);
                     tv_food_rooms.setCompoundDrawables(null,null,null,null);

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

@@ -124,7 +124,7 @@
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_club_technician"
                     android:contentDescription="@string/service_club_list"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
                     android:hint="@string/common_select" />
@@ -167,7 +167,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_club_peoples"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select" />
             </RelativeLayout>
@@ -200,7 +200,7 @@
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_hospital_time"
                     android:contentDescription="@string/service_hospital_times"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
                     android:hint="@string/common_select" />
@@ -242,7 +242,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_hospital_people"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select" />
             </RelativeLayout>
@@ -274,7 +274,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_sport_time"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
                     android:hint="@string/common_select" />
@@ -318,7 +318,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_sport_peoples"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select" />
             </RelativeLayout>
@@ -353,7 +353,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_alignParentTop="true"
                     android:layout_toRightOf="@id/tag_hair_times"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
                     android:hint="@string/common_select" />
@@ -399,7 +399,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/company_tag"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select" />
             </RelativeLayout>
@@ -429,7 +429,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_food_peoples"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:hint="" />
 
@@ -468,7 +468,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_food_times"
-                    android:drawablePadding="6dp"
+                  
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
                     android:hint="@string/common_select" />

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

@@ -50,6 +50,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
+            android:gravity="center_vertical"
             android:layout_marginLeft="7dp"
             android:layout_toRightOf="@+id/sl_header"
             android:orientation="vertical">
@@ -72,7 +73,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/icon_map"
-                android:drawablePadding="3dp"
+                android:drawablePadding="5dp"
                 android:elevation="2dp"
                 android:gravity="center_vertical"
                 android:text="********"