提交代码;

app/src/main/AndroidManifest.xml

@@ -66,6 +66,10 @@
             android:name=".ui.settle.SettleActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+        <activity
+            android:name=".ui.store.StoreActivity"
+            android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.announcement.AnnouncementActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"

app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java

@@ -6,15 +6,14 @@ import android.databinding.DataBindingUtil;
 import android.databinding.ViewDataBinding;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AppCompatDelegate;
+import android.support.v7.app.AppCompatDialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ScreenUtils;
@@ -32,7 +31,7 @@ import io.reactivex.functions.Consumer;
 import io.reactivex.functions.Function;
 
 
-public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBinding> extends DialogFragment {
+public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBinding> extends AppCompatDialogFragment {
 
     private DialogBaseBinding mBaseBinding;
     private Disposable mDisp;
@@ -48,6 +47,9 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
 
     public abstract int getLayoutId();
 
+    public BaseDialog() {
+        mContext = getActivity();
+    }
 
     public void onCancelClick(View view) {
         KeyboardUtils.hideSoftInput(mViewBinding.getRoot());
@@ -73,17 +75,13 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
         mBaseBinding.btnConfirm.setEnabled(isEnable);
     }
 
-
     public int getTitle() {
         return R.string.all_dialog;
     }
 
-
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle
-            savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
-        mContext = ActivityUtils.getTopActivity();
 
         mPresenter = (P) getBaseActivity().mPresenter;
         getBaseActivity().mDialogs.add(0, this);
@@ -115,14 +113,12 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
 
     private View getEasyFragmentDialog(@NonNull LayoutInflater inflater, ViewGroup container) {
         mViewBinding = DataBindingUtil.inflate(inflater, getLayoutId(), container, false);
-
         this.initView();
-
         return mViewBinding.getRoot();
     }
 
 
-    private BaseActivity getBaseActivity() {
+    protected BaseActivity getBaseActivity() {
         return (BaseActivity) getActivity();
     }
 

app/src/main/java/com/xingdata/zzdpos/base/BaseSheetDialog.java

+package com.xingdata.zzdpos.base;
+
+
+import android.app.Dialog;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.design.widget.BottomSheetBehavior;
+import android.support.design.widget.BottomSheetDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+
+public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDataBinding> extends BaseDialog<P, B> {
+    public BottomSheetBehavior mBehavior;
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        mContext = getActivity();
+
+        mPresenter = (P) getBaseActivity().mPresenter;
+        getBaseActivity().mDialogs.add(0, this);
+        MyBottomSheetDialog dialog = new MyBottomSheetDialog(mContext);
+        mViewBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), getLayoutId(), null, false);
+        dialog.setContentView(mViewBinding.getRoot());
+        mBehavior = BottomSheetBehavior.from((View) mViewBinding.getRoot().getParent());
+        this.initView();
+        return dialog;
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return null;
+    }
+
+    private class MyBottomSheetDialog extends BottomSheetDialog {
+
+        public MyBottomSheetDialog(@NonNull Context context) {
+            super(context);
+        }
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            int screenHeight = getScreenHeight(getContext());
+            getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, screenHeight == 0 ? ViewGroup.LayoutParams.MATCH_PARENT : screenHeight);
+        }
+
+        int getScreenHeight(Context context) {
+            WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+            return wm != null ? wm.getDefaultDisplay().getHeight() : 0;
+        }
+    }
+}

app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java

@@ -23,8 +23,6 @@ import io.realm.Sort;
 public class DBFactory {
 
     public static class Main {
-
-
         /**
          * 查询交班记录
          */
@@ -35,7 +33,6 @@ public class DBFactory {
                     .findFirst();
         }
 
-
         /**
          * 更改交班记录
          */
@@ -46,10 +43,13 @@ public class DBFactory {
                     realm.copyToRealmOrUpdate(handoverInfo);
                 }
             });
-
         }
     }
 
+    public static class Store {
+
+    }
+
     public static class Settle {
         /**
          * 查询支付渠道

app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java

 package com.xingdata.zzdpos.ui.main.fragment;
 
 import android.content.Intent;
-
 import android.support.v7.widget.GridLayoutManager;
-
 import android.view.View;
 
-import com.blankj.utilcode.util.ActivityUtils;
-
 import com.blankj.utilcode.util.ActivityUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xingdata.zzdpos.C;
@@ -16,10 +12,10 @@ import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentCasherBinding;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
-import com.xingdata.zzdpos.ui.vip.VipActivity;
 import com.xingdata.zzdpos.ui.payment.PaymentActivity;
-import com.xingdata.zzdpos.ui.splash.SplashActivity;
 import com.xingdata.zzdpos.ui.statistics.StatisticsActivity;
+import com.xingdata.zzdpos.ui.store.StoreActivity;
+import com.xingdata.zzdpos.ui.vip.VipActivity;
 import com.xingdata.zzdpos.util.MyMenuItemDecoration;
 import com.xingdata.zzdpos.util.OnClickListener;
 
@@ -55,7 +51,7 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 switch ((int) adapter.getData().get(position)) {
                     case C.MENU.MENU_VIP://会员
-                        ActivityUtils.startActivity(new Intent(getActivity(),VipActivity.class));
+                        ActivityUtils.startActivity(new Intent(getActivity(), VipActivity.class));
                         break;
                     case C.MENU.MENU_RECHARGE://充值
 
@@ -82,10 +78,10 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
                 ActivityUtils.startActivity(getActivity(), PaymentActivity.class);
             }
         });
-        mViewBinding.tvSplash.setOnClickListener(new OnClickListener() {
+        mViewBinding.tvStore.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
-                ActivityUtils.startActivity(getActivity(), SplashActivity.class);
+                ActivityUtils.startActivity(getActivity(), StoreActivity.class);
             }
         });
         mViewBinding.btnHandover.setOnClickListener(new OnClickListener() {

app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java

+package com.xingdata.zzdpos.ui.store;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.base.BaseSheetDialog;
+import com.xingdata.zzdpos.databinding.ActivityStoreBinding;
+import com.xingdata.zzdpos.databinding.DialogPromptBinding;
+
+
+public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBinding> implements StoreContract.View {
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_store;
+    }
+
+    @Override
+    public void initView() {
+        mViewBinding.tvSettle.setOnClickListener(view -> {
+            mViewBinding.setMsDisAmt(mViewBinding.getMsDisAmt() > 0 ? 0 : 10000);
+        });
+
+        mViewBinding.ivCart.setOnClickListener(view -> {
+            new FullSheetDialogFragment().show(getSupportFragmentManager(), "dialog");
+        });
+    }
+
+    public static class FullSheetDialogFragment extends BaseSheetDialog<StorePresenter, DialogPromptBinding> {
+        @Override
+        public int getLayoutId() {
+            return R.layout.dialog_prompt;
+        }
+
+        @Override
+        public void initView() {
+            mViewBinding.btnCustom.setOnClickListener(view -> {
+                mPresenter.clickSettle();
+            });
+        }
+    }
+
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/store/StoreContract.java

@@ -12,7 +12,20 @@ interface StoreContract {
 
     abstract class Presenter extends BasePresenter<View> {
 
-
+        /**
+         * 点击结算按钮
+         */
+        public abstract void clickSettle();
+
+        /**
+         * 点击搜索
+         */
+        public abstract void clickSearch(String keyword);
+
+        /**
+         * 点击购物车logo
+         */
+        public abstract void clickCartLogo();
     }
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/store/StorePresenter.java

+package com.xingdata.zzdpos.ui.store;
+
+import com.xingdata.zzdpos.model.Ms;
+import com.xingdata.zzdpos.model.Saledetail;
+
+import java.util.List;
+
+public class StorePresenter extends StoreContract.Presenter {
+
+    /**
+     * 当前购物车信息
+     */
+    private List<Saledetail> mSaledetails;
+
+    /**
+     * 当前营销计划
+     */
+    private List<Ms> mMss;
+
+    @Override
+
+    public void onAttached() {
+        this.initRealm();
+    }
+
+    @Override
+    public void clickSettle() {
+        //TODO 带上mSaleorder跳转到Settle界面
+    }
+
+    @Override
+    public void clickSearch(String keyword) {
+        //TODO 搜索出结果后显示SearchFragment
+    }
+
+    @Override
+    public void clickCartLogo() {
+        //TODO 显示购物车
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/ScanFragment.java

+package com.xingdata.zzdpos.ui.store.fragment;
+
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentStoreScanBinding;
+import com.xingdata.zzdpos.ui.store.StorePresenter;
+
+public class ScanFragment extends BaseFragment<StorePresenter, FragmentStoreScanBinding> {
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_store_scan;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/SearchFragment.java

+package com.xingdata.zzdpos.ui.store.fragment;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentStoreSearchBinding;
+import com.xingdata.zzdpos.ui.store.StorePresenter;
+
+public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSearchBinding> {
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_store_search;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java

+package com.xingdata.zzdpos.ui.store.fragment;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentStoreBinding;
+import com.xingdata.zzdpos.ui.store.StorePresenter;
+
+public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBinding> {
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_store_search;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+
+
+}

app/src/main/res/drawable/shape_white_oval.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@color/white_caocao" />
+
+</shape>
\ No newline at end of file

app/src/main/res/layout/activity_settle.xml

@@ -48,6 +48,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:inputType="number"
+                    android:labelFor="@+id/et_search"
                     android:textColor="@color/black_likui"
                     android:textColorHint="@color/gray_huanggai"
                     android:textSize="@dimen/all_text_size" />

app/src/main/res/layout/fragment_casher.xml

@@ -41,7 +41,7 @@
                 android:textColor="#FFF" />
 
             <TextView
-                android:id="@+id/tv_splash"
+                android:id="@+id/tv_store"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"

app/src/main/res/layout/fragment_settle.xml

@@ -61,7 +61,7 @@
         android:background="@color/gray_zhouyu"
         android:orientation="vertical">
 
-        <ScrollView
+        <android.support.v4.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -351,7 +351,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </android.support.v4.widget.NestedScrollView>
 
         <LinearLayout
             android:id="@+id/ll_sheet"
@@ -403,7 +403,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/shape_red_round_rectangle_more_round"
-                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:foreground="?android:attr/actionBarItemBackground"
                     android:paddingBottom="@dimen/all_spacing"
                     android:paddingEnd="@dimen/all_margin_big"
                     android:paddingStart="@dimen/all_margin_big"

app/src/main/res/layout/fragment_store.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <android.support.design.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gray_zhouyu"
+        android:orientation="vertical">
+
+    </android.support.design.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file

app/src/main/res/layout/fragment_store_scan.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+
+    <android.support.design.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gray_zhouyu"
+        android:orientation="vertical">
+
+    </android.support.design.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file

app/src/main/res/layout/fragment_store_search.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <android.support.design.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gray_zhouyu"
+        android:orientation="vertical">
+
+    </android.support.design.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file

app/src/main/res/values/dimens.xml

@@ -11,6 +11,7 @@
     <dimen name="all_text_size">16sp</dimen>
     <dimen name="all_text_size_small">12sp</dimen>
     <dimen name="all_caption_size">12sp</dimen>
+    <dimen name="all_tiny_size">9sp</dimen>
     <dimen name="all_title_size">26sp</dimen>
     <dimen name="all_padding">10dp</dimen>
     <dimen name="all_text_size_big">22sp</dimen>
@@ -191,5 +192,8 @@
     <dimen name="settle_pay_item">108dp</dimen>
     <dimen name="settle_pay_logo">72dp</dimen>
 
+    <!--商店-->
+    <dimen name="store_cart_count">20dp</dimen>
+
 
 </resources>

app/src/main/res/values/strings.xml

@@ -532,6 +532,13 @@
     <string name="settle_ticket_unit">张</string>
     <string name="settle_ticket_info">元优惠券</string>
 
+    <!--商店-->
+    <string name="store_pay_amt">合计:</string>
+    <string name="store_cart">购物车</string>
+    <string name="store_btn_settle">选好了</string>
+    <string name="store_ms_dis">已减</string>
+    <string name="store_scan">扫描</string>
+
     <!--帮助POS-->
     <string name="help_hint">帮助</string>
     <string name="help_phone">400–800–9406</string>