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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Nov 27 17:56:36 CST 2017
+#Tue Nov 28 17:53:50 CST 2017
 debugName=1
 versionName=620
-debugCode=163
+debugCode=178
 versionCode=120

app_core/common/src/main/res/values/colors.xml

@@ -338,4 +338,7 @@
     <color name="data_inquiry_gird_menu_color6">#68d2c9</color>
     <color name="data_inquiry_caption_textcolor">#999999</color>
     <color name="data_inquiry_value_textcolor">#333333</color>
+    
+    <!--服务预约-->
+    <color name="blue_seats_num">#2E94DD</color>
 </resources>

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

@@ -43,6 +43,7 @@ import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.view.Activity.SelectActivity;
+import com.core.widget.view.SwitchView;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 import com.core.xmpp.model.AddAttentionResult;
 import com.me.network.app.http.HttpClient;
@@ -92,6 +93,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     private boolean isHasPerson;//是否指定了人员
     private AddSubUtils addSubUtils;
     private String sb_sex="0";//默认女士
+    
+    //餐饮
+    private TextView tvMSeatsName,tvMSeatsNum,tvZSeatsName,tvZSeatsNum,tvDSeatsName,tvDSeatsNum;
+    private TextView tv_food_seats;
+    private SwitchView sv_food_rooms;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -140,6 +146,18 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         tv_title = (TextView) findViewById(R.id.tv_title);
         tv_sub = (TextView) findViewById(R.id.tv_sub);
 
+        tv_food_seats=(TextView) findViewById(R.id .tv_food_seats);
+        tvMSeatsName=(TextView) findViewById(R.id .tvMSeatsName);
+        tvMSeatsNum=(TextView) findViewById(R.id .tvMSeatsNum);
+
+        tvZSeatsName=(TextView) findViewById(R.id .tvZSeatsName);
+        tvZSeatsNum=(TextView) findViewById(R.id .tvZSeatsNum);
+
+        tvDSeatsName=(TextView) findViewById(R.id .tvDSeatsName);
+        tvDSeatsNum=(TextView) findViewById(R.id .tvDSeatsNum);
+
+        sv_food_rooms=(SwitchView)findViewById(R.id.sv_food_rooms);
+
         submit_btn.setOnClickListener(this);
         et_book_name.setText(CommonUtil.getName());
         et_book_phone.setText(MyApplication.getInstance().mLoginUser.getTelephone());
@@ -196,6 +214,13 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 }
             }
         });
+
+        sv_food_rooms.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(View view, boolean isChecked) {
+                ToastMessage("isChecked:"+isChecked);
+            }
+        });
     }
 
     private boolean isEdited = true;
@@ -911,6 +936,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     //sb_enddate的格式是yyyy-MM-dd HH:mm:ss
                     setTime(map, tv_food_times);
                 }
+                //选包间和选桌位
                 if (!TextUtils.isEmpty(tv_food_rooms.getText())) {
                     map.put("sb_spname", tv_food_rooms.getText());
                 }
@@ -1466,19 +1492,21 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     //查询桌子余量
     public void searchSeatNumbers(String yearmonth,String companyid){
         //companyid,userid,yearmonth,token
+        showLoading();
         String peopleNumber=tv_food_peoples.getText().toString();
-        String as_type="小桌";
+        String aType="小桌";
         if (Integer.valueOf(peopleNumber)>2&&Integer.valueOf(peopleNumber)<=5){
             //中
-            as_type="中桌";
+            aType="中桌";
         }else  if(Integer.valueOf(peopleNumber)>5){
             //大
-            as_type="大桌";
+            aType="大桌";
         }else{
             //小
-            as_type="小桌";
+            aType="小桌";
         }
-        LogUtil.i("座位："+as_type+"yearmonth:"+yearmonth+"  companyid:"+companyid+" peopleNumber:"+peopleNumber);
+        final String  asType=aType;
+        LogUtil.i("座位："+asType+"yearmonth:"+yearmonth+"  companyid:"+companyid+" peopleNumber:"+peopleNumber);
           HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).build();
                  httpClient.Api().send(new HttpClient.Builder()
                  .url("/user/appLineList")
@@ -1491,19 +1519,69 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
           
                      @Override
                      public void onResponse(Object o) {
+                         dimssLoading();
                          try {
                              LogUtil.i(TAG,o.toString());
                              JSONArray deskbook=JSON.parseObject(o.toString()).getJSONArray("deskbook");
-                             if (deskbook==null){
-                                 //隐藏桌子余量
+                             JSONArray desklist=JSON.parseObject(o.toString()).getJSONArray("desklist");
+                             if (!ListUtils.isEmpty(deskbook)){
+                                 for (int i = 0; i <deskbook.size() ; i++) {
+                                     JSONObject object=deskbook.getJSONObject(i);
+                                     String number= object.getString("number");//预约量
+                                     String booknumber=object.getString("booknumber");//总预约量
+                                     String deskcode=object.getString("deskcode");//桌位编号
+                                     Integer bookednumber=Integer.valueOf(booknumber)-Integer.valueOf(number);
+                                     //tv_food_seats.setText("仅剩"+bookednumber+"桌");
+                                     tv_food_seats.setTag(0,bookednumber);
+                                     tv_food_seats.setTag(1,deskcode);
+                                     CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookednumber+"桌",String.valueOf(bookednumber),ct.getResources().getColor(R.color.blue_seats_num));
+                                 }
+                             }else{
+                                 //隐藏
                              }
-                             if (deskbook.size()==0){
-                                 //隐藏桌子余量
+                             if (desklist!=null){
+//                                         "as_booknumber":"70",
+//                                         "as_companyid":"10002",
+//                                         "as_deskcode":"C",
+//                                         "as_id":"3",
+//                                         "as_number":"30",
+//                                         "as_remark":"1-2人",
+//                                         "as_type":"小桌"
+                                 for (int i = 0; i <desklist.size() ; i++) {
+                                     JSONObject object=desklist.getJSONObject(i);
+                                    String as_type= object.getString("as_type");
+                                    String as_number=object.getString("as_number");
+                                    String as_remark=object.getString("as_remark");
+                                    String as_deskcode=object.getString("as_deskcode");
+                                    if (ListUtils.isEmpty(deskbook)) {
+                                        if (as_type.equals(asType)) {
+                                            //tv_food_seats.setText("仅剩"+as_number+"桌");
+                                            CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+as_number+"桌",as_number,ct.getResources().getColor(R.color.blue_seats_num));
+                                            tv_food_seats.setTag(0,as_number);
+                                            tv_food_seats.setTag(1,as_deskcode);//桌位编号
+                                        }
+                                    }
+                                    if ("小桌".equals(as_type)){
+                                        tvMSeatsName.setText("小桌("+as_remark+")");
+                                       // CommonUtil.textSpanForStyle( tvMSeatsName,"小桌("+as_remark+")",as_remark,ct.getResources().getColor(R.color.yellow_home));
+                                        //tvMSeatsNum.setText("前方"+as_number+"桌");
+                                        CommonUtil.textSpanForStyle(tvMSeatsNum,"前方"+as_number+"桌",as_number,ct.getResources().getColor(R.color.blue_seats_num));
+                                    }
+                                    if ("中桌".equals(as_type)){
+                                        tvZSeatsName.setText("中桌("+as_remark+")");
+                                        //tvZSeatsNum.setText("前方"+as_number+"桌");
+                                        CommonUtil.textSpanForStyle(tvZSeatsNum,"前方"+as_number+"桌",as_number,ct.getResources().getColor(R.color.blue_seats_num));
+                                    }
+                                    if ("大桌".equals(as_type)){
+                                        tvDSeatsName.setText("大桌("+as_remark+")");
+                                       // tvDSeatsNum.setText("前方"+as_number+"桌");
+                                        CommonUtil.textSpanForStyle(tvDSeatsNum,"前方"+as_number+"桌",as_number,ct.getResources().getColor(R.color.blue_seats_num));
+                                    }
+                                 }
                              }
                              
                              
                              
-                             
                          } catch (Exception e) {
                              e.printStackTrace();
                          }

app_modular/appbooking/src/main/res/drawable/shape_sample_one_1dp.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners
+        android:topLeftRadius="6dp"
+        android:topRightRadius="6dp"
+        android:bottomRightRadius="6dp"
+        android:bottomLeftRadius="6dp">
+    </corners>
+    <stroke
+        android:width="1dp"
+        android:color="#C2E1F8">
+    </stroke>
+    <solid
+        android:color="#D9EFFF">
+    </solid>
+</shape>

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

@@ -7,7 +7,7 @@
     android:fillViewport="true"
     android:scrollbars="none"
     tools:context="com.modular.booking.activity.services.BServiceAddActivity">
-
+    
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -16,61 +16,7 @@
         android:focusableInTouchMode="true"
         android:orientation="vertical">
 
-        <!--抬头信息-->
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_centerHorizontal="true">
-
-            <ImageView
-                android:id="@+id/max_img"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:alpha="0.16"
-                android:scaleType="fitXY" />
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/iv_header"
-                android:layout_width="55dp"
-                android:layout_height="55dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="12dp"
-                android:layout_marginStart="12dp"
-                android:background="@null"
-                android:src="@drawable/defaultpic"></de.hdodenhof.circleimageview.CircleImageView>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="15dp"
-                android:layout_toRightOf="@+id/iv_header"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tv_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/icon_detail"
-                    android:gravity="center_vertical"
-                    android:text="********"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/tv_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/icon_map"
-                    android:gravity="center_vertical"
-                    android:text="********"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-            </LinearLayout>
-        </RelativeLayout>
+        <include layout="@layout/include_add_top"></include>
 
         <!--KTV-->
         <LinearLayout
@@ -464,12 +410,10 @@
             android:id="@+id/ll_food"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            >
+            android:orientation="vertical">
 
             <RelativeLayout
                 android:id="@+id/food_peoples_rl"
-           
                 style="@style/item_menu">
 
                 <TextView
@@ -584,160 +528,96 @@
                     android:text="仅限1桌"
                     android:textColor="@color/hintColor" />
             </RelativeLayout>
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="10dp" />
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:id="@+id/name_rl"
-                style="@style/item_menu">
-
-                <TextView
-                    android:id="@+id/tag_book_name"
-                    style="@style/item_menu_tag"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:gravity="center_vertical"
-                    android:text="@string/service_name" />
-
-                <EditText
-                    android:id="@+id/et_book_name"
-                    style="@style/item_menu_input"
-                    android:layout_width="290dp"
-                    android:layout_toRightOf="@id/tag_book_name"
-                    android:drawablePadding="6dp"
-                    android:ellipsize="end"
-                    android:hint="@string/common_input2" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/sex_rl"
-                style="@style/item_menu">
-
-                <TextView
-                    android:id="@+id/tag_book_sex"
-                    style="@style/item_menu_tag"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:gravity="center_vertical"
-                    android:text="性别" />
 
-                <RadioGroup
-                    android:id="@+id/rg_sex"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:layout_toRightOf="@+id/tag_book_sex"
-                    android:orientation="horizontal" >
-
-                    <RadioButton
-                        android:id="@+id/rb_boy"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/me_menu_item_normal"
+                android:layout_marginTop="10dp"
+                android:orientation="vertical">
+                  <TextView
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content" 
+                      android:layout_margin="10dp"
+                      
+                      android:textColor="#6EAEE4"
+                      android:textStyle="bold"
+                      android:text="排队实况"/>
+
+                <RelativeLayout
+                    style="@style/item_menu"
+                    android:layout_margin="5dp"
+                    android:background="@drawable/shape_sample_one_1dp">
+                    <TextView
+                        android:id="@+id/tvMSeatsName"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" 
+                        android:layout_centerVertical="true"
+                        android:textStyle="bold"
+                        android:text="小桌(1-2人)"
+                        android:layout_alignParentLeft="true"/>
+
+                    <TextView
+                        android:id="@+id/tvMSeatsNum"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="130dp"
-                        android:checked="true"
-                        android:button="@null"
-                        android:drawableLeft="@drawable/oa_rb_button_bg"
-                        android:text="先生" />
-
-                    <RadioButton
-                        android:id="@+id/rb_girl"
+                        android:layout_centerVertical="true"
+                        android:textStyle="bold"
+                        android:text="前方8桌"
+                        android:layout_alignParentRight="true"/>
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:background="@drawable/shape_sample_one_1dp"
+                    android:layout_margin="5dp"
+                    style="@style/item_menu">
+                    <TextView
+                        android:id="@+id/tvZSeatsName"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="20dp"
-      
-                        android:button="@null"
-                        android:drawableLeft="@drawable/oa_rb_button_bg"
-                        android:text="女士" />
-                </RadioGroup>
-
-            </RelativeLayout>
-            <RelativeLayout
-                android:id="@+id/phone_rl"
-                style="@style/item_menu">
-
-                <TextView
-                    android:id="@+id/tag_book_phone"
-                    style="@style/item_menu_tag"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:gravity="center_vertical"
-                    android:text="@string/service_phone" />
-
-                <EditText
-                    android:id="@+id/et_book_phone"
-                    style="@style/item_menu_input"
-                    android:layout_width="110dp"
-                    android:drawableLeft="@drawable/icon_tel"
-                    android:drawablePadding="2dp"
-                    android:ellipsize="end"
-                    android:hint="@string/common_input2"
-                    android:inputType="phone"
-                    android:textColor="#0CB88C" />
-
-            </RelativeLayout>
-            <RelativeLayout
-                android:id="@+id/notes_rl"
-                android:layout_marginTop="10dp"
-                android:layout_height="wrap_content"
-                style="@style/item_menu">
-
-                <TextView
-                    android:id="@+id/tag_book_notes"
-                    style="@style/item_menu_tag"
-                    android:layout_width="50dp"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:gravity="center_vertical"
-                    android:text="@string/service_notes" />
-
-                <EditText
-                    android:id="@+id/et_book_notes"
-                    style="@style/item_menu_input"
-                    android:gravity="top|left"
-                    android:layout_width="match_parent"
-                    android:layout_height="100dp"
-                    android:layout_toRightOf="@id/tag_book_notes"
-                    android:drawablePadding="6dp"
-                    android:hint="请输入您的要求，我们会尽量满足" />
+                        android:layout_centerVertical="true"
+                        android:textStyle="bold"
+                        android:text="中桌(3-5人)"
+                        android:layout_alignParentLeft="true"/>
 
+                    <TextView
+                        android:id="@+id/tvZSeatsNum"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:textStyle="bold"
+                        android:text="前方8桌"
+                        android:layout_alignParentRight="true"/>
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:background="@drawable/shape_sample_one_1dp"
+                    android:layout_margin="5dp"
+                    style="@style/item_menu">
+                    <TextView
+                        android:id="@+id/tvDSeatsName"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:textStyle="bold"
+                        android:text="大桌(6人以上)"
+                        android:layout_alignParentLeft="true"/>
 
-            </RelativeLayout>
+                    <TextView
+                        android:id="@+id/tvDSeatsNum"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:textStyle="bold"
+                        android:text="前方8桌"
+                        android:layout_alignParentRight="true"/>
+                </RelativeLayout>
+            </LinearLayout>
         </LinearLayout>
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="30dp"
-            android:layout_marginTop="60dp">
+  
+     <include layout="@layout/include_add_bottom"></include>
 
-            <Button
-                android:id="@+id/submit_btn"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_marginBottom="10dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:background="@drawable/bg_bule_btn"
-                android:padding="10dp"
-                android:text="@string/app_button_commit"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
-        </RelativeLayout>
     </LinearLayout>
 
 </ScrollView>

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

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="10dp" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/name_rl"
+            style="@style/item_menu">
+
+            <TextView
+                android:id="@+id/tag_book_name"
+                style="@style/item_menu_tag"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:gravity="center_vertical"
+                android:text="@string/service_name" />
+
+            <EditText
+                android:id="@+id/et_book_name"
+                style="@style/item_menu_input"
+                android:layout_width="290dp"
+                android:layout_toRightOf="@id/tag_book_name"
+                android:drawablePadding="6dp"
+                android:ellipsize="end"
+                android:hint="@string/common_input2" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/sex_rl"
+            style="@style/item_menu">
+
+            <TextView
+                android:id="@+id/tag_book_sex"
+                style="@style/item_menu_tag"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:gravity="center_vertical"
+                android:text="性别" />
+
+            <RadioGroup
+                android:id="@+id/rg_sex"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:layout_toRightOf="@+id/tag_book_sex"
+                android:orientation="horizontal" >
+
+                <RadioButton
+                    android:id="@+id/rb_boy"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="130dp"
+                    android:checked="true"
+                    android:button="@null"
+                    android:drawableLeft="@drawable/oa_rb_button_bg"
+                    android:text="先生" />
+
+                <RadioButton
+                    android:id="@+id/rb_girl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+
+                    android:button="@null"
+                    android:drawableLeft="@drawable/oa_rb_button_bg"
+                    android:text="女士" />
+            </RadioGroup>
+
+        </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/phone_rl"
+            style="@style/item_menu">
+
+            <TextView
+                android:id="@+id/tag_book_phone"
+                style="@style/item_menu_tag"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:gravity="center_vertical"
+                android:text="@string/service_phone" />
+
+            <EditText
+                android:id="@+id/et_book_phone"
+                style="@style/item_menu_input"
+                android:layout_width="110dp"
+                android:drawableLeft="@drawable/icon_tel"
+                android:drawablePadding="2dp"
+                android:ellipsize="end"
+                android:hint="@string/common_input2"
+                android:inputType="phone"
+                android:textColor="#0CB88C" />
+
+        </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/notes_rl"
+            android:layout_marginTop="10dp"
+            android:layout_height="wrap_content"
+            style="@style/item_menu">
+
+            <TextView
+                android:id="@+id/tag_book_notes"
+                style="@style/item_menu_tag"
+                android:layout_width="50dp"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:gravity="center_vertical"
+                android:text="@string/service_notes" />
+
+            <EditText
+                android:id="@+id/et_book_notes"
+                style="@style/item_menu_input"
+                android:gravity="top|left"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_toRightOf="@id/tag_book_notes"
+                android:drawablePadding="6dp"
+                android:hint="请输入您的要求，我们会尽量满足" />
+
+
+        </RelativeLayout>
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="30dp"
+        android:layout_marginTop="60dp">
+
+        <Button
+            android:id="@+id/submit_btn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:background="@drawable/bg_bule_btn"
+            android:padding="10dp"
+            android:text="@string/app_button_commit"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main" />
+    </RelativeLayout>
+</LinearLayout>

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

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <!--抬头信息-->
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_centerHorizontal="true">
+
+        <ImageView
+            android:id="@+id/max_img"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.16"
+            android:scaleType="fitXY" />
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/iv_header"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="12dp"
+            android:layout_marginStart="12dp"
+            android:background="@null"
+            android:src="@drawable/defaultpic"></de.hdodenhof.circleimageview.CircleImageView>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@+id/iv_header"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/icon_detail"
+                android:gravity="center_vertical"
+                android:text="********"
+                android:textColor="@color/black"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tv_sub"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/icon_map"
+                android:gravity="center_vertical"
+                android:text="********"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+        </LinearLayout>
+    </RelativeLayout>
+</LinearLayout>