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

# Conflicts:
#	WeiChat/version.properties

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

@@ -103,12 +103,14 @@
                 android:layout_height="wrap_content">
                 <LinearLayout
                     style="@style/form_linear_customer"
-                    android:layout_height="250dp"
+                    android:layout_height="300dp"
+                    android:minHeight="220dp"
                     android:paddingBottom="5dp">
 
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:layout_marginBottom="5dp"
+                        android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
                         android:orientation="horizontal"
                         android:weightSum="4">
@@ -133,6 +135,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -156,6 +159,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -178,6 +182,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -200,6 +205,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -223,6 +229,7 @@
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
                         android:visibility="gone"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -247,6 +254,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -270,6 +278,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:layout_marginLeft="20dp">
 
                         <TextView
@@ -298,6 +307,7 @@
                         android:layout_marginTop="5dp"/>
                     <LinearLayout
                         style="@style/linear_task_background"
+                        android:layout_height="wrap_content"
                         android:orientation="horizontal">
                         <TextView
                             android:layout_width="wrap_content"
@@ -320,6 +330,7 @@
                     <LinearLayout
                         android:id="@+id/lay_voice_task"
                         style="@style/linear_task_background"
+                        android:layout_height="wrap_content"
                         android:layout_marginBottom="5dp"
                         android:orientation="horizontal"
                         android:weightSum="4">

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

@@ -24,7 +24,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="29dp"
+                android:layout_marginLeft="33dp"
                 android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -50,7 +50,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="29dp"
+                android:layout_marginLeft="33dp"
                 android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -77,7 +77,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="29dp"
+                android:layout_marginLeft="33dp"
                 android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -106,7 +106,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="29dp"
+                android:layout_marginLeft="33dp"
                 android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />

WeiChat/src/main/res/values-v21/styles.xml

@@ -1,5 +1,4 @@
 <resources>>
-
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri May 25 17:40:27 CST 2018
-debugName=446
+#Fri May 25 18:38:18 CST 2018
+debugName=448
 versionName=630
-debugCode=446
-versionCode=170
+debugCode=448
+versionCode=171

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -32,7 +32,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="29dp"
+                    android:layout_marginLeft="43dp"
                     android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -60,7 +60,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="29dp"
+                    android:layout_marginLeft="43dp"
                     android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -88,7 +88,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="29dp"
+                    android:layout_marginLeft="43dp"
                     android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -119,7 +119,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="29dp"
+                    android:layout_marginLeft="43dp"
                     android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -151,7 +151,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="29dp"
+                    android:layout_marginLeft="43dp"
                     android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -233,4 +233,4 @@
 
 
     </ScrollView>
-</android.support.constraint.ConstraintLayout>
+</RelativeLayout>

app_modular/appworks/src/main/res/layout/activity_data_inquiry_search.xml

@@ -31,8 +31,8 @@
 
         <ImageView
             android:id="@+id/data_inquiry_search_voice_iv"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="10dp"
+            android:layout_height="16dp"
             android:layout_alignParentRight="true"
             android:layout_alignRight="@+id/search_edit"
             android:layout_centerVertical="true"