添加颜色

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

@@ -345,6 +345,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 {
@@ -364,6 +365,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

@@ -967,6 +967,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

@@ -335,6 +335,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);
 
@@ -360,4 +363,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/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() {
+
+    }
+}

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/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="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/transparent_border"
+        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/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_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_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>