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

# Conflicts:
#	WeiChat/version.properties

WeiChat/build.gradle

@@ -72,10 +72,10 @@ android {
         applicationId project.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode rootProject.ext.android.versionCode
-        versionName rootProject.ext.android.versionName
-//        versionCode versionArray[1]
-//        versionName versionNames
+//        versionCode rootProject.ext.android.versionCode
+//        versionName rootProject.ext.android.versionName
+        versionCode versionArray[1]
+        versionName versionNames
         multiDexEnabled true
         signingConfig signingConfigs.config
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
@@ -119,29 +119,29 @@ android {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
 
-//    applicationVariants.all { variant ->
-//        variant.outputs.each { output ->
-//            def outputFile = output.outputFile
-//            def fileName
-//            if (outputFile != null && outputFile.name.endsWith('.apk')) {
-//                if (variant.buildType.name.equals('release')) {
-//                    //赋值app属性版本名
-//                    //variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
-//                    //variant.mergedFlavor.versionName ="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
-//                    def releaseInfo= "v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)+ "_" + variant.productFlavors[0].name+"(Build"+versionArray[1]+")"
-//                    fileName = "WeiChat_${releaseInfo}_release.apk"
-//                    
-//                } else if (variant.buildType.name.equals('debug')) {
-//                    //赋值app属性版本名
-//                    //variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
-//                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"
-//                    fileName = "WeiChat_${debugInfo}_debug.apk"
-//                    
-//                }
-//                output.outputFile = new File(outputFile.parent, fileName)
-//            }
-//        }
-//    }
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            def outputFile = output.outputFile
+            def fileName
+            if (outputFile != null && outputFile.name.endsWith('.apk')) {
+                if (variant.buildType.name.equals('release')) {
+                    //赋值app属性版本名
+                    //variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+                    //variant.mergedFlavor.versionName ="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
+                    def releaseInfo= "v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)+ "_" + variant.productFlavors[0].name+"(Build"+versionArray[1]+")"
+                    fileName = "WeiChat_${releaseInfo}_release.apk"
+
+                } else if (variant.buildType.name.equals('debug')) {
+                    //赋值app属性版本名
+                    //variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"
+                    fileName = "WeiChat_${debugInfo}_debug.apk"
+
+                }
+                output.outputFile = new File(outputFile.parent, fileName)
+            }
+        }
+    }
 }
 
 dependencies {

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Nov 28 17:53:50 CST 2017
+#Wed Nov 29 17:00:55 CST 2017
 debugName=1
-versionName=620
-debugCode=178
-versionCode=120
+versionName=621
+debugCode=206
+versionCode=121

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

@@ -42,6 +42,7 @@ import com.core.net.volley.StringJsonObjectRequest;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
+import com.core.widget.NScrollerGridView;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.SwitchView;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
@@ -98,7 +99,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     private TextView tvMSeatsName,tvMSeatsNum,tvZSeatsName,tvZSeatsNum,tvDSeatsName,tvDSeatsNum;
     private TextView tv_food_seats;
     private SwitchView sv_food_rooms;
-
+    private boolean foodCheckRooms=true;
+    private TextView tvMSeatsTitle,tvZSeatsTitle,tvDSeatsTitle;
+    private NScrollerGridView gvMSeats,gvZSeats,gvDSeats;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -157,7 +160,14 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         tvDSeatsNum=(TextView) findViewById(R.id .tvDSeatsNum);
 
         sv_food_rooms=(SwitchView)findViewById(R.id.sv_food_rooms);
-
+        
+        tvMSeatsTitle=(TextView)findViewById(R.id.tvMSeatsTitle);
+         gvMSeats=(NScrollerGridView)findViewById(R.id.gvMSeats);
+        tvMSeatsTitle=(TextView)findViewById(R.id.tvZSeatsTitle);
+         gvMSeats=(NScrollerGridView)findViewById(R.id.gvZSeats);
+        tvMSeatsTitle=(TextView)findViewById(R.id.tvDSeatsTitle);
+         gvMSeats=(NScrollerGridView)findViewById(R.id.gvDSeats);
+                
         submit_btn.setOnClickListener(this);
         et_book_name.setText(CommonUtil.getName());
         et_book_phone.setText(MyApplication.getInstance().mLoginUser.getTelephone());
@@ -218,7 +228,9 @@ 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);
+                //ToastMessage("isChecked:"+isChecked);
+                foodCheckRooms=isChecked;
+                        
             }
         });
     }
@@ -239,7 +251,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             if (model != null) {
                 LogUtil.i(model.toString());
                 initType(model.getType());
-              
+                getSteatListStates();//获取餐饮类别状态信息
                 if (isEdited) {
                     submit_btn.setText("立即预约");
                     if (!StringUtil.isEmpty(sb_userid)) {
@@ -938,7 +950,14 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 }
                 //选包间和选桌位
                 if (!TextUtils.isEmpty(tv_food_rooms.getText())) {
-                    map.put("sb_spname", tv_food_rooms.getText());
+                    if (foodCheckRooms){
+                        //选包间
+                        map.put("sb_spname", tv_food_rooms.getText());
+                    }else{
+                        //选桌位
+                        map.put("sb_spname", tv_food_seats.getTag(R.id.tag_id));
+                    }
+                  
                 }
                 break;
             case "美容美发":
@@ -1492,7 +1511,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     //查询桌子余量
     public void searchSeatNumbers(String yearmonth,String companyid){
         //companyid,userid,yearmonth,token
+        
         showLoading();
+        yearmonth=DateFormatUtil.getStrDate4Date(DateFormatUtil.getDate4StrDate(yearmonth,"yyyy-MM-dd HH:ss"),"yyyyMMdd");
         String peopleNumber=tv_food_peoples.getText().toString();
         String aType="小桌";
         if (Integer.valueOf(peopleNumber)>2&&Integer.valueOf(peopleNumber)<=5){
@@ -1521,61 +1542,66 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                      public void onResponse(Object o) {
                          dimssLoading();
                          try {
-                             LogUtil.i(TAG,o.toString());
+                             LogUtil.d(TAG,o.toString());
                              JSONArray deskbook=JSON.parseObject(o.toString()).getJSONArray("deskbook");
                              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 king=object.getString("kind");//类型
                                      String booknumber=object.getString("booknumber");//总预约量
                                      String deskcode=object.getString("deskcode");//桌位编号
                                      Integer bookednumber=Integer.valueOf(booknumber)-Integer.valueOf(number);
+                                     if(asType.contains(king)){
+                                         if (asType.equals("小桌")){
+                                             CommonUtil.textSpanForStyle(tvMSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
+                                         }
+                                         if (asType.equals("中桌")){
+                                             CommonUtil.textSpanForStyle(tvZSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
+                                         }
+                                         if (asType.equals("大桌")){
+                                             CommonUtil.textSpanForStyle(tvDSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
+                                         }
+                                     }
                                      //tv_food_seats.setText("仅剩"+bookednumber+"桌");
-                                     tv_food_seats.setTag(0,bookednumber);
-                                     tv_food_seats.setTag(1,deskcode);
+                                     tv_food_seats.setTag(R.id.tag_id,deskcode);
                                      CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookednumber+"桌",String.valueOf(bookednumber),ct.getResources().getColor(R.color.blue_seats_num));
                                  }
-                             }else{
-                                 //隐藏
                              }
                              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");
+                                     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);//桌位编号
+                                            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");//桌位编号
+                                       }
+                                        LogUtil.d(TAG,"桌:"+as_type+"：前方"+as_number+"桌");
+                                        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+"桌");
+                                            LogUtil.d(TAG,"小桌：前方"+as_number+"桌");
+                                            CommonUtil.textSpanForStyle(tvMSeatsNum,"前方"+"0"+"桌","0",ct.getResources().getColor(R.color.blue_seats_num));
+                                        }
+                                        if ("中桌".equals(as_type)){
+                                            tvZSeatsName.setText("中桌("+as_remark+")");
+                                            //tvZSeatsNum.setText("前方"+as_number+"桌");
+                                            CommonUtil.textSpanForStyle(tvZSeatsNum,"前方"+"0"+"桌","0",ct.getResources().getColor(R.color.blue_seats_num));
+                                        }
+                                        if ("大桌".equals(as_type)){
+                                            tvDSeatsName.setText("大桌("+as_remark+")");
+                                            // tvDSeatsNum.setText("前方"+as_number+"桌");
+                                            CommonUtil.textSpanForStyle(tvDSeatsNum,"前方"+"0"+"桌","0",ct.getResources().getColor(R.color.blue_seats_num));
                                         }
-                                    }
-                                    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));
                                     }
                                  }
                              }
@@ -1590,4 +1616,43 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                      }
                  }));
     }
+    
+    
+    //获取列表状态
+    public void getSteatListStates(){
+        LogUtil.d(TAG,"model companyid："+model.getCompanyid());
+          HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).build();
+                 httpClient.Api().send(new HttpClient.Builder()
+                 .url("user/appDeskDetail")
+                 .add("companyid",model.getCompanyid())
+                 .add("token",MyApplication.getInstance().mAccessToken)
+                 .method(Method.POST)
+                 .build(),new ResultSubscriber<Object>(new ResultListener<Object>() {
+          
+                     @Override
+                     public void onResponse(Object o) {
+                         LogUtil.d(TAG,o.toString());
+                     }
+                 }));
+    }
+    
+    //释放操作，锁定操作
+    public void steatAction(String deskcode,String actionType){
+        //companyid 公司ID,bookid 服务预约ID,deskcode 桌位号,type 0代表释放操作，1代表锁定操作,token
+          HttpClient httpClient=new HttpClient.Builder("").build();
+                 httpClient.Api().send(new HttpClient.Builder()
+                 .url("user/appStoreRelease")
+                 .add("companyid",model.getCompanyid())
+                 .add("deskcode",deskcode)
+                         .add("type",actionType)
+                         .add("token",MyApplication.getInstance().mAccessToken)
+                 .method(Method.POST)
+                 .build(),new ResultSubscriber<Object>(new ResultListener<Object>() {
+          
+                     @Override
+                     public void onResponse(Object o) {
+                         LogUtil.d(TAG,o.toString());
+                     }
+                 }));
+    }
 }

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

@@ -535,83 +535,187 @@
                 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_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_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">
+                
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
                     <TextView
-                        android:id="@+id/tvDSeatsName"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
+                        android:layout_margin="10dp"
+                        android:textColor="#6EAEE4"
                         android:textStyle="bold"
-                        android:text="大桌(6人以上)"
-                        android:layout_alignParentLeft="true"/>
-
+                        android:text="排队实况"/>
                     <TextView
-                        android:id="@+id/tvDSeatsNum"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
+                        android:layout_margin="10dp"
+                        android:textColor="#6EAEE4"
                         android:textStyle="bold"
-                        android:text="前方8桌"
-                        android:layout_alignParentRight="true"/>
-                </RelativeLayout>
+                        android:text="商家释放"/>
+                </LinearLayout>
+               
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                   
+                    android:orientation="vertical">
+                    <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_centerVertical="true"
+                            android:textStyle="bold"
+                            android:text="前方0桌"
+                            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_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="前方0桌"
+                            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"/>
+
+                        <TextView
+                            android:id="@+id/tvDSeatsNum"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:textStyle="bold"
+                            android:text="前方0桌"
+                            android:layout_alignParentRight="true"/>
+                    </RelativeLayout>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    android:orientation="vertical">
+                    <RelativeLayout
+                        android:background="@drawable/shape_sample_one_1dp"
+                        android:layout_margin="5dp"
+                        style="@style/item_menu">
+                        <TextView
+                            android:id="@+id/tvMSeatsTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:textStyle="bold"
+                            android:text="小桌"
+                            android:layout_alignParentLeft="true"/>
+
+                        <com.core.widget.NScrollerGridView
+                            android:id="@+id/gvMSeats"
+                            android:layout_below="@+id/tvMSeatsTitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@color/transparent"
+                            android:horizontalSpacing="15dp"
+                            android:numColumns="4"
+                            android:paddingLeft="15dp"
+                            android:paddingRight="15dp"
+                            android:paddingTop="5dp"
+                            android:scrollbars="none"
+                            android:verticalSpacing="10dp" />
+                    </RelativeLayout>
+                    <RelativeLayout
+                        android:background="@drawable/shape_sample_one_1dp"
+                        android:layout_margin="5dp"
+                        style="@style/item_menu">
+                        <TextView
+                            android:id="@+id/tvZSeatsTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:textStyle="bold"
+                            android:text="中桌"
+                            android:layout_alignParentLeft="true"/>
+
+                        <com.core.widget.NScrollerGridView
+                            android:id="@+id/gvZSeats"
+                            android:layout_below="@+id/tvZSeatsTitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@color/transparent"
+                            android:horizontalSpacing="15dp"
+                            android:numColumns="4"
+                            android:paddingLeft="15dp"
+                            android:paddingRight="15dp"
+                            android:paddingTop="5dp"
+                            android:scrollbars="none"
+                            android:verticalSpacing="10dp" />
+                    </RelativeLayout>
+                    <RelativeLayout
+                        android:background="@drawable/shape_sample_one_1dp"
+                        android:layout_margin="5dp"
+                        style="@style/item_menu">
+                        <TextView
+                            android:id="@+id/tvDSeatsTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:textStyle="bold"
+                            android:text="大桌"
+                            android:layout_alignParentLeft="true"/>
+
+                        <com.core.widget.NScrollerGridView
+                            android:id="@+id/gvDSeats"
+                            android:layout_below="@+id/tvDSeatsTitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@color/transparent"
+                            android:horizontalSpacing="15dp"
+                            android:numColumns="4"
+                            android:paddingLeft="15dp"
+                            android:paddingRight="15dp"
+                            android:paddingTop="5dp"
+                            android:scrollbars="none"
+                            android:verticalSpacing="10dp" />
+                    </RelativeLayout>
+                </LinearLayout>
+                
             </LinearLayout>
         </LinearLayout>