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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Feb 01 17:48:35 CST 2018
-debugName=326
+#Thu Feb 01 18:00:24 CST 2018
+debugName=328
 versionName=613
-debugCode=326
+debugCode=328
 versionCode=152

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

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -51,6 +52,8 @@ public class DishSelectActivity extends OABaseActivity {
     private PinnedSectionListView lv_product;
 
     private ShoppingCartPanel mShoppingCartPanel;
+
+    private  Button bt_bottom;
     
     private List<ProductCategory> productCategories=new ArrayList<>();
     List<ProductCategory> productAllCategorys=new ArrayList<>();
@@ -74,7 +77,8 @@ public class DishSelectActivity extends OABaseActivity {
         lv_product_category= findViewById(R.id.lv_product_category);
         mBottmSheetLayout=findViewById(R.id.bottom_sheet_layout);
         lv_product=findViewById(R.id.lv_dish_product);
-        ll_bottom=findViewById(R.id.ll_bottom);
+//        ll_bottom=findViewById(R.id.ll_bottom);
+        bt_bottom=findViewById(R.id.bt_bottom);
         itemDishCategoryListAdapter=new ItemDishCategoryListAdapter(DishSelectActivity.this,productCategories);
         lv_product_category.setAdapter( itemDishCategoryListAdapter);
         lv_product_category.setSelection(0);
@@ -87,7 +91,7 @@ public class DishSelectActivity extends OABaseActivity {
     }
     private boolean isClickTrigger=true;
     private void initEvent(){
-        ll_bottom.setOnClickListener(new View.OnClickListener() {
+        bt_bottom.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 showShoppingCartPanel();

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

@@ -31,8 +31,14 @@
             android:cacheColorHint="#00000000" />
     </LinearLayout>
     </com.flipboard.bottomsheet.BottomSheetLayout>
+
+    <Button
+        android:id="@+id/bt_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_alignParentBottom="true" />
     <!--底部购物车布局-->
-    <FrameLayout
+ <!--   <FrameLayout
         android:id="@+id/rl_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -72,5 +78,5 @@
             android:layout_marginLeft="7dp"
             android:layout_marginBottom="7dp"
             android:src="@drawable/icon_shop_empty"/>
-    </FrameLayout>
+    </FrameLayout>-->
 </RelativeLayout>