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

# Conflicts:
#	WeiChat/version.properties

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

@@ -19,7 +19,7 @@
                 android:id="@+id/name_img"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-                android:background="@drawable/round_bg"
+                android:background="@drawable/radian_white_bg"
                 android:gravity="center"
                 android:scaleType="fitXY"
                 android:textColor="@color/white"

app_core/common/src/main/java/com/core/app/Constants.java

@@ -16,7 +16,7 @@ public class Constants {
     public static String IM_BASE_URL() {
         String url = "";
         if (BaseConfig.isDebug()) {
-            url = IM_BASE_URL_TEST;
+            url = IM_BASE_URL;
         } else {
             url = IM_BASE_URL;
         }

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

@@ -3,342 +3,353 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <RelativeLayout
-        android:id="@+id/image_setting_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="形象照片"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-        <TextView
-            android:id="@+id/image_setting_new"
-            android:layout_width="10dp"
-            android:layout_height="10dp"
-            android:layout_alignTop="@+id/tv_oa"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="10dp"
-            android:layout_alignParentRight="true"
-            android:background="@drawable/hongdian"
-            android:textColor="@android:color/white"
-            android:textSize="10.0dip"
-            android:visibility="gone"/>
-    </RelativeLayout>
+    <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scrollbars="none">
 
-    <RelativeLayout
-        android:id="@+id/keshi_setting_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:visibility="gone">
-        <View
-            android:layout_alignParentBottom="true"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="科室设置"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
+            android:orientation="vertical">
+            <RelativeLayout
+                android:id="@+id/image_setting_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="形象照片"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+                <TextView
+                    android:id="@+id/image_setting_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_alignTop="@+id/tv_oa"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip"
+                    android:visibility="gone"/>
+            </RelativeLayout>
 
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/people_setting_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="人员设置"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/keshi_setting_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:visibility="gone">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="科室设置"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
 
-    <RelativeLayout
-        android:id="@+id/batchplace_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置服务/场地/房间"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/people_setting_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="人员设置"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
 
-        <RelativeLayout
-            style="@style/IMTbleLine"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginBottom="118dp"
-            android:layout_marginEnd="11dp"
-            android:layout_marginRight="11dp"
-            android:background="@drawable/selector_me_menu_item_bg"
-            android:visibility="gone">
+            <RelativeLayout
+                android:id="@+id/batchplace_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置服务/场地/房间"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:layout_alignParentBottom="true"
-                android:background="@color/item_line" />
+                <RelativeLayout
+                    style="@style/IMTbleLine"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginBottom="118dp"
+                    android:layout_marginEnd="11dp"
+                    android:layout_marginRight="11dp"
+                    android:background="@drawable/selector_me_menu_item_bg"
+                    android:visibility="gone">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:gravity="center"
-                android:text="员工休息日设置"
-                android:textColor="@color/black"
-                android:textSize="14sp" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/line"
+                        android:layout_alignParentBottom="true"
+                        android:background="@color/item_line" />
 
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:gravity="center"
+                        android:text="员工休息日设置"
+                        android:textColor="@color/black"
+                        android:textSize="14sp" />
 
-        </RelativeLayout>
+                    <ImageView
+                        android:layout_width="@dimen/next_width"
+                        android:layout_height="@dimen/next_height"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/oa_next"
+                        android:contentDescription="@string/app_name" />
 
-    </RelativeLayout>
+                </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/employeerest_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置员工休息日"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
+            </RelativeLayout>
 
-    </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/employeerest_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置员工休息日"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
 
-    <RelativeLayout
-        android:id="@+id/companyrest_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置企业休息日"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
+            </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/business_hours_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置营业时间"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-        Business hours
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/booking_timetype_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置预约时间类型"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/companyrest_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置企业休息日"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/room_type_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置包房预订类型"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/table_setting_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="桌位设置"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/business_introduction_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="商家详情"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/business_hours_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置营业时间"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+                Business hours
+            </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/booking_timetype_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置预约时间类型"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/room_type_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置包房预订类型"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/table_setting_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="桌位设置"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/business_introduction_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="商家详情"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetCompanyRestActivity.java

@@ -53,13 +53,8 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
         super.onCreate(savedInstanceState);
         setContentView(R.layout.service_bcom_setting_activity);
         initView();
-        initData();
     }
 
-    private void initData() {
-
-
-    }
 
 
     private void initView() {
@@ -231,6 +226,10 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
                     ToastMessage("不可选择过去时间");
                     return;
                 }else {
+                    if (JSON.toJSONString(mList).contains(time)){
+                        ToastMessage("休息时间不可重复");
+                        return;
+                    }
                     mList.get(pos).setSc_date(time);
                     myAdapter.notifyDataSetChanged();
                 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetEmployeeRestActivity.java

@@ -335,6 +335,10 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     //load 选择服务人员
     private String companyid;
     public void loadServiceMan() {
+        if (!CommonUtil.isNetWorkConnected(ct)){
+            ToastMessage(getString(R.string.common_notlinknet));
+            return;
+        }
         progressDialog.show();
         new HttpClient.Builder(Constants.IM_BASE_URL())
                 .isDebug(BaseConfig.isDebug())
@@ -483,6 +487,10 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
                     ToastMessage("不可选择过去时间");
                     return;
                 }else {
+                    if (JSON.toJSONString(mList).contains(time)){
+                        ToastMessage("休息时间不可重复");
+                        return;
+                    }
                     mList.get(pos).setSf_date(time);
                     myAdapter.notifyDataSetChanged();
                 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -104,6 +104,11 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     }
 
     private void judgeWhichType() {
+        if (!CommonUtil.isNetWorkConnected(ct)){
+            ToastMessage(getString(R.string.common_notlinknet));
+            initData();
+            return;
+        }
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyType")

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingActivity.java

@@ -229,8 +229,16 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                 doSelectDepartment(departmentModel_list, requestCode);
             }
         }else if (v.getId() == R.id.btn_save){
+            if (!CommonUtil.isNetWorkConnected(ct)){
+                ToastMessage(getString(R.string.common_notlinknet));
+                return;
+            }
             saveJudge();
         }else if (v.getId() == R.id.deleteBtn){
+            if (!CommonUtil.isNetWorkConnected(ct)){
+                ToastMessage(getString(R.string.common_notlinknet));
+                return;
+            }
             doDelete();
         }else if (v.getId() == R.id.image_im || v.getId() == R.id.image_tv_){
             if (PermissionUtil.lacksPermissions(ct, Manifest.permission.CAMERA)) {
@@ -315,11 +323,18 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
             bean.setClick(false);
             beans.add(bean);
         }
+
+        String title = null;
+        if (!"医疗".equals(sc_industry))
+            title = "选择部门";
+        else
+            title = "选择科室";
+
         LogUtil.prinlnLongMsg("department beans",JSON.toJSONString(beans));
         Intent intent = new Intent(ct, SelectActivity.class);
         intent.putExtra("type", 2);
         intent.putParcelableArrayListExtra("data", beans);
-        intent.putExtra("title", "选择科室");
+        intent.putExtra("title", title);
         startActivityForResult(intent, requestCode);
     }
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/TableSetActivity.java

@@ -78,7 +78,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             TableMode model = new TableMode();
             model.setAs_deskcode("");
             model.setAs_number("");
-            model.setAs_type("大桌");
+            model.setAs_type("");
             model.setAs_remark("");
 //            model.setAs_id("0");
             model.setAs_companyid(as_companyid);
@@ -132,7 +132,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 TableMode model = new TableMode();
                 model.setAs_deskcode("");
                 model.setAs_number("");
-                model.setAs_type("大桌");
+                model.setAs_type("");
                 model.setAs_remark("");
                 model.setAs_id("0");
                 model.setAs_companyid(as_companyid);
@@ -294,7 +294,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             tableView.deskcode_et.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    doInput(1,position);
+//                    doInput(1,position);
                 }
             });
             tableView.number_et.setOnClickListener(new View.OnClickListener() {
@@ -432,14 +432,22 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         String ttype = null;
+                        String code = null;
                         if (which == 0) {
                             ttype =  "大桌";
+                            code = "A";
                         }else if (which == 1){
                             ttype =  "中桌";
+                            code = "B";
                         }else {
                             ttype =  "小桌";
+                            code = "C";
                         }
-
+                       if (JSON.toJSONString(tableList).contains(code)){
+                            ToastMessage("桌位不可重复设置");
+                            return;
+                       }
+                        tableList.get(position).setAs_deskcode(code);
                         tableList.get(position).setAs_type(ttype);
                         myAdapter.notifyDataSetChanged();
                         dialog.dismiss();

app_modular/appme/src/main/res/layout/table_item.xml

@@ -56,7 +56,6 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:background="@null"
-            android:hint="@string/common_input"
             android:textSize="15sp"
             android:gravity="center_vertical|right"
             android:maxLength="10"

app_modular/apptasks/src/main/java/com/modular/apptasks/presenter/AutoPresenter.java

@@ -4,6 +4,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.content.LocalBroadcastManager;
 
 import com.alibaba.fastjson.JSON;
@@ -56,6 +58,7 @@ public class AutoPresenter {
 		reckonWork(true);
 		reckonMission(true);
 		CommonInterface.getInstance().judgeManager(null);
+		CommonInterface.getInstance().getOutSetInfo(null);
 	}
 
 
@@ -87,9 +90,10 @@ public class AutoPresenter {
 					}
 					break;
 				case AppConstant.UPDATA_ERP_CHANGE://账套改变
+					CommonInterface.getInstance().getOutSetInfo(null);
+					CommonInterface.getInstance().judgeManager(null);
 					reckonWork(true);
 					reckonMission(true);
-					CommonInterface.getInstance().judgeManager(null);
 					break;
 				case AppConstant.CHANGE_MISSION_TASK:
 					if (intent.getBooleanExtra(AppConstant.CHANGE_MISSION_TASK, true)) {

app_modular/apputils/src/main/java/com/modular/apputils/utils/SwitchUtil.java

@@ -1,5 +1,7 @@
 package com.modular.apputils.utils;
 
+import com.common.config.BaseConfig;
+
 /**
  * Created by Bitlike on 2017/11/22.
  */
@@ -7,7 +9,7 @@ package com.modular.apputils.utils;
 public class SwitchUtil {
 
     public static boolean showYiyuanjuan() {
-        return true;
+        return BaseConfig.isDebug();
     }
 
     public static boolean showShebeiguanli() {

app_modular/apputils/src/main/res/drawable/radian_bottom_white_bg.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- solid 设置stroke设置的边框以内的颜色 -->
+    <solid android:color="@color/white" />
+    <!-- stroke主要设置组件的边框。width为边框宽度，color为边框颜色 -->
+    <stroke
+        android:width="0.3dp"
+        android:color="@color/base_bg" />
+    <!-- corners 设置边框四角弧度 -->
+    <corners android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp"/>
+    <padding
+        android:bottom="@dimen/padding"
+        android:left="@dimen/padding"
+        android:right="@dimen/padding"
+        android:top="@dimen/padding" />
+
+</shape>

app_modular/apputils/src/main/res/drawable/radian_top_cui_bg.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- solid 设置stroke设置的边框以内的颜色 -->
+    <solid android:color="@color/cui" />
+    <!-- stroke主要设置组件的边框。width为边框宽度，color为边框颜色 -->
+    <stroke
+        android:width="0.3dp"
+        android:color="@color/base_bg" />
+    <!-- corners 设置边框四角弧度 -->
+    <corners android:topRightRadius="10dp" android:topLeftRadius="10dp"/>
+    <padding
+        android:bottom="@dimen/padding"
+        android:left="@dimen/padding"
+        android:right="@dimen/padding"
+        android:top="@dimen/padding" />
+
+</shape>

app_modular/apputils/src/main/res/drawable/round_bg.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!-- solid 设置stroke设置的边框以内的颜色 -->
-    <solid android:color="#ffffff"/>
-    <!-- stroke主要设置组件的边框。width为边框宽度，color为边框颜色 -->
-    <stroke android:width="3dp" android:color="#ffffff" />
-    <!-- corners 设置边框四角弧度 -->
-    <corners android:radius="10dp"/>
-
-</shape>

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/ChangeMobileActivity.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -133,9 +134,9 @@ public class ChangeMobileActivity extends BaseActivity {
                     Crouton.makeText(ct, showMessage);
                     break;
                 default:
-                if (progressDialog!=null){
-                    progressDialog.dismiss();
-                }
+                    if (progressDialog != null) {
+                        progressDialog.dismiss();
+                    }
                     break;
             }
             submiting = false;
@@ -177,7 +178,7 @@ public class ChangeMobileActivity extends BaseActivity {
 
     private boolean submiting = false;
 
-    private void initView(){
+    private void initView() {
 
         mac_tv = (TextView) findViewById(R.id.mac_tv);
         title_tv = (TextView) findViewById(R.id.title_tv);
@@ -318,15 +319,25 @@ public class ChangeMobileActivity extends BaseActivity {
             @Override
             public void result(int what, boolean isJSON, String message, Bundle bundle) {
 //                endActivity();
-                int ms_id = JSON.parseObject(message).getInteger("ms_id");
-                Log.d("hims_id", ms_id + "");
-                judgeApprovers(ms_id);
+                if (isJSON) {
+                    int ms_id = JSONUtil.getInt(message, "ms_id");
+                    Log.d("hims_id", ms_id + "");
+                    if (ms_id > 0) {
+                        judgeApprovers(ms_id);
+                    } else {
+                        String exceptionInfo = JSONUtil.getText(message, "exceptionInfo");
+                        if (!StringUtil.isEmpty(exceptionInfo)) {
+                            ToastUtil.showToast(ct, exceptionInfo);
+                        }
+                    }
+                }
                 submiting = false;
                 progressDialog.dismiss();
             }
 
             @Override
             public void error(int what, String message, Bundle bundle) {
+                LogUtil.i("审批流触发失败");
                 progressDialog.dismiss();
                 if (!StringUtil.isEmpty(message))
                     Crouton.showToast(ct, message, R.color.load_error);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/BusinessTravelActivity.java

@@ -76,7 +76,6 @@ public class BusinessTravelActivity extends BaseActivity {
                         LogUtil.i("e=" + e.getMessage());
                         ToastUtil.showToast(ct, e.getMessage());
                     }
-
                 }
                 mRefreshLayout.stopRefresh();
                 progressDialog.dismiss();

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/adapter/BusinessTravelAdapter.java

@@ -90,8 +90,9 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         holder.statusTv.setText(model.getStatus());
         holder.levelTv.setText(model.getLevel());
         holder.businessNameTv.setText(model.getBusinessName());
-        holder.whenLongTv.setText("共1天");
-        holder.numberTv.setText("1人");
+        String whenLongTv="入住"+DateFormatUtil.long2Str(model.getStartTime(),"MM:dd")+"      离店"+DateFormatUtil.long2Str(model.getStartTime(),"MM:dd")+"    共2晚";
+        holder.whenLongTv.setText(whenLongTv);
+        holder.numberTv.setText(model.getNumber()+"人");
         holder.nameTv.setText("龚鹏明");
         holder.idTypeTv.setText("二代身份证");
         holder.idCardTv.setText("450122xxxxxxxxxx");
@@ -116,7 +117,8 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         holder.statusTv.setText(model.getStatus());
         holder.levelTv.setText(model.getLevel());
         holder.businessNameTv.setText(model.getBusinessName());
-        holder.whenLongTv.setText("共1天");
+        String whenLongTv="入住"+DateFormatUtil.long2Str(model.getStartTime(),"MM:dd")+"      离店"+DateFormatUtil.long2Str(model.getStartTime(),"MM:dd")+"    共2晚";
+        holder.whenLongTv.setText(whenLongTv);
         holder.numberTv.setText("1人");
         holder.nameTv.setText("龚鹏明");
         holder.idTypeTv.setText("二代身份证");
@@ -171,23 +173,23 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             subRl = itemView.findViewById(R.id.subRl);
             codeTv = itemView.findViewById(R.id.codeTv);
             statusTv = itemView.findViewById(R.id.statusTv);
-            levelTv = itemView.findViewById(R.id.statusTv);
-            businessNameTv = itemView.findViewById(R.id.statusTv);
-            whenLongTv = itemView.findViewById(R.id.statusTv);
-            numberTv = itemView.findViewById(R.id.statusTv);
-            nameTv = itemView.findViewById(R.id.statusTv);
-            idTypeTv = itemView.findViewById(R.id.statusTv);
-            idCardTv = itemView.findViewById(R.id.statusTv);
-            roomsTv = itemView.findViewById(R.id.statusTv);
-            seatTv = itemView.findViewById(R.id.statusTv);
-            realFeeTv = itemView.findViewById(R.id.statusTv);
-            payTypeTv = itemView.findViewById(R.id.statusTv);
-            doneTv = itemView.findViewById(R.id.statusTv);
-            expandTv = itemView.findViewById(R.id.statusTv);
-            addressTv = itemView.findViewById(R.id.statusTv);
-            dateTv = itemView.findViewById(R.id.statusTv);
-            numberSubTv = itemView.findViewById(R.id.statusTv);
-            expecteFeeTv = itemView.findViewById(R.id.statusTv);
+            levelTv = itemView.findViewById(R.id.levelTv);
+            businessNameTv = itemView.findViewById(R.id.businessNameTv);
+            whenLongTv = itemView.findViewById(R.id.whenLongTv);
+            numberTv = itemView.findViewById(R.id.numberTv);
+            nameTv = itemView.findViewById(R.id.nameTv);
+            idTypeTv = itemView.findViewById(R.id.idTypeTv);
+            idCardTv = itemView.findViewById(R.id.idCardTv);
+            roomsTv = itemView.findViewById(R.id.roomsTv);
+            seatTv = itemView.findViewById(R.id.seatTv);
+            realFeeTv = itemView.findViewById(R.id.realFeeTv);
+            payTypeTv = itemView.findViewById(R.id.payTypeTv);
+            doneTv = itemView.findViewById(R.id.doneTv);
+            expandTv = itemView.findViewById(R.id.expandTv);
+            addressTv = itemView.findViewById(R.id.addressTv);
+            dateTv = itemView.findViewById(R.id.dateTv);
+            numberSubTv = itemView.findViewById(R.id.numberSubTv);
+            expecteFeeTv = itemView.findViewById(R.id.expecteFeeTv);
         }
     }
 
@@ -205,23 +207,23 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             subRl = itemView.findViewById(R.id.subRl);
             codeTv = itemView.findViewById(R.id.codeTv);
             statusTv = itemView.findViewById(R.id.statusTv);
-            levelTv = itemView.findViewById(R.id.statusTv);
-            businessNameTv = itemView.findViewById(R.id.statusTv);
-            whenLongTv = itemView.findViewById(R.id.statusTv);
-            numberTv = itemView.findViewById(R.id.statusTv);
-            nameTv = itemView.findViewById(R.id.statusTv);
-            idTypeTv = itemView.findViewById(R.id.statusTv);
-            idCardTv = itemView.findViewById(R.id.statusTv);
-            roomsTv = itemView.findViewById(R.id.statusTv);
-            seatTv = itemView.findViewById(R.id.statusTv);
-            realFeeTv = itemView.findViewById(R.id.statusTv);
-            payTypeTv = itemView.findViewById(R.id.statusTv);
-            doneTv = itemView.findViewById(R.id.statusTv);
-            expandTv = itemView.findViewById(R.id.statusTv);
-            addressTv = itemView.findViewById(R.id.statusTv);
-            dateTv = itemView.findViewById(R.id.statusTv);
-            numberSubTv = itemView.findViewById(R.id.statusTv);
-            expecteFeeTv = itemView.findViewById(R.id.statusTv);
+            levelTv = itemView.findViewById(R.id.levelTv);
+            businessNameTv = itemView.findViewById(R.id.businessNameTv);
+            whenLongTv = itemView.findViewById(R.id.whenLongTv);
+            numberTv = itemView.findViewById(R.id.numberTv);
+            nameTv = itemView.findViewById(R.id.nameTv);
+            idTypeTv = itemView.findViewById(R.id.idTypeTv);
+            idCardTv = itemView.findViewById(R.id.idCardTv);
+            roomsTv = itemView.findViewById(R.id.roomsTv);
+            seatTv = itemView.findViewById(R.id.seatTv);
+            realFeeTv = itemView.findViewById(R.id.realFeeTv);
+            payTypeTv = itemView.findViewById(R.id.payTypeTv);
+            doneTv = itemView.findViewById(R.id.doneTv);
+            expandTv = itemView.findViewById(R.id.expandTv);
+            addressTv = itemView.findViewById(R.id.addressTv);
+            dateTv = itemView.findViewById(R.id.dateTv);
+            numberSubTv = itemView.findViewById(R.id.numberSubTv);
+            expecteFeeTv = itemView.findViewById(R.id.expecteFeeTv);
         }
     }
 

app_modular/appworks/src/main/res/drawable/radian_white_bg.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- solid 设置stroke设置的边框以内的颜色 -->
+    <solid android:color="#ffffff" />
+    <!-- stroke主要设置组件的边框。width为边框宽度，color为边框颜色 -->
+    <stroke
+        android:width="10dp"
+        android:color="@color/base_bg" />
+    <!-- corners 设置边框四角弧度 -->
+    <corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp"/>
+    <padding
+        android:bottom="@dimen/padding"
+        android:left="@dimen/padding"
+        android:right="@dimen/padding"
+        android:top="@dimen/padding" />
+
+</shape>

app_modular/appworks/src/main/res/drawable/text_frame_radian_hint_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:radius="10dp" />
+            <stroke android:width="@dimen/line" android:color="@color/text_hine" />
+            <padding android:bottom="2dp" android:left="2dp" android:right="2dp" android:top="2dp" />
+        </shape>
+    </item>
+</selector>

app_modular/appworks/src/main/res/drawable/text_frame_radian_red_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:radius="10dp" />
+            <stroke android:width="@dimen/line" android:color="@color/indianred" />
+            <padding android:bottom="2dp" android:left="2dp" android:right="2dp" android:top="2dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -2,15 +2,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/padding"
-    android:background="@drawable/round_bg"
+    android:layout_marginLeft="@dimen/padding"
+    android:layout_marginRight="@dimen/padding"
+    android:background="@color/base_bg"
     android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/cui"
-        android:padding="@dimen/padding">
+        android:background="@drawable/radian_top_cui_bg"
+        android:padding="6dp">
 
         <TextView
             android:id="@+id/codeTv"
@@ -18,8 +19,6 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:paddingBottom="5dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
             android:paddingTop="5dp"
             android:text="住宿"
             android:textColor="@color/white"
@@ -42,6 +41,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:layout_below="@id/codeTv"
             android:background="@color/white" />
 
         <TextView
@@ -50,6 +50,7 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/codeTv"
             android:layout_below="@id/codeTv"
+            android:layout_marginTop="@dimen/padding"
             android:textColor="@color/white"
             android:textSize="@dimen/textXXL" />
 
@@ -87,7 +88,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/white"
-        android:padding="@dimen/padding">
+        android:padding="6dp">
 
         <TextView
             android:id="@+id/nameTv"
@@ -185,12 +186,17 @@
 
     </RelativeLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line" />
 
     <RelativeLayout
         android:id="@+id/subRl"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/white">
+        android:background="@drawable/radian_bottom_white_bg"
+        android:padding="6dp">
 
         <TextView
             android:id="@+id/addressTag"
@@ -206,7 +212,6 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/padding"
             android:layout_toRightOf="@id/addressTag"
-            android:drawableRight="@drawable/icon_more_down"
             android:ellipsize="end"
             android:lines="1" />
 
@@ -227,7 +232,6 @@
             android:layout_alignTop="@id/dateTag"
             android:layout_marginLeft="@dimen/padding"
             android:layout_toRightOf="@id/dateTag"
-            android:drawableRight="@drawable/icon_more_down"
             android:ellipsize="end"
             android:lines="1" />
 
@@ -248,7 +252,6 @@
             android:layout_alignTop="@id/numberTag"
             android:layout_marginLeft="@dimen/padding"
             android:layout_toRightOf="@id/numberTag"
-            android:drawableRight="@drawable/icon_more_down"
             android:ellipsize="end"
             android:lines="1" />
 
@@ -270,7 +273,6 @@
             android:layout_alignTop="@id/expecteFeeTag"
             android:layout_marginLeft="@dimen/padding"
             android:layout_toRightOf="@id/expecteFeeTag"
-            android:drawableRight="@drawable/icon_more_down"
             android:ellipsize="end"
             android:lines="1" />
     </RelativeLayout>