Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java
#	app/src/main/res/layout/title.xml

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -347,6 +347,7 @@ public class C {
             private static final String ROOT_URL = PKG + "level/";
             public static final String add = ROOT_URL + "add";
             public static final String update = ROOT_URL + "update";
+            public static final String queryAll = ROOT_URL + "queryAll";
         }
 
         public final class COR {
@@ -366,6 +367,14 @@ public class C {
             public static final String getLastVer = PKG + "ver/getLastVer";
         }
 
+        /**
+         * 会员相关
+         */
+        public final class VIP {
+            private static final String ROOT_URL = PKG + "user/";
+            public static final String query = PKG + "query";
+        }
+
     }
 
 

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -981,6 +981,16 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread())
                     .retryWhen(new RetryHelper(3));
         }
+
+
+        public static Observable<Pager<com.xingdata.zzdpos.model.Level>> getVipLevelList(int pageNumber, int pageSize) {
+            return Api.getInstance().service.getVipLevelList(pageNumber,pageSize)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .retryWhen(new RetryHelper(3));
+        }
     }
 
     public static class Cor {

app/src/main/java/com/xingdata/zzdpos/api/ApiService.java

@@ -343,6 +343,9 @@ interface ApiService {
     @POST(C.URL.LEVEL.update)
     Observable<HttpMessage<Level>> updateVipLevel(@Body Level l);
 
+    @POST(C.URL.LEVEL.queryAll)
+    Observable<HttpMessage<Pager<Level>>> getVipLevelList(@Query("pageNumber") int pageNumber, @Query ("pageSize") int pageSize);
+
     @POST(C.URL.MSCARD.update)
     Observable<HttpMessage<Mscard>> updateMscard(@Body Mscard m);
 
@@ -368,4 +371,11 @@ interface ApiService {
 
     @POST(C.URL.VER.getLastVer)
     Observable<HttpMessage<Ver>> getLastVer(@Query("sn") String sn);
+
+    @POST(C.URL.VIP.query)
+    Observable<HttpMessage<Pager<Vip>>> getVipList(@Query("vipLevel") String keycode,
+                                       @Query("pageNumber") int pageNumber,
+                                       @Query("pageSize") int pageSize);
+
+
 }

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

@@ -17,6 +17,7 @@ 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) {
@@ -27,12 +28,17 @@ public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDat
         MyBottomSheetDialog dialog = new MyBottomSheetDialog(mContext);
         mViewBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), getLayoutId(), null, false);
         dialog.setContentView(mViewBinding.getRoot());
+        if (isTransparentBackground()) {
+            ((View) mViewBinding.getRoot().getParent()).setBackgroundColor(getResources().getColor(android.R.color.transparent));
+        }
         mBehavior = BottomSheetBehavior.from((View) mViewBinding.getRoot().getParent());
         this.initView();
-
         return dialog;
     }
 
+    protected boolean isTransparentBackground() {
+        return false;
+    }
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

app/src/main/java/com/xingdata/zzdpos/model/MarketingMenuModel.java

+package com.xingdata.zzdpos.model;
+
+/**
+ * Created by Administrator on 2017/12/27.
+ */
+
+public class MarketingMenuModel {
+    private String MarketingMenuName;
+    private int MarketingMenuImg;
+
+    public String getMarketingMenuName() {
+        return MarketingMenuName;
+    }
+
+    public void setMarketingMenuName(String marketingMenuName) {
+        MarketingMenuName = marketingMenuName;
+    }
+
+    public int getMarketingMenuImg() {
+        return MarketingMenuImg;
+    }
+
+    public void setMarketingMenuImg(int marketingMenuImg) {
+        MarketingMenuImg = marketingMenuImg;
+    }
+}

app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java

@@ -58,12 +58,12 @@ public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
 
     @Override
     public String getPrice() {
-        return ConvertUtil.fenToYuan(skuPrice,false);
+        return ConvertUtil.fenToYuan(skuPrice, false);
     }
 
     @Override
     public String getSubtotal() {
-        return ConvertUtil.fenToYuan(detailAmt,false);
+        return ConvertUtil.fenToYuan(detailAmt, false);
     }
 
     @Override
@@ -217,8 +217,7 @@ public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
      */
     public void setVip(Vip vip) {
         this.vip = vip;
-        skuPricePay = skuOffFlag > 0 ? skuPrice * (vip.getVipDefDiscount() > 0 ? vip
-                .getVipDefDiscount() : 100) / 100 : skuPrice;
+        skuPricePay = skuOffFlag > 0 ? skuPrice * (vip.getVipDefDiscount() > 0 ? vip.getVipDefDiscount() : 100) / 100 : skuPrice;
         detailAmt = skuPricePay * detailCnt;
     }
     @JSONField(serialize = false)

app/src/main/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java

@@ -4,24 +4,14 @@ package com.xingdata.zzdpos.ui.dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import com.blankj.utilcode.util.LogUtils;
-
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
-
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseDialog;
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.databinding.DialogLoadingBinding;
 
+import io.reactivex.disposables.Disposable;
+
 public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBinding> {
     Disposable disp;
     boolean isClose = true;
@@ -55,49 +45,9 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
 
     @Override
     public void show(BaseActivity activity) {
-        super.show(activity);
-        if (isClose) {
-            int recLen = 20;
-            Observable.interval(0, 1, TimeUnit.SECONDS).take(recLen + 1).map(new Function<Long,
-                    Long>
-                    () {
-                @Override
-                public Long apply(@NonNull Long aLong) throws Exception {
-                    return recLen - aLong;
-                }
-            }).observeOn(AndroidSchedulers.mainThread()).doOnSubscribe(new Consumer<Disposable>() {
-                @Override
-                public void accept(Disposable disposable) throws Exception {
-                    disp = disposable;
-                }
-            }).subscribe(new Observer<Long>() {
-                @Override
-                public void onSubscribe(@NonNull Disposable d) {
-                    disp = d;
-                }
-
-                @Override
-                public void onNext(@NonNull Long aLong) {
-                    LogUtils.e("对话框将在" + aLong + "S后关闭");
-                }
-
-                @Override
-                public void onError(@NonNull Throwable e) {
-
-                }
-
-                @Override
-                public void onComplete() {
-                    dismiss();
-                    if (null != disp) {
-                        disp.dispose();
-                    }
-                }
-            });
-        }
+        super.show(activity, 20);
     }
 
-
     @Override
     public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);

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

@@ -12,6 +12,7 @@ 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.marketing.marketingMenu.MarketingMenuActivity;
 import com.xingdata.zzdpos.ui.payment.PaymentActivity;
 import com.xingdata.zzdpos.ui.statistics.StatisticsActivity;
 import com.xingdata.zzdpos.ui.store.StoreActivity;
@@ -59,10 +60,12 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
 
                         break;
                     case C.MENU.MENU_MS://营销
-
+                        ActivityUtils.startActivity(new Intent(getActivity(),
+                                MarketingMenuActivity.class));
                         break;
                     case C.MENU.MENU_TICKET://优惠券
-                        ActivityUtils.startActivity(getActivity(), com.xingdata.zzdpos.ui.sendticke.SendTicketActivity.class);
+                        ActivityUtils.startActivity(getActivity(), com.xingdata.zzdpos.ui
+                                .sendticke.SendTicketActivity.class);
                         break;
                     case C.MENU.MENU_STATISTICS://统计
                         ActivityUtils.startActivity(getActivity(), StatisticsActivity.class);

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java

 package com.xingdata.zzdpos.ui.marketing.marketingMenu;
 
-import android.support.v7.app.AppCompatActivity;
+import android.databinding.DataBindingUtil;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
 
+import com.blankj.utilcode.util.ActivityUtils;
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
+import com.xingdata.zzdpos.model.MarketingMenuModel;
+import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
+import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
+import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
+import com.xingdata.zzdpos.util.OnClickListener;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class MarketingMenuActivity extends AppCompatActivity {
+    MarketingMenuAdapter marketingMenuAdapter;
+    List<MarketingMenuModel> list = new ArrayList<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_marketing_menu);
+
+        ActivityMarketingMenuBinding mViewBinding = DataBindingUtil.setContentView(
+                this, R.layout.activity_marketing_menu);
+        mViewBinding.icTitle.tvTitle.setText("营销设置");
+        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                ActivityUtils.finishActivity(MarketingMenuActivity.class);
+            }
+        });
+        MarketingMenuModel marketingMenuModel1 = new MarketingMenuModel();
+        MarketingMenuModel marketingMenuModel2 = new MarketingMenuModel();
+        MarketingMenuModel marketingMenuModel3 = new MarketingMenuModel();
+        MarketingMenuModel marketingMenuModel4 = new MarketingMenuModel();
+        MarketingMenuModel marketingMenuModel5 = new MarketingMenuModel();
+        MarketingMenuModel marketingMenuModel6 = new MarketingMenuModel();
+        marketingMenuModel1.setMarketingMenuImg(R.mipmap.vip_level);
+        marketingMenuModel1.setMarketingMenuName("会员等级");
+        marketingMenuModel2.setMarketingMenuImg(R.mipmap.integral_rules);
+        marketingMenuModel2.setMarketingMenuName("积分规则");
+        marketingMenuModel3.setMarketingMenuImg(R.mipmap.ticker_setting);
+        marketingMenuModel3.setMarketingMenuName("优惠券设置");
+        marketingMenuModel4.setMarketingMenuImg(R.mipmap.top_up_preferential);
+        marketingMenuModel4.setMarketingMenuName("充值优惠");
+        marketingMenuModel5.setMarketingMenuImg(R.mipmap.marketing_plan);
+        marketingMenuModel5.setMarketingMenuName("营销计划");
+        marketingMenuModel6.setMarketingMenuImg(R.mipmap.sms_all);
+        marketingMenuModel6.setMarketingMenuName("群发短信");
+        list.add(marketingMenuModel1);
+        list.add(marketingMenuModel2);
+        list.add(marketingMenuModel3);
+        list.add(marketingMenuModel4);
+        list.add(marketingMenuModel5);
+        list.add(marketingMenuModel6);
+        marketingMenuAdapter = new MarketingMenuAdapter(list);
+        mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
+        linearLayoutManager.setOrientation(linearLayoutManager.VERTICAL);
+        mViewBinding.rvMenu.setLayoutManager(linearLayoutManager);
+        marketingMenuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                switch (position) {
+                    case 0: {
+                        //会员等级
+                    }
+                    break;
+                    case 1: {
+                        //积分规则
+                        ActivityUtils.startActivity(IntegralActivity.class);
+                    }
+                    break;
+                    case 2: {
+                        //优惠券设置
+                        ActivityUtils.startActivity(ReturnTicketActivity.class);
+                    }
+                    break;
+                    case 3: {
+                        //充值优惠
+                    }
+                    break;
+                    case 4: {
+                        //营销计划
+                    }
+                    break;
+                    case 5: {
+                        //群发短信
+                    }
+                    break;
+                    default: {
+
+                    }
+                    break;
+                }
+            }
+        });
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/adapter/MarketingMenuAdapter.java

+package com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter;
+
+import android.support.annotation.Nullable;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemMarketingMenuBinding;
+import com.xingdata.zzdpos.model.MarketingMenuModel;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2017/11/24.
+ */
+
+public class MarketingMenuAdapter extends BaseAdapter<MarketingMenuModel, ItemMarketingMenuBinding> {
+    public MarketingMenuAdapter(@Nullable List<MarketingMenuModel> data) {
+        super(R.layout.item_marketing_menu, data);
+    }
+
+    @Override
+    protected void convert(ItemMarketingMenuBinding mViewBinding, MarketingMenuModel item) {
+        mViewBinding.ivLogo.setImageResource(item.getMarketingMenuImg());
+        mViewBinding.tvMenuName.setText(item.getMarketingMenuName());
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerIndexFragment.java

@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentSendTickerMainBinding;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
+import com.xingdata.zzdpos.ui.sendticke.SendTicketActivity;
 import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
 import com.xingdata.zzdpos.util.OnClickListener;
 
@@ -25,7 +26,7 @@ public class SendTickerIndexFragment extends BaseFragment<SendTicketPresenter,
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
-                ActivityUtils.finishActivity(IntegralActivity.class);
+                ActivityUtils.finishActivity(SendTicketActivity.class);
             }
         });
         mViewBinding.setOnClickListener(new OnClickListener() {

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java

@@ -9,6 +9,7 @@ import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivitySettleBinding;
 import com.xingdata.zzdpos.model.Pay;
+import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.Vip;
@@ -111,6 +112,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
         mCashPayFragment.loadSaleorder(saleorder);
     }
 
+    @Override
+    public void loadSaledetails(List<Saledetail> saledetails) {
+
+    }
+
     @Override
     public void showPayFragment(int payChannel) {
         switch (payChannel) {

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleContract.java

@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.settle;
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.base.BaseView;
 import com.xingdata.zzdpos.model.Pay;
+import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.Vip;
@@ -77,6 +78,13 @@ interface SettleContract {
          */
         void loadSaleorder(Saleorder saleorder);
 
+        /**
+         * 加载订单
+         *
+         * @param saledetails 详情列表
+         */
+        void loadSaledetails(List<Saledetail> saledetails);
+
         /**
          * 显示支付页面
          *

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

@@ -86,7 +86,8 @@ public class SettlePresenter extends SettleContract.Presenter {
      * 获取开单信息
      */
     private void getStoreIntent() {
-
+        mSaledetails.addAll((ArrayList) getIntent().getSerializableExtra(C.EXTRA_KEY.SETTLE_EXTRA));
+        mSaleorder.setSaledetails(mSaledetails);
     }
 
 
@@ -123,6 +124,8 @@ public class SettlePresenter extends SettleContract.Presenter {
     public void selectVip(Vip vip) {
         // 设置会员
         this.setVip(vip);
+        // 重新设置购物车
+        mSaleorder.setSaledetails(mSaledetails);
         // 计算价格
         this.reprice();
 

app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/SaledetailAdapter.java

+package com.xingdata.zzdpos.ui.settle.adapter;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemSettleSaledetailBinding;
+import com.xingdata.zzdpos.model.Saledetail;
+
+import java.util.ArrayList;
+
+public class SaledetailAdapter extends BaseAdapter<Saledetail, ItemSettleSaledetailBinding> {
+
+    public SaledetailAdapter() {
+        super(R.layout.item_store_saledetail, new ArrayList<>());
+    }
+
+    @Override
+    protected void convert(ItemSettleSaledetailBinding mViewBinding, Saledetail item) {
+
+
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/SettleFragment.java

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.settle.fragment;
 
 import android.support.design.widget.BottomSheetBehavior;
 import android.support.v7.widget.StaggeredGridLayoutManager;
+import android.view.View;
 
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
@@ -69,8 +70,36 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
      * @param settleMode 收款模式
      */
     public void setViewBySettleMode(int settleMode) {
+        switch (settleMode) {
+            case C.SETTLE_MODE.PAYMENT:
+                mViewBinding.llTicket.setVisibility(View.GONE);
+                break;
+            case C.SETTLE_MODE.STORE:
+                mViewBinding.llTicket.setVisibility(View.VISIBLE);
+                this.initStoreView();
+                break;
+        }
+    }
+
+
+    /**
+     * 初始化
+     */
+    private void initStoreView() {
+        mViewBinding.llSaledetail.setOnClickListener(view -> mViewBinding.cbSaledetail.setChecked(!mViewBinding.cbSaledetail.isChecked()));
+        mViewBinding.llMs.setOnClickListener(view -> mViewBinding.cbMs.setChecked(!mViewBinding.cbMs.isChecked()));
+
+        mViewBinding.cbSaledetail.setOnCheckedChangeListener((compoundButton, b) -> {
+            mViewBinding.cbSaledetail.setButtonDrawable(b ? R.mipmap.but_up : R.mipmap.but_unfurled);
+            mViewBinding.rlSaledetail.setVisibility(b ? View.VISIBLE : View.GONE);
+        });
+        mViewBinding.cbMs.setOnCheckedChangeListener((compoundButton, b) -> {
+            mViewBinding.cbMs.setButtonDrawable(b ? R.mipmap.but_up : R.mipmap.but_unfurled);
+            mViewBinding.rlMs.setVisibility(b ? View.VISIBLE : View.GONE);
+        });
     }
 
+
     /**
      * 加载会员
      *

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

 package com.xingdata.zzdpos.ui.store;
 
+import android.content.Intent;
+import android.os.Bundle;
 import android.view.inputmethod.EditorInfo;
 
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
+import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseSku;
@@ -12,12 +16,14 @@ import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.ui.settle.SettleActivity;
 import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
 import com.xingdata.zzdpos.ui.store.dialog.MsDialog;
 import com.xingdata.zzdpos.ui.store.fragment.ScanFragment;
 import com.xingdata.zzdpos.ui.store.fragment.SearchFragment;
 import com.xingdata.zzdpos.ui.store.fragment.StoreFragment;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -53,6 +59,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
         });
     }
 
+
     @Override
     public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) {
         mStoreFragment.loadSkus(skus, isRefresh);
@@ -83,6 +90,8 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
         mViewBinding.setCartCount(saleorder.getOrderCnt());
         mViewBinding.setOrderPayAmt(saleorder.getOrderPayAmt());
         mViewBinding.setMsDisAmt(saleorder.getMsDisAmt());
+
+        if (mCartDialog.isShowing) mCartDialog.loadSaleorder(saleorder);
     }
 
     @Override
@@ -106,4 +115,14 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
         mCartDialog.setSaleorder(saleorder).setSaledetails(saledetails).show(this);
     }
 
+    @Override
+    public void showSettle(List<Saledetail> saledetails) {
+        Intent intent = new Intent(StoreActivity.this, SettleActivity.class);
+        intent.putExtra(C.EXTRA_KEY.SETTLE_MODE, C.SETTLE_MODE.STORE);
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(C.EXTRA_KEY.SETTLE_EXTRA, new ArrayList(saledetails));
+        intent.putExtras(bundle);
+        ActivityUtils.startActivity(intent);
+    }
+
 }

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

@@ -85,6 +85,14 @@ interface StoreContract {
          * @param saledetails 购物车信息
          */
         void showCartDialog(Saleorder saleorder, List<Saledetail> saledetails);
+
+
+        /**
+         * 显示结算页面
+         *
+         * @param saledetails 购物车详情列表
+         */
+        void showSettle(List<Saledetail> saledetails);
     }
 
     abstract class Presenter extends BasePresenter<View> {
@@ -148,23 +156,19 @@ interface StoreContract {
         public abstract <Sku extends BaseSku> void clickRemoveSku(Sku sku);
 
         /**
-         * 购物车页面 - 点击添加购物信息
-         *
-         * @param saledetail 购物信息
+         * 购物车页面 - 购物车发生变化
          */
-        public abstract void clickAddSaledetail(Saledetail saledetail);
+        public abstract void cartChanged();
 
         /**
-         * 购物车页面 - 点击删除购物信息
-         *
-         * @param saledetail 购物信息
+         * 购物车界面 - 关闭
          */
-        public abstract void clickRemoveSaledetail(Saledetail saledetail);
+        public abstract void onCartDialogCancel();
 
         /**
-         * 购物车列表 - 关闭
+         * 购物车界面 - 清空购物车
          */
-        public abstract void onCartDialogCancel();
+        public abstract void clearCart();
     }
 
 }

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

@@ -49,6 +49,7 @@ public class StorePresenter extends StoreContract.Presenter {
 
     @Override
     public void clickSettle() {
+        mView.showSettle(mSaledetails);
     }
 
     @Override
@@ -99,10 +100,8 @@ public class StorePresenter extends StoreContract.Presenter {
         updateCart(sku, 1);
         //发送购物车信息(不需要刷新页面)
         mView.loadSaledetails(mSaledetails, false);
-        //设置订单信息
-        mSaleorder.setSaledetails(mSaledetails);
-        //统计订单信息
-        this.reprice();
+        //购物车发生变化
+        this.cartChanged();
     }
 
     @Override
@@ -111,16 +110,12 @@ public class StorePresenter extends StoreContract.Presenter {
         updateCart(sku, -1);
         //发送购物车信息(不需要刷新页面)
         mView.loadSaledetails(mSaledetails, false);
-        //设置订单信息
-        mSaleorder.setSaledetails(mSaledetails);
-        //统计订单信息
-        this.reprice();
+        //购物车发生变化
+        this.cartChanged();
     }
 
     @Override
-    public void clickAddSaledetail(Saledetail saledetail) {
-        //更新购物车信息
-        updateCart(saledetail, 1);
+    public void cartChanged() {
         //设置订单信息
         mSaleorder.setSaledetails(mSaledetails);
         //统计订单信息
@@ -128,20 +123,21 @@ public class StorePresenter extends StoreContract.Presenter {
     }
 
     @Override
-    public void clickRemoveSaledetail(Saledetail saledetail) {
-        updateCart(saledetail, -1);
+    public void onCartDialogCancel() {
+        //发送购物车信息并刷新页面
+        mView.loadSaledetails(mSaledetails, true);
+    }
+
+    @Override
+    public void clearCart() {
+        //清空购物车
+        this.mSaledetails = new ArrayList<>();
         //设置订单信息
         mSaleorder.setSaledetails(mSaledetails);
         //统计订单信息
         this.reprice();
     }
 
-    @Override
-    public void onCartDialogCancel() {
-        //发送购物车信息并刷新页面
-        mView.loadSaledetails(mSaledetails, true);
-    }
-
 
     /**
      * 获取商品分组
@@ -217,26 +213,6 @@ public class StorePresenter extends StoreContract.Presenter {
         }
     }
 
-    /**
-     * 操作购物车商品
-     *
-     * @param saledetail 购物车信息
-     * @param value      变化的数值
-     */
-    private void updateCart(Saledetail saledetail, int value) {
-        for (int i = 0; i < mSaledetails.size(); i++) {
-            if (saledetail.getSkuId().longValue() == mSaledetails.get(i).getSkuId()) {
-                int count = mSaledetails.get(i).getDetailCnt() + value;
-                if (count > 0) {
-                    mSaledetails.get(i).setCount(mSaledetails.get(i).getDetailCnt() + value);
-                } else {
-                    mSaledetails.remove(i);
-                }
-                return;
-            }
-        }
-    }
-
     /**
      * 统计订单信息
      */

app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SaledetailAdapter.java

 package com.xingdata.zzdpos.ui.store.adapter;
 
-public class SaledetailAdapter {
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.base.BaseViewHolder;
+import com.xingdata.zzdpos.databinding.ItemStoreSaledetailBinding;
+import com.xingdata.zzdpos.model.Saledetail;
+import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
+import com.xingdata.zzdpos.util.ConvertUtil;
+
+import java.util.List;
+
+public class SaledetailAdapter extends BaseAdapter<Saledetail, ItemStoreSaledetailBinding> {
+
+    public SaledetailAdapter(List<Saledetail> saledetails) {
+        super(R.layout.item_store_saledetail, saledetails);
+    }
+
+    private CartDialog.OnCountChangeListener mOnCountChangeListener;
+
+    public void setOnCountChangeListener(CartDialog.OnCountChangeListener onCountChangeListener) {
+        this.mOnCountChangeListener = onCountChangeListener;
+    }
+
+
+    @Override
+    protected void convert(ItemStoreSaledetailBinding mViewBinding, Saledetail item) {
+        mViewBinding.tvName.setText(item.getSpuName());
+        mViewBinding.tvPrice.setText(ConvertUtil.fenToYuan(item.getSkuPricePay(), true));
+
+        mViewBinding.ivIncrease.setOnClickListener(view -> {
+            if (mViewBinding.getCount() >= 99) return;
+            mViewBinding.setCount(mViewBinding.getCount() + 1);
+            mViewBinding.ivIncrease.setImageResource(mViewBinding.getCount() > 0 ? R.mipmap.but_increase01 : R.mipmap.but_increase02);
+            if (mOnCountChangeListener != null) {
+                mOnCountChangeListener.onCountChange(item, 1);
+            }
+        });
+        mViewBinding.ivReduce.setOnClickListener(view -> {
+            mViewBinding.setCount(mViewBinding.getCount() - 1);
+            mViewBinding.ivIncrease.setImageResource(mViewBinding.getCount() > 0 ? R.mipmap.but_increase01 : R.mipmap.but_increase02);
+            if (mOnCountChangeListener != null) {
+                mOnCountChangeListener.onCountChange(item, -1);
+            }
+        });
+
+        mViewBinding.setCount(item.getDetailCnt());
+        mViewBinding.ivIncrease.setImageResource(mViewBinding.getCount() > 0 ? R.mipmap.but_increase01 : R.mipmap.but_increase02);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, Saledetail item) {
+        super.convert(helper, item);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SkuAdapter.java

 package com.xingdata.zzdpos.ui.store.adapter;
 
 import android.support.annotation.Nullable;
+import android.view.View;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseAdapter;
@@ -24,7 +25,6 @@ public class SkuAdapter<T extends BaseSku> extends BaseAdapter<T, ItemStoreSkuBi
 
     private StoreFragment.OnCountChangeListener mOnCountChangeListener;
 
-
     public void setSaledetails(List<Saledetail> saledetails) {
         this.mSaledetails = saledetails;
     }
@@ -39,22 +39,24 @@ public class SkuAdapter<T extends BaseSku> extends BaseAdapter<T, ItemStoreSkuBi
         mViewBinding.tvName.setText(item.getSpuName());
         mViewBinding.tvAmt.setText(ConvertUtil.fenToYuan(item.getSkuRetailPrice1()));
 
+
         mViewBinding.ivIncrease.setOnClickListener(view -> {
             if (mViewBinding.getCount() >= 99) return;
             mViewBinding.setCount(mViewBinding.getCount() + 1);
-            mViewBinding.ivIncrease.setImageResource(mViewBinding.getCount() > 0 ? R.mipmap.but_increase01 : R.mipmap.but_increase02);
+            setViewByCount(mViewBinding);
             if (mOnCountChangeListener != null) {
                 mOnCountChangeListener.onCountChange(item, 1);
             }
         });
         mViewBinding.ivReduce.setOnClickListener(view -> {
             mViewBinding.setCount(mViewBinding.getCount() - 1);
-            mViewBinding.ivIncrease.setImageResource(mViewBinding.getCount() > 0 ? R.mipmap.but_increase01 : R.mipmap.but_increase02);
+            setViewByCount(mViewBinding);
             if (mOnCountChangeListener != null) {
                 mOnCountChangeListener.onCountChange(item, -1);
             }
         });
 
+
         mViewBinding.setCount(0);
         for (int i = 0; i < mSaledetails.size(); i++) {
             if (mSaledetails.get(i).getSkuId().longValue() == item.getSkuId()) {
@@ -62,7 +64,20 @@ public class SkuAdapter<T extends BaseSku> extends BaseAdapter<T, ItemStoreSkuBi
                 break;
             }
         }
-        mViewBinding.ivIncrease.setImageResource(mViewBinding.getCount() > 0 ? R.mipmap.but_increase01 : R.mipmap.but_increase02);
+        setViewByCount(mViewBinding);
+    }
+
+    private void setViewByCount(ItemStoreSkuBinding mViewBinding) {
+        if (mViewBinding.getCount() > 0) {
+            mViewBinding.ivIncrease.setImageResource(R.mipmap.but_increase01);
+            mViewBinding.ivReduce.setVisibility(View.VISIBLE);
+            mViewBinding.tvCount.setVisibility(View.VISIBLE);
+        } else {
+            mViewBinding.ivIncrease.setImageResource(R.mipmap.but_increase02);
+            mViewBinding.ivReduce.setVisibility(View.GONE);
+            mViewBinding.tvCount.setVisibility(View.GONE);
+        }
+
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/store/dialog/CartDialog.java

 package com.xingdata.zzdpos.ui.store.dialog;
 
 import android.content.DialogInterface;
+import android.support.v7.widget.LinearLayoutManager;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseSheetDialog;
@@ -8,6 +9,7 @@ import com.xingdata.zzdpos.databinding.DialogStoreCartBinding;
 import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.ui.store.StorePresenter;
+import com.xingdata.zzdpos.ui.store.adapter.SaledetailAdapter;
 
 import java.util.List;
 
@@ -17,6 +19,15 @@ public class CartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartB
     private Saleorder mSaleorder;
     private List<Saledetail> mSaledetails;
 
+    public interface OnCountChangeListener {
+        void onCountChange(Saledetail saledetail, int value);
+    }
+
+    @Override
+    protected boolean isTransparentBackground() {
+        return true;
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.dialog_store_cart;
@@ -24,8 +35,47 @@ public class CartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartB
 
     @Override
     public void initView() {
+        this.loadSaleorder(mSaleorder);
+
+        // init C
+        SaledetailAdapter mSaledetailAdapter = new SaledetailAdapter(mSaledetails);
+        mViewBinding.rlCart.setAdapter(mSaledetailAdapter);
+        mViewBinding.rlCart.setLayoutManager(new LinearLayoutManager(mContext));
+
+        // set C listener
+        mSaledetailAdapter.setOnCountChangeListener((saledetail, value) -> {
+            for (int i = 0; i < mSaledetails.size(); i++) {
+                if (mSaledetails.get(i).getSkuId().longValue() == saledetail.getSkuId()) {
+                    int count = mSaledetails.get(i).getDetailCnt() + value;
+                    if (count > 0) {
+                        mSaledetails.get(i).setCount(mSaledetails.get(i).getDetailCnt() + value);
+                    } else {
+                        mSaledetailAdapter.getData().remove(i);
+                        mSaledetailAdapter.notifyDataSetChanged();
+                    }
+                    mPresenter.cartChanged();
+                    break;
+                }
+            }
+        });
+
+        // set Other listener
+        mViewBinding.tvSettle.setOnClickListener(view -> mPresenter.clickSettle());
+        mViewBinding.tvClear.setOnClickListener(view -> mPresenter.clearCart());
+    }
+
 
+    /**
+     * 加载订单信息
+     *
+     * @param saleorder 订单信息
+     */
+    public void loadSaleorder(Saleorder saleorder) {
+        mViewBinding.setCartCount(saleorder.getOrderCnt());
+        mViewBinding.setOrderPayAmt(saleorder.getOrderPayAmt());
+        mViewBinding.setMsDisAmt(saleorder.getMsDisAmt());
 
+        if (saleorder.getOrderCnt() == 0) this.dismiss();
     }
 
     public CartDialog setSaleorder(Saleorder saleorder) {

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

@@ -43,6 +43,7 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
         mViewBinding.rlSkugrp.setAdapter(mSkugrpAdapter);
         mViewBinding.rlSkugrp.setLayoutManager(new LinearLayoutManager(mContext));
 
+
         // set sku listener
         mViewBinding.srlSku.setOnRefreshListener(this::refreshSku);
         mSkuAdapter.setOnLoadMoreListener(this::loadMoreSku, mViewBinding.rlSku);
@@ -64,7 +65,6 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
         mPresenter.initStore();
     }
 
-
     /**
      * 刷新商品
      */

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java

@@ -26,15 +26,15 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
 
     @Override
     public void initView() {
+        loadRootFragment(R.id.vip_list_frame, vipListFragment, false, false);
         loadRootFragment(R.id.vip_level_frame, vipLevleFragment, false, false);
         loadRootFragment(R.id.vip_title_frame, vipTitleFragment, false, false);
-        loadRootFragment(R.id.vip_list_frame, vipListFragment, false, false);
+
 
     }
 
     @Override
     public void addVip() {
-
     }
 
     @Override
@@ -43,15 +43,17 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
     }
 
     @Override
-    public Pager<Vip> getVipLevelSus() {
-        return null;
+    public void getVipLevelSus(Pager<Level> levelPager) {
+
     }
 
+
     @Override
-    public Pager<Level> getVipListSus() {
-        return null;
+    public void getVipListSus(Pager<Vip> vipPager) {
+
     }
 
+
     @Override
     public String getVipNumberSus() {
         return null;

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipContract.java

@@ -7,26 +7,29 @@ import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Vip;
 
 
-interface VipContract {
+public interface VipContract {
 
     interface View extends BaseView {
         void addVip();
+
         String addVipSus();
-        Pager<Vip> getVipLevelSus();
 
-        Pager<Level> getVipListSus();
+        void getVipLevelSus(Pager<Level> levelPager);
+
+        void getVipListSus(Pager<Vip> vipPager);
 
         String getVipNumberSus();
 
     }
 
     abstract class Presenter extends BasePresenter<VipContract.View> {
-        public abstract void getVipList(int levelId, int pageNumber);
+        public abstract void getVipList( int pageNumber, int vipLevel);
 
-        public abstract void getVipLevel();
+        public abstract void getVipLevel(int pageNum, int
+                pageSize);
 
         public abstract void getVipNumber();
 
-        public abstract   void addVip();
+        public abstract void addVip();
     }
 }
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java

 package com.xingdata.zzdpos.ui.vip;
 
 
+import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.ui.vip.fragment.VipInfoFragment;
 
 public class VipPresenter extends VipContract.Presenter {
@@ -10,14 +12,25 @@ public class VipPresenter extends VipContract.Presenter {
     public void onAttached() {
     }
 
-    @Override
-    public void getVipList(int levelId, int pageNumber) {
 
+    @Override
+    public void getVipList(int pageNumber, int vipLevel) {
+        ApiFactory.User.getVipList(pageNumber).subscribe(vipPager -> {
+            mView.getVipListSus(vipPager);
+        }, throwable -> {
+            ToastUtils.showShort(throwable.getMessage());
+        });
     }
 
-    @Override
-    public void getVipLevel() {
 
+    @Override
+    public void getVipLevel(int pageNum, int
+            pageSize) {
+        ApiFactory.Level.getVipLevelList(pageNum, pageSize).subscribe(vipPager -> {
+            mView.getVipLevelSus(vipPager);
+        }, throwable -> {
+            ToastUtils.showShort(throwable.getMessage());
+        });
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipRechargeAdapter.java

@@ -20,7 +20,7 @@ public class VipRechargeAdapter extends BaseAdapter<VipRechangeOrder, ItemVipRec
     private Context mContext;
 
     public VipRechargeAdapter(Context mContext, @Nullable List<VipRechangeOrder> data) {
-        super(R.layout.item_vip_list_item, data);
+        super(R.layout.item_vip_recharge_item, data);
         this.mContext=mContext;
     }
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/vip/dialog/VipEditMenuDialog.java

+package com.xingdata.zzdpos.ui.vip.dialog;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseSheetDialog;
+import com.xingdata.zzdpos.databinding.DialogVipMenuBinding;
+import com.xingdata.zzdpos.ui.vip.VipPresenter;
+
+/**
+ * Created by JM_DEV on 2017/12/27.
+ */
+
+public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMenuBinding> {
+    @Override
+    public int getLayoutId() {
+        return R.layout.dialog_vip_menu;
+    }
+
+    @Override
+    public void initView() {
+
+
+    }
+
+    @Override
+    protected boolean isTransparentBackground() {
+        return true;
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java

@@ -8,11 +8,14 @@ import android.support.v7.widget.LinearLayoutManager;
 
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.base.BaseSheetDialog;
 import com.xingdata.zzdpos.databinding.FragmentVipinfoBinding;
 import com.xingdata.zzdpos.model.VipRechangeOrder;
 import com.xingdata.zzdpos.ui.vip.VipPresenter;
 import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
+import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,9 +23,10 @@ import java.util.List;
 /**
  * 会员信息界面
  */
-public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipinfoBinding> {
+public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipinfoBinding>  {
     private VipRechargeAdapter vipRechargeAdapter;
     private List<VipRechangeOrder> orders = new ArrayList<>();
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_vipinfo;
@@ -30,14 +34,34 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipinfoB
 
     @Override
     public void initView() {
+        for (int i=0;i<10;i++){
+            orders.add(new VipRechangeOrder());
+        }
         vipRechargeAdapter = new VipRechargeAdapter(getActivity(), orders);
-        mViewBinding.rechargeRecyclerView.setLayoutManager( new LinearLayoutManager(getActivity()));
+        mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
         mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
+        vipRechargeAdapter.setEnableLoadMore(true);
+        vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
+        mViewBinding.infoTitle.popMenu.setOnClickListener(view ->{
+            new VipEditMenuDialog().show((BaseActivity) getActivity());
+        });
+        mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
+
+            ToastUtils.showShort("aaaaaaaaaa");
+        });
+
+
+    }
+
+    private void onLoadMore() {
+        vipRechargeAdapter.addData(new VipRechangeOrder());
+        vipRechargeAdapter.setEnableLoadMore(true);
+        vipRechargeAdapter.loadMoreComplete();
+        ToastUtils.showShort("刷新成功");
     }
 
     private void onRefresh() {
-        vipRechargeAdapter.addData(new ArrayList<VipRechangeOrder>());
         mViewBinding.rechargeRefresh.setRefreshing(false);
         ToastUtils.showShort("刷新成功");
     }

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipLevleFragment.java

@@ -16,13 +16,17 @@ import android.widget.RadioGroup;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
+import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.ui.vip.VipActivity;
+import com.xingdata.zzdpos.ui.vip.VipContract;
 import com.xingdata.zzdpos.ui.vip.VipPresenter;
 
 /**
  * 会员等级列表
  */
-public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
+public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> implements VipContract.View {
     @Override
     public int getLayoutId() {
         return R.layout.fragment_viplevel_title;
@@ -30,19 +34,7 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
 
     @Override
     public void initView() {
-        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
-        layoutParams.height = 120;
-        layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT;
-        for (int i = 0; i < 5; i++) {
-            mViewBinding.vipLevelRadioGroup.addView(addRadioButton(layoutParams));
-        }
-        ((RadioButton) mViewBinding.vipLevelRadioGroup.getChildAt(0)).setChecked(true);
-        mViewBinding.vipLevelRadioGroup.setOnCheckedChangeListener((radioGroup, n) -> {
-            for (int i = 0; i < mViewBinding.vipLevelRadioGroup.getChildCount(); i++) {
-                //动态设置按钮颜色
-                setRadioButtonChecked(i == n - 1, ((RadioButton) radioGroup.getChildAt(i)));
-            }
-        });
+        mPresenter.getVipLevel(0,200);
     }
 
     /**
@@ -58,13 +50,15 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
         } else {
             button.setTextSize(15);
         }
+        mPresenter.getVipList(0,Integer.parseInt(button.getTag().toString()));
     }
 
     @SuppressLint("ResourceAsColor")
-    private RadioButton addRadioButton(LinearLayout.LayoutParams layoutParams) {
+    private RadioButton addRadioButton(LinearLayout.LayoutParams layoutParams, Level level) {
         RadioButton radioButton = new RadioButton(getActivity());
         radioButton.setTextSize(15);
-        radioButton.setText("金牌会员");
+        radioButton.setText(level.getVipLevelName());
+        radioButton.setTag(level.getVipLevel());
         setRadioButtonChecked(false, radioButton);
         radioButton.setGravity(Gravity.CENTER);
         radioButton.setButtonDrawable(null);
@@ -74,4 +68,42 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
         radioButton.setLayoutParams(layoutParams);
         return radioButton;
     }
+
+    @Override
+    public void addVip() {
+
+    }
+
+    @Override
+    public String addVipSus() {
+        return null;
+    }
+
+    @Override
+    public void getVipLevelSus(Pager<Level> levelPager) {
+        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
+        layoutParams.height = 120;
+        layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT;
+        for (int i = 0; i < levelPager.getPageSize(); i++) {
+            mViewBinding.vipLevelRadioGroup.addView(addRadioButton(layoutParams,levelPager.getList().get(i)));
+        }
+        ((RadioButton) mViewBinding.vipLevelRadioGroup.getChildAt(0)).setChecked(true);
+        mViewBinding.vipLevelRadioGroup.setOnCheckedChangeListener((radioGroup, n) -> {
+            for (int i = 0; i < mViewBinding.vipLevelRadioGroup.getChildCount(); i++) {
+                //动态设置按钮颜色
+                setRadioButtonChecked(i == n - 1, ((RadioButton) radioGroup.getChildAt(i)));
+            }
+        });
+    }
+
+    @Override
+    public void getVipListSus(Pager<Vip> vipPager) {
+
+    }
+
+    @Override
+    public String getVipNumberSus() {
+
+        return null;
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java

@@ -5,14 +5,15 @@ package com.xingdata.zzdpos.ui.vip.fragment;
  */
 
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 
-import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentVipListBinding;
-import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
+import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.ui.vip.VipContract;
 import com.xingdata.zzdpos.ui.vip.VipPresenter;
 import com.xingdata.zzdpos.ui.vip.adapter.VipListAdapter;
 
@@ -22,9 +23,10 @@ import java.util.List;
 /**
  * 会员列表
  */
-public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListBinding> {
+public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListBinding> implements  VipContract.View   {
     private VipListAdapter vipListAdapter;
     private List<Vip> vips = new ArrayList<>();
+    private int inViplevel=0;
 
 
     @Override
@@ -35,21 +37,59 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
     @Override
     public void initView() {
         vipListAdapter = new VipListAdapter(getActivity(), vips);
-        mViewBinding.vipRecyclerView.setLayoutManager( new LinearLayoutManager(getActivity()));
+        mViewBinding.vipRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mViewBinding.vipRecyclerView.setAdapter(vipListAdapter);
         mViewBinding.vipRefresh.setOnRefreshListener(this::onRefresh);
-        mViewBinding.vipRecyclerView.setOnClickListener(view -> {
-            start(new VipInfoFragment());
+        vipListAdapter.setOnItemClickListener((adapter, view, position) -> {
+            ((BaseActivity) getActivity()).start(new VipInfoFragment());
         });
+        vipListAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.vipRecyclerView);
+        vipListAdapter.setEnableLoadMore(true);
+
+
     }
 
-    private void onRefresh() {
+    private void onLoadMore() {
         Vip vip = new Vip();
         vip.setVipName("张山");
         vip.setVipMobile(13311221212L);
         vip.setVipDefDiscount(80);
         vipListAdapter.addData(vip);
-        ToastUtils.showShort("刷新成功");
+        vipListAdapter.loadMoreComplete();
+    }
+
+    private void onRefresh() {
+//        mPresenter.getVipList(inViplevel,0);
+    }
+
+    @Override
+    public void addVip() {
+
+    }
+
+    @Override
+    public String addVipSus() {
+        return null;
+    }
+
+    @Override
+    public void getVipLevelSus(Pager<Level> levelPager) {
+
+    }
+
+    @Override
+    public void getVipListSus(Pager<Vip> vipPager) {
         mViewBinding.vipRefresh.setRefreshing(false);
+        if (vipPager.isFirstPage()) {
+            vips.clear();
+            vipListAdapter.notifyDataSetChanged();
+        }else {
+            vipListAdapter.addData(vipPager.getList());
+        }
+    }
+
+    @Override
+    public String getVipNumberSus() {
+        return null;
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipTitleFragment.java

@@ -10,6 +10,7 @@ import android.widget.LinearLayout;
 import android.widget.RadioButton;
 
 import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
 import com.xingdata.zzdpos.databinding.FragmentViptitleBinding;
@@ -25,7 +26,7 @@ public class VipTitleFragment extends BaseFragment<VipPresenter, FragmentViptitl
     @Override
     public void initView() {
         mViewBinding.addButton.setOnClickListener(view -> {
-           start(mPresenter.vipInfoFragment);
+            ((BaseActivity) getActivity()).start(mPresenter.vipInfoFragment);
         });
     }
 }

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -55,7 +55,7 @@ public final class SystemUtil {
             }
         }
 //        return deviceSN;
-        return "92209325";
+        return "548496";
     }
 
 

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

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

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity">
+<layout>
 
-    <include
-        android:id="@+id/ic_title"
-        layout="@layout/title"
-        app:layout_constraintBottom_toTopOf="@+id/rv_menu"/>
+    <data>
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/rv_menu"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ic_title"></android.support.v7.widget.RecyclerView>
-</android.support.constraint.ConstraintLayout>
+        <variable
+            name="OnClickListener"
+            type="com.xingdata.zzdpos.util.OnClickListener"></variable>
+    </data>
+
+    <android.support.constraint.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context="com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity">
+
+        <include
+            android:id="@+id/ic_title"
+            layout="@layout/title"
+            app:layout_constraintBottom_toTopOf="@+id/rv_menu"/>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_menu"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ic_title"></android.support.v7.widget.RecyclerView>
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <LinearLayout
+    <data>
+
+        <import type="android.view.View" />
+
+        <import type="com.xingdata.zzdpos.util.ConvertUtil" />
+
+        <variable
+            name="cartCount"
+            type="int" />
+
+        <variable
+            name="orderPayAmt"
+            type="long" />
+
+        <variable
+            name="msDisAmt"
+            type="long" />
+
+
+    </data>
+
+    <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:background="@color/red_xishi"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="vertical">
 
-        <TextView
+
+        <LinearLayout
+            android:id="@+id/ll_title"
+            android:layout_width="0dp"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/white_caocao"
+            android:gravity="center_vertical|end"
+            android:paddingEnd="@dimen/all_margin"
+            android:paddingStart="@dimen/all_margin"
+            app:layout_constraintBottom_toTopOf="@id/rl_cart"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent">
+
+            <TextView
+                android:id="@+id/tv_clear"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:paddingBottom="@dimen/all_spacing"
+                android:paddingEnd="@dimen/all_margin_big"
+                android:paddingStart="@dimen/all_margin_big"
+                android:paddingTop="@dimen/all_spacing"
+                android:text="@string/store_clear_all"
+                android:textColor="@color/black_baozheng" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintBottom_toTopOf="@id/rl_cart" />
+
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rl_cart"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white_caocao"
+            app:layout_constraintBottom_toTopOf="@id/ll_info" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintBottom_toTopOf="@id/ll_info" />
+
+        <LinearLayout
+            android:id="@+id/ll_info"
+            android:layout_width="0dp"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/white_caocao"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingEnd="@dimen/all_margin"
+            android:paddingStart="@dimen/all_margin"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/store_pay_amt"
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/all_text_size" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/all_spacing"
+                android:text="@string/money_rmb"
+                android:textColor="@color/red_guanyu"
+                android:textSize="@dimen/all_text_size" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@{ConvertUtil.fenToYuan(orderPayAmt)}"
+                android:textColor="@color/red_guanyu"
+                android:textSize="@dimen/all_sub_title_size"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tv_settle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/shape_red_round_rectangle_more_round"
+                android:foreground="?android:attr/actionBarItemBackground"
+                android:paddingBottom="@dimen/all_spacing"
+                android:paddingEnd="@dimen/all_margin_big"
+                android:paddingStart="@dimen/all_margin_big"
+                android:paddingTop="@dimen/all_spacing"
+                android:text="@string/store_btn_settle"
+                android:textColor="@color/white_caocao" />
+        </LinearLayout>
+
+
+        <FrameLayout
+            android:id="@+id/fl_logo"
             android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:text="测试测试测试"
-            android:textColor="@color/white_caocao" />
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:animateLayoutChanges="true"
+            app:layout_constraintBottom_toBottomOf="@id/ll_title"
+            app:layout_constraintLeft_toLeftOf="parent">
+
+
+            <ImageView
+                android:id="@+id/iv_cart"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/all_spacing"
+                android:contentDescription="@string/store_cart"
+                android:foreground="?attr/actionBarItemBackground"
+                android:src="@mipmap/shopping_cart" />
+
+            <TextView
+                android:layout_width="@dimen/store_cart_count"
+                android:layout_height="@dimen/store_cart_count"
+                android:layout_gravity="end"
+                android:background="@drawable/shape_white_oval"
+                android:gravity="center"
+                android:text='@{cartCount+""}'
+                android:textColor="@color/red_guanyu"
+                android:textSize="@{cartCount &lt; 100?@dimen/all_caption_size:@dimen/all_tiny_size}"
+                android:textStyle="bold"
+                android:visibility="@{cartCount>0?View.VISIBLE:View.GONE}" />
+        </FrameLayout>
+
 
-    </LinearLayout>
+    </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -4,9 +4,15 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/transparent_border"
+        android:background="@color/transparent"
         android:gravity="center"
         android:orientation="vertical">
 
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="AAAAAAAAAAAAAAAAAA" />
+
     </LinearLayout>
 </layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/transparent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/dp_10"
+            android:background="@drawable/shape_white"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/default_bluetext_popbutton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dtail_hight_5"
+                android:background="@color/white"
+                android:text="编辑会员" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/line_bg" />
+
+            <TextView
+                style="@style/default_bluetext_popbutton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dtail_hight_5"
+                android:background="@color/white"
+                android:text="充值会员" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/line_bg" />
+
+            <TextView
+                style="@style/default_bluetext_popbutton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dtail_hight_5"
+                android:background="@color/white"
+                android:text="消费记录" />
+
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/dp_10"
+            android:layout_marginTop="30dp"
+            android:background="@drawable/shape_white"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/default_bluetext_popbutton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dtail_hight_5"
+                android:background="@color/white"
+                android:text="取消" />
+        </LinearLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file

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

@@ -172,19 +172,113 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/all_line_width"
-                    android:layout_marginBottom="@dimen/all_spacing"
                     android:background="@color/gray_huanggai" />
 
-                <FrameLayout
-                    android:id="@+id/f_saledetail"
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/all_line_width"
+                    android:layout_marginTop="@dimen/all_margin"
+                    android:background="@color/gray_huanggai" />
+
+                <LinearLayout
+                    android:id="@+id/ll_store"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone" />
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:id="@+id/ll_saledetail"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:animateLayoutChanges="true"
+                        android:background="@color/white_caocao"
+                        android:foreground="?android:attr/selectableItemBackground"
+                        android:orientation="horizontal"
+                        android:paddingEnd="@dimen/all_margin"
+                        android:paddingStart="@dimen/all_margin">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="?attr/actionBarSize"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical"
+                            android:text="@string/settle_saledetail_hint"
+                            android:textColor="@color/black_baozheng"
+                            android:textSize="@dimen/all_text_size" />
+
+                        <CheckBox
+                            android:id="@+id/cb_saledetail"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:button="@mipmap/but_unfurled"
+                            android:foreground="?android:attr/actionBarItemBackground" />
+                    </LinearLayout>
+
+
+                    <View
+                        android:id="@+id/rl_saledetail"
+                        android:layout_width="match_parent"
+                        android:layout_height="300dp"
+                        android:background="@color/red_xishi"
+                        android:visibility="gone" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/all_line_width"
+                        android:layout_marginEnd="@dimen/all_margin"
+                        android:layout_marginStart="@dimen/all_margin"
+                        android:background="@color/gray_kongming" />
+
+
+                    <LinearLayout
+                        android:id="@+id/ll_ms"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:animateLayoutChanges="true"
+                        android:background="@color/white_caocao"
+                        android:foreground="?android:attr/selectableItemBackground"
+                        android:orientation="horizontal"
+                        android:paddingEnd="@dimen/all_margin"
+                        android:paddingStart="@dimen/all_margin">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="?attr/actionBarSize"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical"
+                            android:text="@string/settle_ms_hint"
+                            android:textColor="@color/black_baozheng"
+                            android:textSize="@dimen/all_text_size" />
+
+                        <CheckBox
+                            android:id="@+id/cb_ms"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:button="@mipmap/but_unfurled"
+                            android:foreground="?android:attr/actionBarItemBackground" />
+                    </LinearLayout>
+
+
+                    <View
+                        android:id="@+id/rl_ms"
+                        android:layout_width="match_parent"
+                        android:layout_height="100dp"
+                        android:background="@color/red_diaochan"
+                        android:visibility="gone" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/all_line_width"
+                        android:background="@color/gray_huanggai" />
+
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/ll_vip"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/all_margin"
                     android:background="@color/white_caocao"
                     android:orientation="vertical">
 
@@ -223,7 +317,7 @@
                         android:layout_height="@dimen/all_line_width"
                         android:layout_marginEnd="@dimen/all_margin"
                         android:layout_marginStart="@dimen/all_margin"
-                        android:background="@color/gray_huanggai" />
+                        android:background="@color/gray_kongming" />
 
                     <LinearLayout
                         android:id="@+id/ll_ticket"
@@ -271,7 +365,7 @@
                         android:layout_height="@dimen/all_line_width"
                         android:layout_marginEnd="@dimen/all_margin"
                         android:layout_marginStart="@dimen/all_margin"
-                        android:background="@color/gray_huanggai" />
+                        android:background="@color/gray_kongming" />
 
                     <LinearLayout
                         android:id="@+id/ll_point"
@@ -296,7 +390,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginEnd="@dimen/all_spacing"
-                            android:text="@{@string/settle_point_vip_text + avlPoints + @string/settle_point_amt_text + pointDisAmt}"
+                            android:text="@{@string/settle_point_vip_text + avlPoints + @string/settle_point_amt_text + pointDisAmt +@string/unit_rmb_yuan}"
                             android:textColor="@color/black_likui" />
 
                         <CheckBox
@@ -304,7 +398,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:button="@mipmap/but_elect02"
-                            android:contentDescription="@string/settle_balance" />
+                            android:contentDescription="@string/settle_point" />
 
                     </LinearLayout>
 
@@ -313,7 +407,7 @@
                         android:layout_height="@dimen/all_line_width"
                         android:layout_marginEnd="@dimen/all_margin"
                         android:layout_marginStart="@dimen/all_margin"
-                        android:background="@color/gray_huanggai" />
+                        android:background="@color/gray_kongming" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -348,7 +442,6 @@
 
                 </LinearLayout>
 
-
             </LinearLayout>
 
         </android.support.v4.widget.NestedScrollView>

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

@@ -42,7 +42,8 @@
                 android:id="@+id/srl_sku"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="3">
+                android:layout_weight="3"
+                android:background="@color/white_caocao">
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/rl_sku"

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout>
 
+    <data>
+
+        <variable
+            name="onClickListener"
+            type="com.xingdata.zzdpos.util.OnClickListener" />
+    </data>
+
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/bg"
         android:orientation="vertical">
 
-        <include layout="@layout/title_pop" />
+        <include
+            android:id="@+id/info_title"
+            layout="@layout/title_pop" />
 
         <LinearLayout
             android:layout_width="match_parent"

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout>
-
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -8,12 +7,11 @@
         android:orientation="vertical">
 
         <RadioGroup
-            android:gravity="center"
             android:id="@+id/vip_level_RadioGroup"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-        </RadioGroup>
+            android:gravity="center"
+            android:orientation="vertical"></RadioGroup>
     </LinearLayout>
 
 </layout>
\ No newline at end of file

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

@@ -12,6 +12,7 @@
 
     </data>
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+
+
+    </data>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/all_margin"
+                    android:background="@color/white"
+                    android:orientation="horizontal">
+
+
+        <ImageView
+            android:id="@+id/iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="@dimen/all_margin"
+            android:src="@mipmap/right"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@+id/iv"
+            android:padding="@dimen/all_padding">
+
+            <ImageView
+                android:id="@+id/iv_logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/vip_level"/>
+
+            <TextView
+                android:id="@+id/tv_menu_name"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center|left"
+                android:padding="@dimen/all_padding"
+                android:text="会员等级"
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/et_textsize"/>
+        </LinearLayout>
+    </RelativeLayout>
+</layout>
\ No newline at end of file

app/src/main/res/layout/item_settle_saledetail.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.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:orientation="vertical"
+        android:paddingEnd="@dimen/all_margin"
+        android:paddingStart="@dimen/all_margin">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:maxLines="2"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_caption_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHorizontal_weight="6"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/tv_count"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_count"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_caption_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintLeft_toRightOf="@+id/tv_name"
+            app:layout_constraintRight_toLeftOf="@+id/tv_price"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <TextView
+            android:id="@+id/tv_initial_price"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/all_caption_size"
+            android:visibility="gone"
+            app:layout_constraintBottom_toTopOf="@+id/tv_price"
+            app:layout_constraintLeft_toRightOf="@+id/tv_count"
+            app:layout_constraintRight_toLeftOf="@+id/tv_amt"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_price"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_caption_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHorizontal_weight="2"
+            app:layout_constraintLeft_toRightOf="@+id/tv_count"
+            app:layout_constraintRight_toLeftOf="@+id/tv_amt"
+            app:layout_constraintTop_toBottomOf="@id/tv_initial_price" />
+
+        <TextView
+            android:id="@+id/tv_amt"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_caption_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHorizontal_weight="2"
+            app:layout_constraintLeft_toRightOf="@+id/tv_price"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </android.support.constraint.ConstraintLayout>
+
+</layout>
+
+

app/src/main/res/layout/item_store_saledatail.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">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="count"
-            type="int" />
-
-    </data>
-
-    <android.support.constraint.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white_caocao"
-        android:paddingEnd="@dimen/all_margin"
-        android:paddingStart="@dimen/all_margin"
-        android:paddingTop="@dimen/all_margin">
-
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/iv_pic"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            app:failureImage="@mipmap/icon_goods_default"
-            app:placeholderImage="@mipmap/icon_goods_default"
-            app:roundedCornerRadius="@dimen/all_shape_radius" />
-
-        <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_margin"
-            android:lines="2"
-            android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/all_text_size"
-            app:layout_constraintLeft_toRightOf="@id/iv_pic"
-            app:layout_constraintRight_toRightOf="parent" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/all_spacing"
-            app:layout_constraintBottom_toBottomOf="@id/ll_count"
-            app:layout_constraintLeft_toLeftOf="@id/tv_name">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/money_rmb"
-                android:textColor="@color/red_guanyu"
-                android:textSize="@dimen/all_caption_size"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/tv_amt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/red_guanyu"
-                android:textSize="@dimen/all_text_size"
-                android:textStyle="bold" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/all_spacing"
-            android:animateLayoutChanges="true"
-            android:gravity="center"
-            app:layout_constraintBottom_toBottomOf="@id/iv_pic"
-            app:layout_constraintRight_toRightOf="@id/tv_name">
-
-            <ImageView
-                android:id="@+id/iv_reduce"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/store_reduce"
-                android:foreground="?android:attr/actionBarItemBackground"
-                android:src="@mipmap/but_reduce"
-                android:visibility="@{count>0?View.VISIBLE:View.INVISIBLE}" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/all_spacing"
-                android:layout_marginStart="@dimen/all_spacing"
-                android:text='@{count+""}'
-                android:textColor="@color/black_likui"
-                android:textSize="@dimen/all_sub_title_size"
-                android:visibility="@{count>0?View.VISIBLE:View.INVISIBLE}" />
-
-            <ImageView
-                android:id="@+id/iv_increase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/store_increase"
-                android:foreground="?android:attr/actionBarItemBackground"
-                android:src="@mipmap/but_increase02" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="@dimen/all_line_width"
-            android:layout_marginTop="@dimen/all_margin"
-            android:background="@color/gray_kongming"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_pic" />
-
-    </android.support.constraint.ConstraintLayout>
-
-</layout>
-
-

app/src/main/res/layout/item_store_saledetail.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">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="count"
+            type="int" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/white_caocao"
+            android:gravity="center"
+            android:paddingEnd="@dimen/all_margin"
+            android:paddingStart="@dimen/all_margin">
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:singleLine="true"
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/all_text_size" />
+
+
+            <TextView
+                android:id="@+id/tv_price"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/all_text_size" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="end">
+
+                <ImageView
+                    android:id="@+id/iv_reduce"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/store_reduce"
+                    android:foreground="?android:attr/actionBarItemBackground"
+                    android:src="@mipmap/but_reduce"
+                    android:visibility="@{count>0?View.VISIBLE:View.INVISIBLE}" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/all_spacing"
+                    android:layout_marginStart="@dimen/all_spacing"
+                    android:text='@{count+""}'
+                    android:textColor="@color/black_likui"
+                    android:textSize="@dimen/all_text_size"
+                    android:visibility="@{count>0?View.VISIBLE:View.INVISIBLE}" />
+
+                <ImageView
+                    android:id="@+id/iv_increase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/store_increase"
+                    android:foreground="?android:attr/actionBarItemBackground"
+                    android:src="@mipmap/but_increase02" />
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:background="@color/gray_kongming" />
+    </LinearLayout>
+
+</layout>
+
+

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

@@ -80,9 +80,10 @@
                 android:contentDescription="@string/store_reduce"
                 android:foreground="?android:attr/actionBarItemBackground"
                 android:src="@mipmap/but_reduce"
-                android:visibility="@{count>0?View.VISIBLE:View.INVISIBLE}" />
+                android:visibility="gone" />
 
             <TextView
+                android:id="@+id/tv_count"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/all_spacing"
@@ -90,7 +91,7 @@
                 android:text='@{count+""}'
                 android:textColor="@color/black_likui"
                 android:textSize="@dimen/all_sub_title_size"
-                android:visibility="@{count>0?View.VISIBLE:View.INVISIBLE}" />
+                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/iv_increase"

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

@@ -8,8 +8,8 @@
         android:orientation="horizontal">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:layout_margin="@dimen/all_margin"
             android:background="@mipmap/pay_alipay" />
 

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

@@ -11,10 +11,10 @@
     </data>
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@drawable/singleline_white_gray"
-        android:orientation="horizontal">
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    android:background="@drawable/singleline_white_gray"
+                    android:orientation="horizontal">
 
 
         <ImageButton

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout>
 
-    <data>
-
-        <variable
-            name="onClickListener"
-            type="com.xingdata.zzdpos.util.OnClickListener" />
-
-
-    </data>
-
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -21,8 +12,7 @@
             android:id="@+id/iv_back"
             android:layout_width="?attr/actionBarSize"
             android:layout_height="match_parent"
-            android:background="@mipmap/go_back"
-            android:onClick="@{onClickListener}" />
+            android:background="@mipmap/go_back" />
 
         <TextView
             android:id="@+id/tv_title"
@@ -38,8 +28,7 @@
             android:layout_width="60dp"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:background="@mipmap/pop_menu"
-            android:onClick="@{onClickListener}" />
+            android:background="@mipmap/pop_menu" />
 
 
     </RelativeLayout>

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

@@ -520,6 +520,8 @@
     <string name="settle_point_vip_text">可用积分</string>
     <string name="settle_point_amt_text"> , 可抵用</string>
     <string name="settle_balance">账户余额</string>
+    <string name="settle_saledetail_hint">商品详情</string>
+    <string name="settle_ms_hint">账户余额</string>
 
     <!--支付里的Vip-->
     <string name="settle_vip_search_hint">请输入会员手机号</string>
@@ -535,6 +537,7 @@
     <string name="store_pay_amt">合计:</string>
     <string name="store_cart">购物车</string>
     <string name="store_btn_settle">选好了</string>
+    <string name="store_clear_all">全部清空</string>
     <string name="store_ms_dis">已减</string>
     <string name="store_scan">扫描</string>
     <string name="store_search_hint">请输入商品名称/助记码/条码</string>

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

@@ -43,6 +43,17 @@
         <item name="android:textColor">@color/black</item>
         <item name="android:textSize">@dimen/detail_textview_size</item>
     </style>
+    <style name="default_bluetext_popbutton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:padding">@dimen/dp_4</item>
+        <item name="android:textColor">@color/blue_mawu</item>
+        <item name="android:textSize">@dimen/big_text_size</item>
+    </style>
+
+
 
     <style name="default_title">
         <item name="android:gravity">center_vertical</item>