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

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"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Dec 12 16:48:16 CST 2017
-debugName=134
-versionName=618
-debugCode=134
-versionCode=157
+#Wed Dec 13 16:55:40 CST 2017
+debugName=150
+versionName=624
+debugCode=150
+versionCode=163

app_core/common/src/main/java/com/common/hmac/HmacUtils.java

@@ -1,5 +1,7 @@
 package com.common.hmac;
 
+import com.common.LogUtil;
+
 /**
  * Hmac加密工具
  *
@@ -23,7 +25,9 @@ public class HmacUtils {
      */
     public static String encode(Object message) {
         byte[] encodeData = hmacEncoder.encode(String.valueOf(message).getBytes(), key);
-        return new String(Hex.encode(encodeData));
+        String result=  new String(Hex.encode(encodeData));
+        LogUtil.d("AppLogs","encode result:"+result);
+        return result;
     }
 
 }

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/java/com/core/net/http/HttpClient.java

@@ -122,12 +122,10 @@ public class HttpClient {
 
     public String sendPostRequest(String url, Map<String, String> params)
             throws IOException {
-        // SSLSocketFactory.getSocketFactory().setHostnameVerifier(new AllowAllHostnameVerifier());
         Log.i("HTTP", "post url=" + url);
         String result = null;
         HttpResponse response = null;
         DefaultHttpClient httpclient = MyHttpClient.getNewHttpClient();
-        ;
         boolean sign = true;
         if (sign) {
             url += (url.indexOf("?") == -1 ? "?" : "&") + "_timestamp="

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/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -16,6 +16,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -63,6 +64,7 @@ import com.modular.booking.model.SeatsStateModel;
 import com.modular.booking.widget.AddSubUtils;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -111,6 +113,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     private LinearLayout llPanelBusiness;
     private TextView tvSeatsLeft;
     private TextView tvSeatsRight;
+    private RelativeLayout notes_rl;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -182,6 +185,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         tvSeatsRight=findViewById(R.id.tvSeatsRight);
         llPanelWait=(LinearLayout)findViewById(R.id.llPanelWait);
         llPanelBusiness=(LinearLayout)findViewById(R.id.llPanelBusiness);
+        notes_rl =(RelativeLayout)findViewById(R.id.notes_rl);
                 
         submit_btn.setOnClickListener(this);
         et_book_name.setText(CommonUtil.getName());
@@ -265,6 +269,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 tvSeatsRight.setTextColor(mContext.getResources().getColor(R.color.blue_seats_num));
                 llPanelBusiness.setVisibility(View.VISIBLE);
                 llPanelWait.setVisibility(View.GONE);
+                try {
+                    getSteatListStates(JSON.parseObject(dataService ).getString("sb_companyid"));//获取餐饮类别状态信息
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         });
     }
@@ -988,7 +997,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         map.put("sb_spname", tv_food_rooms.getText());
                     }else{
                         //选桌位
-                        map.put("sb_stname", tv_food_seats.getTag(R.id.tag_id));
+                        if (((Integer)tv_food_seats.getTag(R.id.tag_id2))>0) {
+                            map.put("sb_stname", tv_food_seats.getTag(R.id.tag_id));
+                        }else{
+                            ToastMessage("已无剩余桌位！");
+                            return null;
+                        }
                     }
                   
                 }
@@ -1150,7 +1164,17 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         if (!isEdited) {
             et_book_phone.setText(data.getString("sb_telephone"));
             et_book_name.setText(data.getString("sb_recordor"));
-            et_book_notes.setText(data.getString("sb_remark"));
+            if ("0".equals(data.getString("sb_sex"))){
+                rg_sex.check(rg_sex.getChildAt(0).getId());
+            }else if("1".equals(data.getString("sb_sex"))){
+                rg_sex.check(rg_sex.getChildAt(1).getId());
+            }
+            if (!StringUtil.isEmpty(data.getString("sb_remark"))){
+                et_book_notes.setText(data.getString("sb_remark"));
+                notes_rl.setVisibility(View.VISIBLE);
+            }else{
+                notes_rl.setVisibility(View.GONE);
+            }
             et_book_phone.setKeyListener(null);
             et_book_name.setEnabled(false);
             et_book_notes.setEnabled(false);
@@ -1159,6 +1183,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             case "餐饮"://餐饮
                 findViewById(R.id.ll_food).setVisibility(View.VISIBLE);
                 if (isEdited) {
+                    searchSeatNumbers(DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd HH:ss"),model.getCompanyid());
                     tv_food_times.setOnClickListener(this);
                     tv_food_rooms.setOnClickListener(this);
                     tv_food_peoples.setOnClickListener(this);
@@ -1175,6 +1200,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
              
                     searchSeatNumbers(tv_food_times.getText().toString(),data.getString("sb_companyid"));
                     getSteatListStates(data.getString("sb_companyid"));//获取餐饮类别状态信息
+                    
+                    if(StringUtil.isEmpty(data.getString("sb_stname"))){
+                        tv_food_rooms.setText("无");
+                    }else{
+                        tv_food_rooms.setText(data.getString("sb_stname"));
+                    }
                     tv_food_rooms.setText(data.getString("sb_stname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
                     tv_food_peoples.setVisibility(View.VISIBLE);
@@ -1315,11 +1346,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             case "10003"://餐饮
                 findViewById(R.id.ll_food).setVisibility(View.VISIBLE);
                 if (isEdited) {
+                    searchSeatNumbers(DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd HH:ss"),model.getCompanyid());
                     tv_food_times.setOnClickListener(this);
                     tv_food_rooms.setOnClickListener(this);
                     tv_food_peoples.setOnClickListener(this);
-                    addSubUtils.setVisibility(View.VISIBLE);
                     tv_food_peoples.setVisibility(View.GONE);
+                    addSubUtils.setVisibility(View.VISIBLE);
                     tvSeatsRight.setVisibility(View.GONE);
                 } else {
                     if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
@@ -1328,8 +1360,14 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         tv_food_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
                                 + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
+
                     searchSeatNumbers(tv_food_times.getText().toString(),data.getString("sb_companyid"));
-                    tv_food_rooms.setText(data.getString("sb_spname"));
+                    if(StringUtil.isEmpty(data.getString("sb_stname"))){
+                        tv_food_rooms.setText("无");
+                    }else{
+                        tv_food_rooms.setText(data.getString("sb_stname"));
+                    }
+                    tv_food_rooms.setText(data.getString("sb_stname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
                     tv_food_peoples.setVisibility(View.VISIBLE);
                     addSubUtils.setVisibility(View.GONE);
@@ -1624,8 +1662,14 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                              CommonUtil.textSpanForStyle(tvDSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
                                          }
                                     if (asType.equals(king)){
+                                        if (bookednumber<=0){
+                                            bookednumber=0;
+                                            ToastMessage("已无剩余桌量！");
+                                        }
                                         tv_food_seats.setTag(R.id.tag_id,deskcode);
+                                        tv_food_seats.setTag(R.id.tag_id2,bookednumber);//桌位数量
                                         CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookednumber+"桌",String.valueOf(bookednumber),ct.getResources().getColor(R.color.blue_seats_num));
+                                        isEnter=false;
                                     }else{
                                        isEnter=true;//置空，下面循环会进入指定逻辑代码
                                     }
@@ -1645,10 +1689,15 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                     if (ListUtils.isEmpty(deskbook)) {
                                         if (as_type.equals(asType)||isEnter) {
                                             //tv_food_seats.setText("仅剩"+as_number+"桌");
+                                            if (bookNum<=0){
+                                                bookNum=0;
+                                                ToastMessage("已无剩余桌量！");
+                                            }
                                             CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookNum+"桌",String.valueOf(bookNum),ct.getResources().getColor(R.color.blue_seats_num));
                                             LogUtil.d(TAG,"as_number:"+as_number+" as_deskcode:"+as_deskcode);
                                            // tv_food_seats.setTag(0,as_number);
                                             tv_food_seats.setTag(R.id.tag_id,as_deskcode+"01");//桌位编号
+                                            tv_food_seats.setTag(R.id.tag_id2,bookNum);//桌位数量
                                        }
                                         LogUtil.d(TAG,"桌:"+as_type+"：前方"+as_number+"桌");
                                         if ("小桌".equals(as_type)){

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

@@ -438,15 +438,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_alignParentRight="true"
+                    android:gravity="center_vertical"
                     jmf:editable="true"
-                    jmf:ImageWidth="40dp"
-                    jmf:contentWidth="20dp"
+                    jmf:all_background="@color/me_menu_item_normal"
                     jmf:contentTextColor="@color/black"
                     jmf:contentBackground="@color/me_menu_item_normal"
-                    jmf:leftBackground="@color/me_menu_item_normal"
-                    jmf:rightBackground="@color/me_menu_item_normal"
-                    jmf:leftResources="@drawable/icon_remove"
-                    jmf:rightResources="@drawable/icon_add">
+                    jmf:leftBackground="@drawable/icon_remove"
+                    jmf:rightBackground="@drawable/icon_add"
+                    jmf:leftResources="@color/me_menu_item_normal"
+                    jmf:rightResources="@color/me_menu_item_normal">
                 </com.modular.booking.widget.AddSubUtils>
             </RelativeLayout>
 
@@ -495,7 +495,7 @@
                     android:layout_toLeftOf="@+id/sv_food_rooms"
                     android:drawableRight="@drawable/oa_next"
                     android:contentDescription="@string/service_food_rooms"
-                    android:hint="@string/common_select"
+                    android:hint="@string/common_select_not_must"
                     android:text="否"
                     android:textColor="@color/hintColor" />
                 <com.core.widget.view.SwitchView

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()&&false;
     }
 
     public static boolean showShebeiguanli() {

app_modular/apputils/src/main/java/com/modular/apputils/widget/SpaceItemDecoration.java

@@ -31,12 +31,12 @@ public class SpaceItemDecoration extends RecyclerView.ItemDecoration {
     @Override
     public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
         super.getItemOffsets(outRect, view, parent, state);
-        outRect.left = mSpace;
-        outRect.right = mSpace;
+//        outRect.left = mSpace;
+//        outRect.right = mSpace;
         outRect.bottom = mSpace;
-        if (parent.getChildAdapterPosition(view) == 0) {
-            outRect.top = mSpace;
-        }
+//        if (parent.getChildAdapterPosition(view) == 0) {
+//            outRect.top = mSpace;
+//        }
  
     }
  

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

@@ -38,55 +38,73 @@ public class BusinessTravelActivity extends BaseActivity {
     private RecyclerView mRecyclerView;
     private BusinessTravelAdapter mAdapter;
 
+    private int page = 1;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_business_travel);
         initView();
-//        loadData();
-        try {
-            handlerData(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        loadData(page = 1);
     }
 
     private void initView() {
         mRefreshLayout = findViewById(R.id.mRefreshLayout);
         mRecyclerView = findViewById(R.id.mRecyclerView);
-    }
-
+        mRefreshLayout.setOnRefreshListener(new BaseRefreshLayout.onRefreshListener() {
+            @Override
+            public void onRefresh() {
+                loadData(page = 1);
+            }
 
-    public void loadData() {
-        progressDialog.show();
-        httpClient.Api().send(new HttpClient.Builder()
-                .url("mobile/getFeePlease.action")
-                .add("emcode", CommonUtil.getEmcode())
-                .header("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
-                .method(Method.GET)
-                .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
-            public void onResponse(Object o) {
-                try {
-                    if (o != null) {
-                        handlerData(o.toString());
-                    }
-                } catch (Exception e) {
-                    if (e != null) {
-                        LogUtil.i("e=" + e.getMessage());
-                        ToastUtil.showToast(ct, e.getMessage());
-                    }
+            public void onLoadMore() {
+                loadData(++page);
+            }
+        });
+    }
 
-                }
+
+    public void loadData(int page) {
+        if (1 == 1) {
+            try {
+                handlerData(TestStr.FEEPLEASE);
                 mRefreshLayout.stopRefresh();
-                progressDialog.dismiss();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-        }));
+        } else {
+            if (!mRefreshLayout.isRefreshing()) {
+                progressDialog.show();
+            }
+            httpClient.Api().send(new HttpClient.Builder()
+                    .url("mobile/getFeePlease.action")
+                    .add("emcode", CommonUtil.getEmcode())
+                    .add("page", page)
+                    .header("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
+                    .method(Method.GET)
+                    .build(), new ResultSubscriber<>(new ResultListener<Object>() {
+                @Override
+                public void onResponse(Object o) {
+                    try {
+                        if (o != null) {
+                            handlerData(o.toString());
+                        }
+                    } catch (Exception e) {
+                        if (e != null) {
+                            LogUtil.i("e=" + e.getMessage());
+                            ToastUtil.showToast(ct, e.getMessage());
+                        }
+                    }
+                    mRefreshLayout.stopRefresh();
+                    progressDialog.dismiss();
+                }
+            }));
+        }
+
     }
 
     private void handlerData(String message) throws Exception {
-        LogUtil.i("message=" + message);
-        message = TestStr.FEEPLEASE;
         JSONArray listdata = JSONUtil.getJSONArray(message, "listdata");
         List<BusinessTravel> models = new ArrayList<>();
         BusinessTravel model = null;
@@ -116,7 +134,11 @@ public class BusinessTravelActivity extends BaseActivity {
             mRecyclerView.setLayoutManager(new LinearLayoutManager(ct));
             mRecyclerView.setAdapter(mAdapter);
         } else {
-            mAdapter.setModels(models);
+            if (page == 1) {
+                mAdapter.setModels(models);
+            } else {
+                mAdapter.addModels(models);
+            }
         }
     }
 }

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

@@ -8,9 +8,10 @@ import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.baidu.cyberplayer.utils.G;
+
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
+import com.modular.apputils.widget.TravelDirectionView;
 import com.uas.appworks.OA.platform.model.BusinessTravel;
 import com.uas.appworks.R;
 
@@ -72,10 +73,13 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             BusinessTravel model = models.get(position);
             if (holder instanceof TitleViewHolder) {
                 bindTitleView((TitleViewHolder) holder, model);
-            } else if (holder instanceof AirViewHolder) {
-                bindAirView((AirViewHolder) holder, model, position);
-            } else if (holder instanceof HotelViewHolder) {
-                bindHotelView((HotelViewHolder) holder, model,position);
+            } else if (holder instanceof BaseViewHlder) {
+                bindBaseView((BaseViewHlder) holder, model, position);
+                if (holder instanceof AirViewHolder) {
+                    bindAirView((AirViewHolder) holder, model, position);
+                } else if (holder instanceof HotelViewHolder) {
+                    bindHotelView((HotelViewHolder) holder, model);
+                }
             }
 
         }
@@ -85,56 +89,60 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         holder.codeTv.setText(model.getCode());
     }
 
-    private void bindAirView(AirViewHolder holder, BusinessTravel model, int position) {
-        holder.codeTv.setText("住宿:"+model.getCode());
+
+    private void bindBaseView(BaseViewHlder holder, BusinessTravel model, int position) {
+        holder.codeTv.setText(model.getTitle());
         holder.statusTv.setText(model.getStatus());
-        holder.levelTv.setText(model.getLevel());
-        holder.businessNameTv.setText(model.getBusinessName());
-        holder.whenLongTv.setText("共1天");
-        holder.numberTv.setText("1人");
         holder.nameTv.setText("龚鹏明");
-        holder.idTypeTv.setText("二代身份证");
-        holder.idCardTv.setText("450122xxxxxxxxxx");
-        holder.roomsTv.setText("1间");
+        holder.idCardTv.setText("450122xxxxxxx");
         holder.seatTv.setText(model.getSeat());
         holder.realFeeTv.setText(model.getRealFee());
         holder.payTypeTv.setText(model.getPayType());
-        holder.addressTv.setText(model.getAddress());
-        holder.dateTv.setText(DateFormatUtil.long2Str(DateFormatUtil.YMD));
-        holder.numberSubTv.setText(model.getNumber() + "人");
+        holder.levelTv.setText(model.getLevel());
         holder.expecteFeeTv.setText(model.getExpecteFee());
-        holder.subRl.setVisibility(model.isExpand() ? View.VISIBLE : View.GONE);
+        holder.idTypeTv.setText("二代身份证");
+        holder.dateTv.setText(model.getDate());
         holder.doneTv.setTag(R.id.tag_key, model);
+        holder.doneTv.setTag(R.id.tag_key2, position);
         holder.doneTv.setOnClickListener(this);
         holder.expandTv.setTag(R.id.tag_key, model);
         holder.expandTv.setTag(R.id.tag_key2, position);
         holder.expandTv.setOnClickListener(this);
+        holder.subRl.setVisibility(model.isExpand() ? View.VISIBLE : View.GONE);
     }
 
-    private void bindHotelView(HotelViewHolder holder, BusinessTravel model, int position) {
-        holder.codeTv.setText(model.getCode());
-        holder.statusTv.setText(model.getStatus());
-        holder.levelTv.setText(model.getLevel());
+    private void bindAirView(AirViewHolder holder, BusinessTravel model, int position) {
+        String fromCity = model.getStarting();
+        String toCity = model.getDestination();
+        //出发点
+        holder.fromCityTv.setText(fromCity);
+        holder.startDateTv.setText(DateFormatUtil.long2Str(model.getStartTime(), "yyyy-MM-dd"));
+        holder.startTimeTv.setText(DateFormatUtil.long2Str(model.getStartTime(), "HH:mm"));
+        holder.orderTypeTv.setText(model.getOrderType());
+        //目的地
+        holder.toCityTv.setText(toCity);
+        holder.toDateTv.setText(DateFormatUtil.long2Str(model.getEndTime(), "yyyy-MM-dd"));
+        holder.toTimeTv.setText(DateFormatUtil.long2Str(model.getEndTime(), "HH:mm"));
+        //行程
+        holder.tripTv.setText(fromCity + "-" + toCity);
+        holder.mTravelDirectionView.setData(model.getSeat(), longTime2Time(model.getAllTime()));
+        //改签
+        if (model.canChange()) {
+            holder.changeTv.setTag(R.id.tag_key, model);
+            holder.changeTv.setTag(R.id.tag_key2,position );
+            holder.changeTv.setOnClickListener(this);
+        }
+    }
+
+    private void bindHotelView(HotelViewHolder holder, BusinessTravel model) {
+        String whenLongTv = "入住: " + DateFormatUtil.long2Str(model.getStartTime(), "MM-dd") + "      离店: " + DateFormatUtil.long2Str(model.getStartTime(), "MM-dd") + "     共" + longTime2Time(model.getAllTime());
+        holder.whenLongTv.setText(whenLongTv);
         holder.businessNameTv.setText(model.getBusinessName());
-        holder.whenLongTv.setText("共1天");
-        holder.numberTv.setText("1人");
-        holder.nameTv.setText("龚鹏明");
-        holder.idTypeTv.setText("二代身份证");
-        holder.idCardTv.setText("450122xxxxxxxxxx");
+        holder.numberTv.setText(model.getNumber() + "人");
         holder.roomsTv.setText("1间");
-        holder.seatTv.setText(model.getSeat());
-        holder.realFeeTv.setText(model.getRealFee());
-        holder.payTypeTv.setText(model.getPayType());
         holder.addressTv.setText(model.getAddress());
         holder.dateTv.setText(DateFormatUtil.long2Str(DateFormatUtil.YMD));
         holder.numberSubTv.setText(model.getNumber() + "人");
-        holder.expecteFeeTv.setText(model.getExpecteFee());
-        holder.subRl.setVisibility(model.isExpand() ? View.VISIBLE : View.GONE);
-        holder.doneTv.setTag(R.id.tag_key, model);
-        holder.doneTv.setOnClickListener(this);
-        holder.expandTv.setTag(R.id.tag_key, model);
-        holder.expandTv.setTag(R.id.tag_key2, position);
-        holder.expandTv.setOnClickListener(this);
     }
 
 
@@ -153,75 +161,101 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
         public TitleViewHolder(View itemView) {
             super(itemView);
-            codeTv = (TextView) itemView.findViewById(R.id.codeTv);
+            codeTv = itemView.findViewById(R.id.codeTv);
         }
     }
 
-    private class AirViewHolder extends RecyclerView.ViewHolder {
-        TextView codeTv, statusTv, levelTv, businessNameTv, whenLongTv, numberTv,
-                nameTv, idTypeTv, idCardTv, roomsTv, seatTv, realFeeTv, payTypeTv, doneTv, expandTv, addressTv, dateTv, numberSubTv, expecteFeeTv;
-        RelativeLayout subRl;
+    private class HotelViewHolder extends BaseViewHlder {
+        TextView
+                businessNameTv,
+                whenLongTv,
+                numberSubTv,//人数
+                numberTv,
+                dateTv,
+                addressTv,  //地址
+                roomsTv;//房间人数
 
-        public AirViewHolder(ViewGroup viewGroup) {
+        public HotelViewHolder(ViewGroup viewGroup) {
             this(getInflater().inflate(R.layout.item_bus_travel_hotel, viewGroup, false));
         }
 
-        public AirViewHolder(View itemView) {
+        public HotelViewHolder(View itemView) {
             super(itemView);
-            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);
+            businessNameTv = (TextView) itemView.findViewById(R.id.businessNameTv);
+            whenLongTv = (TextView) itemView.findViewById(R.id.whenLongTv);
+            numberTv = (TextView) itemView.findViewById(R.id.numberTv);
+            dateTv = (TextView) itemView.findViewById(R.id.dateTv);
+            roomsTv = (TextView) itemView.findViewById(R.id.roomsTv);
+            addressTv = (TextView) itemView.findViewById(R.id.addressTv);
+            numberSubTv = (TextView) itemView.findViewById(R.id.numberSubTv);
         }
     }
 
-    private class HotelViewHolder extends RecyclerView.ViewHolder {
-        TextView codeTv, statusTv, levelTv, businessNameTv, whenLongTv, numberTv,
-                nameTv, idTypeTv, idCardTv, roomsTv, seatTv, realFeeTv, payTypeTv, doneTv, expandTv, addressTv, dateTv, numberSubTv, expecteFeeTv;
+    public class BaseViewHlder extends RecyclerView.ViewHolder {
+        TextView codeTv,//订单编号
+                statusTv,//订单状态
+                nameTv,//当前人名字
+                idCardTv,//身份证号
+                seatTv,//座位号|房间号
+                realFeeTv,//实际付款
+                payTypeTv,//付款类型（前台自付）
+                doneTv,     //操作
+                expandTv,   //拓展
+                levelTv,    //级别
+                expecteFeeTv,//预计费用
+                idTypeTv, //身份类型
+                dateTv;//入住时间|返程时间
         RelativeLayout subRl;
 
-        public HotelViewHolder(ViewGroup viewGroup) {
-            this(getInflater().inflate(R.layout.item_bus_travel_hotel, viewGroup, false));
+        public BaseViewHlder(View itemView) {
+            super(itemView);
+            subRl = (RelativeLayout) itemView.findViewById(R.id.subRl);
+            codeTv = (TextView) itemView.findViewById(R.id.codeTv);
+            statusTv = (TextView) itemView.findViewById(R.id.statusTv);
+            nameTv = (TextView) itemView.findViewById(R.id.nameTv);
+            idCardTv = (TextView) itemView.findViewById(R.id.idCardTv);
+            seatTv = (TextView) itemView.findViewById(R.id.seatTv);
+            realFeeTv = (TextView) itemView.findViewById(R.id.realFeeTv);
+            payTypeTv = (TextView) itemView.findViewById(R.id.payTypeTv);
+            doneTv = (TextView) itemView.findViewById(R.id.doneTv);
+            expandTv = (TextView) itemView.findViewById(R.id.expandTv);
+            levelTv = (TextView) itemView.findViewById(R.id.levelTv);
+            expecteFeeTv = (TextView) itemView.findViewById(R.id.expecteFeeTv);
+            idTypeTv = (TextView) itemView.findViewById(R.id.idTypeTv);
+            dateTv = (TextView) itemView.findViewById(R.id.dateTv);
         }
+    }
 
-        public HotelViewHolder(View itemView) {
+
+    private class AirViewHolder extends BaseViewHlder {
+        TextView fromCityTv,
+                startDateTv,
+                startTimeTv,
+                orderTypeTv,//票据类型
+                toCityTv,
+                toDateTv,
+                toTimeTv,
+                tripTv,
+                changeTv;
+        TravelDirectionView mTravelDirectionView;
+
+        public AirViewHolder(ViewGroup viewGroup) {
+            this(getInflater().inflate(R.layout.item_bus_travel_air, viewGroup, false));
+        }
+
+        public AirViewHolder(View itemView) {
             super(itemView);
-            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);
+            changeTv = itemView.findViewById(R.id.changeTv);
+            mTravelDirectionView = itemView.findViewById(R.id.mTravelDirectionView);
+            fromCityTv = (TextView) itemView.findViewById(R.id.fromCityTv);
+            startDateTv = (TextView) itemView.findViewById(R.id.startDateTv);
+            startTimeTv = (TextView) itemView.findViewById(R.id.startTimeTv);
+            toCityTv = (TextView) itemView.findViewById(R.id.toCityTv);
+            toDateTv = (TextView) itemView.findViewById(R.id.toDateTv);
+            toTimeTv = (TextView) itemView.findViewById(R.id.toTimeTv);
+            orderTypeTv = (TextView) itemView.findViewById(R.id.orderTypeTv);
+            tripTv = (TextView) itemView.findViewById(R.id.tripTv);
+
         }
     }
 
@@ -240,4 +274,12 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         void click(int position, BusinessTravel model);
     }
 
+
+    private String longTime2Time(long time) {
+        long second = time / 1000;
+        long hh = second / 3600;
+        long mm = (second % 3600) / 60;
+        return hh + "小时" + mm + "分钟";
+    }
+
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/model/BusinessTravel.java

@@ -1,7 +1,7 @@
 package com.uas.appworks.OA.platform.model;
 
 import com.alibaba.fastjson.JSONObject;
-import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 
 
@@ -34,6 +34,7 @@ public class BusinessTravel {
     private String payType;
     private String businessName;
     private String remark;
+    private String title;
 
     public BusinessTravel() {
     }
@@ -60,15 +61,20 @@ public class BusinessTravel {
             payType = JSONUtil.getText(reimbursement, "fpd_pay_type");
             businessName = JSONUtil.getText(reimbursement, "fpd_business_name");
             remark = JSONUtil.getText(reimbursement, "fpd_remark");
-            if (type.equals("train") || type.equals("air")) {
+            if (type.equals("train")) {
+                title = "火车票";
+                this.type = AIR;
+            } else if (type.equals("air")) {
+                title = "飞机票";
                 this.type = AIR;
             } else if (type.equals("hotel")) {
+                title = "住宿";
                 this.type = HOTEL;
             } else {
+                title = "出差单号";
                 this.type = TITLE;
             }
         } catch (Exception e) {
-            LogUtil.i("e="+e.getMessage());
         }
     }
 
@@ -121,7 +127,7 @@ public class BusinessTravel {
     }
 
     public String getCode() {
-        return code==null?"":code;
+        return code == null ? "" : code;
     }
 
     public void setCode(String code) {
@@ -201,7 +207,7 @@ public class BusinessTravel {
     }
 
     public String getAddress() {
-        return address==null?"":address;
+        return address == null ? "" : address;
     }
 
     public void setAddress(String address) {
@@ -217,7 +223,7 @@ public class BusinessTravel {
     }
 
     public String getBusinessName() {
-        return businessName==null?"":businessName;
+        return businessName == null ? "" : businessName;
     }
 
     public void setBusinessName(String businessName) {
@@ -239,4 +245,17 @@ public class BusinessTravel {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public boolean canChange() {
+        //TODO 判断时候可以改签
+        return true;
+    }
+
+    public String getTitle() {
+        return title + "   " + code;
+    }
+
+    public String getDate() {
+        return type==AIR?(DateFormatUtil.long2Str(endTime,"yyyy-MM-dd")):(DateFormatUtil.long2Str(startTime,"yyyy-MM-dd")+"-"+DateFormatUtil.long2Str(endTime,"yyyy-MM-dd"));
+    }
 }

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="3dp" />
+            <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="3dp" />
+            <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_air.xml

@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    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="@drawable/radian_top_cui_bg"
+        android:paddingBottom="@dimen/padding">
+
+        <TextView
+            android:id="@+id/codeTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/padding"
+            android:layout_marginTop="@dimen/padding"
+            android:gravity="center_horizontal"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            android:text="单程机票：671283"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_hine" />
+
+        <TextView
+            android:id="@+id/statusTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@id/codeTv"
+            android:layout_marginRight="@dimen/padding"
+            android:text="已提交"
+            android:textColor="@color/cui_yellow"
+            android:textSize="@dimen/text_hine" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_below="@id/codeTv"
+            android:background="@color/white" />
+
+        <LinearLayout
+            android:id="@+id/fromLL"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/codeTv"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="@dimen/padding"
+            android:layout_marginTop="@dimen/padding"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/fromCityTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="上海"
+                android:textColor="@color/white"
+                android:textSize="@dimen/textXXL" />
+
+            <TextView
+                android:id="@+id/startDateTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/fromCityTv"
+                android:lines="1"
+                android:text="2017-12-12"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                android:id="@+id/startTimeTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="07:20"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/toLL"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@id/fromLL"
+            android:layout_marginLeft="@dimen/padding"
+            android:layout_marginRight="20dp"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/toCityTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/codeTv"
+                android:text="深圳"
+                android:textColor="@color/white"
+                android:textSize="@dimen/textXXL" />
+
+            <TextView
+                android:id="@+id/toDateTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/fromCityTv"
+                android:gravity="center"
+                android:lines="1"
+                android:text="2017-12-12"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                android:id="@+id/toTimeTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="07:20"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+        </LinearLayout>
+
+
+        <com.modular.apputils.widget.TravelDirectionView
+            android:id="@+id/mTravelDirectionView"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_alignTop="@id/fromLL"
+            android:layout_toLeftOf="@id/toLL"
+            android:layout_toRightOf="@id/fromLL"
+            app:time="2小时20分"
+            app:timeSize="@dimen/text_hine"
+            app:title="D7890"
+            app:titleSize="@dimen/text_main" />
+
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:padding="@dimen/padding">
+
+        <TextView
+            android:id="@+id/nameTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/padding"
+            android:text="周炳"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/idTypeTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@id/nameTv"
+            android:layout_marginLeft="@dimen/padding"
+            android:text="二代身份证"
+            android:textColor="@color/text_hine"
+            android:textSize="@dimen/text_hine" />
+
+        <TextView
+            android:id="@+id/idCardTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/padding"
+            android:layout_toLeftOf="@id/idTypeTv"
+            android:layout_toRightOf="@id/nameTv"
+            android:text="4501221994312319827"
+            android:textColor="@color/text_hine"
+            android:textSize="@dimen/text_hine" />
+
+        <TextView
+            android:id="@+id/orderTypeTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/nameTv"
+            android:layout_marginBottom="@dimen/padding"
+            android:layout_marginTop="@dimen/padding"
+            android:text="1间"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/seatTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/idCardTv"
+            android:layout_alignTop="@id/orderTypeTv"
+            android:layout_marginRight="@dimen/padding"
+            android:text="A30H"
+            android:textColor="@color/indianred"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/realFeeTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/orderTypeTv"
+            android:layout_marginLeft="30dp"
+            android:layout_toRightOf="@id/seatTv"
+            android:text="54元"
+            android:textColor="@color/indianred"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/payTypeTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@id/orderTypeTv"
+            android:text="前台自付"
+            android:textColor="@color/indianred"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/doneTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/orderTypeTv"
+            android:background="@drawable/text_frame_radian_red_bg"
+            android:padding="4dp"
+            android:text="取消预约"
+            android:textColor="@color/indianred" />
+
+        <TextView
+            android:id="@+id/changeTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/orderTypeTv"
+            android:layout_marginRight="@dimen/padding"
+            android:layout_toLeftOf="@id/doneTv"
+            android:background="@drawable/text_frame_radian_hint_bg"
+            android:padding="4dp"
+            android:text="改签"
+            android:textColor="@color/text_hine" />
+
+        <TextView
+            android:id="@+id/expandTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/doneTv"
+            android:drawableRight="@drawable/icon_more_down"
+            android:text="申请记录" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_below="@id/doneTv" />
+
+    </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="@drawable/radian_bottom_white_bg"
+        android:padding="6dp">
+
+        <TextView
+            android:id="@+id/addressTag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/padding"
+            android:layout_marginTop="@dimen/padding"
+            android:text="行程"
+            android:textColor="@color/text_hine" />
+
+        <TextView
+            android:id="@+id/tripTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/addressTag"
+            android:layout_marginLeft="40dp"
+            android:layout_toRightOf="@id/addressTag"
+            android:ellipsize="end"
+            android:lines="1"
+            android:text="城市地址"
+            android:textColor="@color/text_main" />
+
+        <TextView
+            android:id="@+id/dateTag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/addressTag"
+            android:layout_marginRight="@dimen/padding"
+            android:layout_marginTop="@dimen/padding"
+            android:text="返程时间:"
+            android:textColor="@color/text_hine" />
+
+        <TextView
+            android:id="@+id/dateTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/tripTv"
+            android:layout_alignTop="@id/dateTag"
+            android:layout_toRightOf="@id/dateTag"
+            android:ellipsize="end"
+            android:lines="1"
+            android:text="城市地址"
+            android:textColor="@color/text_main" />
+
+        <TextView
+            android:id="@+id/numberTag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/dateTag"
+            android:layout_marginRight="@dimen/padding"
+            android:layout_marginTop="@dimen/padding"
+            android:text="席别:"
+            android:textColor="@color/text_hine" />
+
+        <TextView
+            android:id="@+id/levelTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/tripTv"
+            android:layout_alignTop="@id/numberTag"
+            android:layout_toRightOf="@id/numberTag"
+            android:ellipsize="end"
+            android:lines="1"
+            android:text="城市地址"
+            android:textColor="@color/text_main" />
+
+
+        <TextView
+            android:id="@+id/expecteFeeTag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/numberTag"
+            android:layout_marginRight="@dimen/padding"
+            android:layout_marginTop="@dimen/padding"
+            android:text="预计费用:"
+            android:textColor="@color/text_hine" />
+
+        <TextView
+            android:id="@+id/expecteFeeTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/tripTv"
+            android:layout_alignTop="@id/expecteFeeTag"
+            android:layout_toRightOf="@id/expecteFeeTag"
+            android:ellipsize="end"
+            android:lines="1"
+            android:text="预计费用"
+            android:textColor="@color/text_main" />
+    </RelativeLayout>
+</LinearLayout>

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

@@ -2,24 +2,25 @@
 <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:paddingBottom="@dimen/padding">
 
         <TextView
             android:id="@+id/codeTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/padding"
+            android:layout_marginTop="@dimen/padding"
             android:gravity="center_horizontal"
             android:paddingBottom="5dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
             android:paddingTop="5dp"
             android:text="住宿"
             android:textColor="@color/white"
@@ -31,17 +32,15 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_alignTop="@id/codeTv"
-            android:paddingBottom="5dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:paddingTop="5dp"
-            android:text="住宿"
+            android:layout_marginRight="@dimen/padding"
+            android:text="状态"
             android:textColor="@color/cui_yellow"
             android:textSize="@dimen/text_hine" />
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:layout_below="@id/codeTv"
             android:background="@color/white" />
 
         <TextView
@@ -50,6 +49,8 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/codeTv"
             android:layout_below="@id/codeTv"
+            android:layout_marginTop="@dimen/padding"
+            android:text="标准单人间"
             android:textColor="@color/white"
             android:textSize="@dimen/textXXL" />
 
@@ -58,7 +59,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/levelTv"
+            android:layout_marginLeft="@dimen/padding"
             android:layout_toRightOf="@id/levelTv"
+            android:text="香格里拉酒店"
             android:textColor="@color/white"
             android:textSize="@dimen/textXL" />
 
@@ -68,6 +71,8 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/levelTv"
             android:layout_below="@id/levelTv"
+            android:layout_marginTop="@dimen/padding"
+            android:text="入住：12-10     离店：12-12    共两晚"
             android:textColor="@color/white"
             android:textSize="@dimen/text_hine" />
 
@@ -77,6 +82,8 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/whenLongTv"
             android:layout_below="@id/whenLongTv"
+            android:layout_marginTop="@dimen/padding"
+            android:text="1人"
             android:textColor="@color/white"
             android:textSize="@dimen/text_hine" />
 
@@ -94,6 +101,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/padding"
+            android:text="周炳"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
@@ -115,6 +123,7 @@
             android:layout_marginLeft="@dimen/padding"
             android:layout_toLeftOf="@id/idTypeTv"
             android:layout_toRightOf="@id/nameTv"
+            android:text="4501221994312319827"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
 
@@ -136,8 +145,8 @@
             android:layout_alignLeft="@id/idCardTv"
             android:layout_alignTop="@id/roomsTv"
             android:layout_marginRight="@dimen/padding"
-            android:text="1间"
-            android:textColor="@color/text_main"
+            android:text="A30H"
+            android:textColor="@color/indianred"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -145,10 +154,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/roomsTv"
-            android:layout_marginLeft="@dimen/padding"
+            android:layout_marginLeft="30dp"
             android:layout_toRightOf="@id/seatTv"
-            android:text="1间"
-            android:textColor="@color/text_main"
+            android:text="54元"
+            android:textColor="@color/indianred"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -157,8 +166,8 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_alignTop="@id/roomsTv"
-            android:text="1间"
-            android:textColor="@color/text_main"
+            android:text="前台自付"
+            android:textColor="@color/indianred"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -167,14 +176,16 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_below="@id/roomsTv"
-            android:text="取消预约" />
+            android:background="@drawable/text_frame_radian_red_bg"
+            android:padding="4dp"
+            android:text="取消预约"
+            android:textColor="@color/indianred" />
 
         <TextView
             android:id="@+id/expandTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/doneTv"
-            android:layout_below="@id/roomsTv"
             android:drawableRight="@drawable/icon_more_down"
             android:text="申请记录" />
 
@@ -185,12 +196,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"
@@ -198,17 +214,20 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
-            android:text="城市地址" />
+            android:text="城市地址"
+            android:textColor="@color/text_hine" />
 
         <TextView
             android:id="@+id/addressTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/padding"
+            android:layout_alignTop="@id/addressTag"
+            android:layout_marginLeft="40dp"
             android:layout_toRightOf="@id/addressTag"
-            android:drawableRight="@drawable/icon_more_down"
             android:ellipsize="end"
-            android:lines="1" />
+            android:lines="1"
+            android:text="城市地址"
+            android:textColor="@color/text_main" />
 
         <TextView
             android:id="@+id/dateTag"
@@ -217,7 +236,8 @@
             android:layout_below="@id/addressTag"
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
-            android:text="入住日期:" />
+            android:text="入住日期:"
+            android:textColor="@color/text_hine" />
 
         <TextView
             android:id="@+id/dateTv"
@@ -225,11 +245,11 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/addressTv"
             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" />
+            android:lines="1"
+            android:text="城市地址"
+            android:textColor="@color/text_main" />
 
         <TextView
             android:id="@+id/numberTag"
@@ -238,7 +258,8 @@
             android:layout_below="@id/dateTag"
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
-            android:text="人数:" />
+            android:text="人数:"
+            android:textColor="@color/text_hine" />
 
         <TextView
             android:id="@+id/numberSubTv"
@@ -246,11 +267,11 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/addressTv"
             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" />
+            android:lines="1"
+            android:text="城市地址"
+            android:textColor="@color/text_main" />
 
 
         <TextView
@@ -260,7 +281,8 @@
             android:layout_below="@id/numberTag"
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
-            android:text="预计费用:" />
+            android:text="预计费用:"
+            android:textColor="@color/text_hine" />
 
         <TextView
             android:id="@+id/expecteFeeTv"
@@ -268,10 +290,10 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/addressTv"
             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" />
+            android:lines="1"
+            android:text="预计费用"
+            android:textColor="@color/text_main" />
     </RelativeLayout>
 </LinearLayout>

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/white"
     android:gravity="center_vertical"
     android:orientation="horizontal">