【11-31】版本WeiChat_v6.0.9_baidu(Build148)_release 发布上线！

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Nov 30 11:48:41 CST 2017
-debugName=12
+#Fri Dec 01 11:36:31 CST 2017
+debugName=30
 versionName=610
-debugCode=12
+debugCode=30
 versionCode=149

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

@@ -54,12 +54,15 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.booking.R;
 import com.modular.booking.activity.utils.GridSelectActivity;
 import com.modular.booking.activity.utils.GridSelectDateActivity;
+import com.modular.booking.adapter.ItemFoodStateAdapter;
 import com.modular.booking.model.SBListModel;
 import com.modular.booking.model.SBMenuModel;
+import com.modular.booking.model.SeatsStateModel;
 import com.modular.booking.widget.AddSubUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import de.hdodenhof.circleimageview.CircleImageView;
@@ -163,10 +166,10 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         
         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);
+        tvZSeatsTitle=(TextView)findViewById(R.id.tvZSeatsTitle);
+         gvZSeats=(NScrollerGridView)findViewById(R.id.gvZSeats);
+        tvDSeatsTitle=(TextView)findViewById(R.id.tvDSeatsTitle);
+         gvDSeats=(NScrollerGridView)findViewById(R.id.gvDSeats);
                 
         submit_btn.setOnClickListener(this);
         et_book_name.setText(CommonUtil.getName());
@@ -955,7 +958,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         map.put("sb_spname", tv_food_rooms.getText());
                     }else{
                         //选桌位
-                        map.put("sb_spname", tv_food_seats.getTag(R.id.tag_id));
+                        map.put("sb_stname", tv_food_seats.getTag(R.id.tag_id));
                     }
                   
                 }
@@ -1550,23 +1553,24 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                      JSONObject object=deskbook.getJSONObject(i);
                                      String number= object.getString("number");//预约量
                                      String king=object.getString("kind");//类型
-                                     String booknumber=object.getString("booknumber");//总预约量
+                                     String booknumber=object.getString("as_booknumber");//总预约量
                                      String deskcode=object.getString("deskcode");//桌位编号
                                      Integer bookednumber=Integer.valueOf(booknumber)-Integer.valueOf(number);
-                                     if(asType.contains(king)){
-                                         if (asType.equals("小桌")){
+                                         if (king.equals("小桌")){
                                              CommonUtil.textSpanForStyle(tvMSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
                                          }
-                                         if (asType.equals("中桌")){
+                                         if (king.equals("中桌")){
                                              CommonUtil.textSpanForStyle(tvZSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
                                          }
-                                         if (asType.equals("大桌")){
+                                         if (king.equals("大桌")){
                                              CommonUtil.textSpanForStyle(tvDSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
                                          }
-                                     }
+                                    if (asType.equals(king)){
+                                        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));
+                                    }
                                      //tv_food_seats.setText("仅剩"+bookednumber+"桌");
-                                     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));
+                                    
                                  }
                              }
                              if (desklist!=null){
@@ -1631,7 +1635,23 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
           
                      @Override
                      public void onResponse(Object o) {
-                         LogUtil.d(TAG,o.toString());
+                         try {
+                             LogUtil.d(TAG,o.toString());
+                             JSONArray jsonArray=JSON.parseObject(o.toString()).getJSONArray("result");
+                             List< SeatsStateModel> seats=new ArrayList<>();
+                             for (int i = 0; i <jsonArray.size() ; i++) {
+                                 JSONObject object=jsonArray.getJSONObject(i);
+                                 String ad_deskcode=object.getString("ad_deskcode");
+                                 SeatsStateModel model=new SeatsStateModel();
+                                 model.setAd_deskcode(String.valueOf(i));
+                                 seats.add(model);
+                             }
+                             gvMSeats.setAdapter(new ItemFoodStateAdapter(mContext,seats));
+                             gvDSeats.setAdapter(new ItemFoodStateAdapter(mContext,seats));
+                             gvZSeats.setAdapter(new ItemFoodStateAdapter(mContext,seats));
+                         } catch (Exception e) {
+                             e.printStackTrace();
+                         }
                      }
                  }));
     }

app_modular/appbooking/src/main/java/com/modular/booking/adapter/ItemFoodStateAdapter.java

@@ -0,0 +1,69 @@
+package com.modular.booking.adapter;
+
+/**
+ * Created by Arison on 2017/11/30.
+ */
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.modular.booking.R;
+import com.modular.booking.model.SeatsStateModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ItemFoodStateAdapter extends BaseAdapter {
+
+    private List<SeatsStateModel> objects = new ArrayList<SeatsStateModel>();
+
+    private Context context;
+    private LayoutInflater layoutInflater;
+
+    public ItemFoodStateAdapter(Context context,List<SeatsStateModel> data) {
+        this.context = context;
+        this.objects=data;
+        this.layoutInflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public int getCount() {
+        return objects.size();
+    }
+
+    @Override
+    public SeatsStateModel getItem(int position) {
+        return objects.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = layoutInflater.inflate(R.layout.item_food_state, null);
+            convertView.setTag(new ViewHolder(convertView));
+        }
+        initializeViews((SeatsStateModel)getItem(position), (ViewHolder) convertView.getTag());
+        return convertView;
+    }
+
+    private void initializeViews(SeatsStateModel object, ViewHolder holder) {
+       holder.tvSeatsCode.setText(object.getAd_deskcode());
+    }
+
+    protected class ViewHolder {
+        private TextView tvSeatsCode;
+
+        public ViewHolder(View view) {
+            tvSeatsCode = (TextView) view.findViewById(R.id.tvSeatsCode);
+        }
+    }
+}

app_modular/appbooking/src/main/java/com/modular/booking/model/SeatsStateModel.java

@@ -0,0 +1,88 @@
+package com.modular.booking.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Created by Arison on 2017/11/30.
+ */
+
+public class SeatsStateModel implements Parcelable {
+//    "ad_companyid":"10002",
+//            "ad_deskcode":"C10",
+//            "ad_id":"132",
+//            "ad_status":"0"
+
+    private String ad_companyid;
+    private String ad_deskcode;
+    private String ad_id;
+    private String ad_status;//0代表空闲  1代表是锁定
+
+    public String getAd_companyid() {
+        return ad_companyid;
+    }
+
+    public void setAd_companyid(String ad_companyid) {
+        this.ad_companyid = ad_companyid;
+    }
+
+    public String getAd_deskcode() {
+        return ad_deskcode;
+    }
+
+    public void setAd_deskcode(String ad_deskcode) {
+        this.ad_deskcode = ad_deskcode;
+    }
+
+    public String getAd_id() {
+        return ad_id;
+    }
+
+    public void setAd_id(String ad_id) {
+        this.ad_id = ad_id;
+    }
+
+    public String getAd_status() {
+        return ad_status;
+    }
+
+    public void setAd_status(String ad_status) {
+        this.ad_status = ad_status;
+    }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.ad_companyid);
+        dest.writeString(this.ad_deskcode);
+        dest.writeString(this.ad_id);
+        dest.writeString(this.ad_status);
+    }
+
+    public SeatsStateModel() {
+    }
+
+    protected SeatsStateModel(Parcel in) {
+        this.ad_companyid = in.readString();
+        this.ad_deskcode = in.readString();
+        this.ad_id = in.readString();
+        this.ad_status = in.readString();
+    }
+
+    public static final Parcelable.Creator<SeatsStateModel> CREATOR = new Parcelable.Creator<SeatsStateModel>() {
+        @Override
+        public SeatsStateModel createFromParcel(Parcel source) {
+            return new SeatsStateModel(source);
+        }
+
+        @Override
+        public SeatsStateModel[] newArray(int size) {
+            return new SeatsStateModel[size];
+        }
+    };
+}

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="200" android:exitFadeDuration="200">
+    android:enterFadeDuration="200"
+    android:exitFadeDuration="200">
     <item android:state_pressed="true" >
         <shape>
             <stroke android:color="@color/divider"

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/icon_seats_lock">
+    </item>
+    <item >
+        <shape  android:shape="rectangle">
+            <corners
+                android:topLeftRadius="100dp"
+                android:topRightRadius="100dp"
+                android:bottomRightRadius="100dp"
+                android:bottomLeftRadius="100dp">
+            </corners>
+            <solid
+                android:color="#58bae9">
+            </solid>
+        </shape>
+    </item>
+</selector>

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

@@ -410,7 +410,7 @@
             android:id="@+id/ll_food"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
+           
             android:orientation="vertical">
 
             <RelativeLayout
@@ -490,7 +490,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-               
+                    android:layout_marginRight="45dp"
                     android:layout_toRightOf="@id/tag_food_rooms"
                     android:layout_toLeftOf="@+id/sv_food_rooms"
                     android:drawableRight="@drawable/oa_next"
@@ -502,13 +502,13 @@
                     android:id="@+id/sv_food_rooms"
                     android:layout_width="40dp"
                     android:layout_height="25dp"
-                    android:visibility="gone"
+                   
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true" />
             </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/food_seats_rl"
-                android:visibility="gone"
+             
                 style="@style/item_menu">
 
                 <TextView
@@ -538,7 +538,6 @@
                 android:layout_height="wrap_content"
                 android:background="@color/me_menu_item_normal"
                 android:layout_marginTop="10dp"
-                android:visibility="gone"
                 android:orientation="vertical">
                 
                 <LinearLayout
@@ -564,7 +563,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                   
+                     android:visibility="gone"
                     android:orientation="vertical">
                     <RelativeLayout
                         style="@style/item_menu"
@@ -636,17 +635,16 @@
                 <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"
+                        android:layout_height="wrap_content"
                         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"/>
@@ -657,8 +655,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@color/transparent"
-                            android:horizontalSpacing="15dp"
-                            android:numColumns="4"
+                            android:horizontalSpacing="3dp"
+                            android:numColumns="8"
                             android:paddingLeft="15dp"
                             android:paddingRight="15dp"
                             android:paddingTop="5dp"
@@ -668,12 +666,13 @@
                     <RelativeLayout
                         android:background="@drawable/shape_sample_one_1dp"
                         android:layout_margin="5dp"
+                        android:layout_height="wrap_content"
                         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"/>
@@ -684,8 +683,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@color/transparent"
-                            android:horizontalSpacing="15dp"
-                            android:numColumns="4"
+                            android:horizontalSpacing="3dp"
+                            android:numColumns="8"
                             android:paddingLeft="15dp"
                             android:paddingRight="15dp"
                             android:paddingTop="5dp"
@@ -695,12 +694,13 @@
                     <RelativeLayout
                         android:background="@drawable/shape_sample_one_1dp"
                         android:layout_margin="5dp"
+                        android:layout_height="wrap_content"
                         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"/>
@@ -711,8 +711,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@color/transparent"
-                            android:horizontalSpacing="15dp"
-                            android:numColumns="4"
+                            android:horizontalSpacing="3dp"
+                            android:numColumns="8"
                             android:paddingLeft="15dp"
                             android:paddingRight="15dp"
                             android:paddingTop="5dp"

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

@@ -36,7 +36,7 @@
 
         <RelativeLayout
             android:id="@+id/sex_rl"
-            android:visibility="gone"
+     
             style="@style/item_menu">
 
             <TextView

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

@@ -0,0 +1,17 @@
+<?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"
+    android:gravity="center">
+    <TextView
+        android:id="@+id/tvSeatsCode"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:gravity="center"
+        android:padding="4dp"
+        android:background="@drawable/shape_rounds_blue"
+        android:textSize="14sp"
+        android:textColor="@color/white"
+        android:text="20"/>
+</LinearLayout>