添加钱包部分

module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java

@@ -73,6 +73,7 @@ public class ApiConfig {
 
     public static String HTTP_URR_USER_POINT = RvFrameConfig.HOST + "/api/activity/integralUserTotal/getByUser";
 
+
     public static String HTTP_URL_POINT_LIST = RvFrameConfig.HOST + "/api/activity/integralRule/list";
 
     public static String HTTP_URL_POINT_SIGN_RULER = RvFrameConfig.HOST + "/api/activity/integralRule/one?code=%s";
@@ -89,4 +90,6 @@ public class ApiConfig {
     public static String HTTP_URL_INCOME_RECORD = RvFrameConfig.HOST + "/api/admin/sellingwater/page";
 
     public static String HTTP_URL_INVITE_LIST = RvFrameConfig.HOST + "/api/admin/relation/pages";
+
+    public static String HTTP_URL_CONSUME_LIST = RvFrameConfig.HOST + "/api/admin/walletDetail/page";
 }

plugin_points/src/main/java/com/rv/points/adapter/PointAdapter.java

@@ -38,7 +38,6 @@ public class PointAdapter extends BaseQuickAdapter<PointBean.RvPointItem, BaseVi
                 helper.setText(R.id.tv_regulation, item.getRegulation());
                 helper.setTextColor(R.id.tv_regulation, Color.parseColor("#999999"));
             }
-
         }
         if (item.getPoint() != 0) {
             helper.setText(R.id.tv_points, item.getPoint() + "分");

plugin_version/src/main/res/xml/update_file_paths.xml

@@ -5,7 +5,7 @@
      
     <cache-path name="cache-path" path="" />
      
-    <external-path name="external-path" path="photo/camera" />
+    <external-path name="external-path" path="" />
      
     <external-files-path name="external-files-path" path="" />
      

plugin_wallet/build.gradle

@@ -40,4 +40,5 @@ dependencies {
     api project(':RvWrapper')
     api project(':component_resource')
     api project(':component_utils')
+    implementation project(':module_home')
 }

plugin_wallet/src/main/AndroidManifest.xml

@@ -5,6 +5,8 @@
     <application>
         <activity android:name=".activity.WithdrawActivity"></activity>
         <activity android:name=".activity.WalletActivity" />
+        <activity android:name=".activity.ConsumeDetailActivity" />
+        <activity android:name=".activity.CommissionDetailActivity" />
     </application>
 
 </manifest>
\ No newline at end of file

plugin_wallet/src/main/java/com/xxrv/wallet/activity/CommissionDetailActivity.java

+package com.xxrv.wallet.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.view.ViewPager;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.ruiwenliu.wrapper.adapter.TabAdapter;
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseFragment;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.presenter.MvpPresenter;
+import com.ruiwenliu.wrapper.weight.TitleView;
+import com.ruiwenliu.wrapper.weight.horizontal.GallerySnapHelper;
+import com.ruiwenliu.wrapper.weight.horizontal.SpaceItemDecoration;
+import com.rv.home.rv.module.basic.presenter.CommonPresenter;
+import com.rv.home.rv.module.ui.main.home.adapter.OrderMenuAdapter;
+import com.xxrv.wallet.R;
+import com.xxrv.wallet.R2;
+import com.xxrv.wallet.fragment.CommisionAllFragment;
+import com.xxrv.wallet.fragment.CommisionFinishFragment;
+import com.xxrv.wallet.fragment.CommisionUnFinishFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+public class CommissionDetailActivity extends BaseStatusActivity<CommonPresenter> {
+
+
+    @BindView(R2.id.recyclerview)
+    RecyclerView recyclerView;
+    @BindView(R2.id.viewpager)
+    ViewPager viewpager;
+
+    private OrderMenuAdapter menuAdapter;
+    private TabAdapter mAdapter;
+    private int menuPosition;
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+
+    }
+
+    @Override
+    protected int setLayout() {
+        return R.layout.activity_commision;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+        titleView.setTitle("佣金明细");
+        initRecyclerView();
+        initViewpager();
+    }
+
+    /**
+     * 初始化RecyclerView
+     */
+    private void initRecyclerView() {
+        recyclerView.setLayoutManager(new GridLayoutManager(mActivity, 3));
+        menuAdapter = new OrderMenuAdapter();
+        recyclerView.setAdapter(menuAdapter);
+        recyclerView.addItemDecoration(new SpaceItemDecoration(3));
+        GallerySnapHelper snapHelper = new GallerySnapHelper();
+        snapHelper.attachToRecyclerView(recyclerView);
+        List<String> list = new ArrayList<>();
+        String[] strs = getResources().getStringArray(R.array.commision_list);
+        for (String a : strs) {
+            list.add(a);
+        }
+        menuAdapter.setNewData(list);
+        menuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                menuAdapter.setSelectItem(position);
+                viewpager.setCurrentItem(position);
+            }
+        });
+    }
+
+    /**
+     * 初始化Viewpager
+     */
+    private void initViewpager() {
+        mAdapter = new TabAdapter(getSupportFragmentManager(), getListFragment());
+        viewpager.setAdapter(mAdapter);
+        viewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                menuAdapter.setSelectItem(position);
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+        viewpager.setOffscreenPageLimit(mAdapter.getCount());
+        menuAdapter.setSelectItem(menuPosition);
+        viewpager.setCurrentItem(menuPosition);
+    }
+
+    private List<BaseFragment> getListFragment() {
+        List<BaseFragment> list = new ArrayList<>();
+        list.add(CommisionAllFragment.getInstance());
+        list.add(CommisionUnFinishFragment.getInstance());
+        list.add(CommisionFinishFragment.getInstance());
+        return list;
+    }
+}

plugin_wallet/src/main/java/com/xxrv/wallet/activity/ConsumeDetailActivity.java

+package com.xxrv.wallet.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.widget.LinearLayout;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.rv.config.RvFrameConfig;
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.presenter.MvpPresenter;
+import com.ruiwenliu.wrapper.weight.TitleView;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
+import com.rv.home.rv.module.ApiConfig;
+import com.rv.home.rv.module.basic.presenter.CommonPresenter;
+import com.xxrv.wallet.R;
+import com.xxrv.wallet.R2;
+import com.xxrv.wallet.adapter.ConsumeListAdapter;
+import com.xxrv.wallet.bean.ConsumeListBean;
+import com.yuyife.okgo.OkGoUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import butterknife.BindView;
+
+public class ConsumeDetailActivity extends BaseStatusActivity<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
+
+    @BindView(R2.id.recyclerView)
+    RecyclerView recyclerView;
+    @BindView(R2.id.refresh)
+    SimpleRefreshLayout refreshLayout;
+    private int currentPage = 1;
+    private int pageSize = 20;
+    private int pageTotal;
+
+    private ConsumeListAdapter adapter;
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+
+        if (requestType == 0) {
+            ConsumeListBean bean = (ConsumeListBean) result;
+            if (bean != null && bean.isRel() && bean.getData() != null) {
+                if (currentPage == 1) {
+                    pageTotal = bean.getData().getTotalPage();
+                    refreshLayout.onRefreshComplete();
+                    if (bean.getData().getData().size() == 0) {
+                        adapter.setEmptyView(getEmptyView(recyclerView, -1, getString(R.string.rv_select_not_data)));
+                        adapter.notifyDataSetChanged();
+                    } else {
+                        adapter.setNewData(bean.getData().getData());
+                    }
+                } else {
+                    adapter.addData(bean.getData().getData());
+                    adapter.loadMoreComplete();
+                }
+            }
+        }
+    }
+
+    @Override
+    protected int setLayout() {
+        return R.layout.activity_consume_detail;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+        titleView.setTitle("消费明细");
+        recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayout.VERTICAL, false));
+        adapter = new ConsumeListAdapter(new ArrayList<ConsumeListBean.ConsumeItem>());
+        adapter.setOnLoadMoreListener(this, recyclerView);
+        refreshLayout.setHeaderView(new SimpleRefreshView(this));
+        refreshLayout.setOnSimpleRefreshListener(this);
+        recyclerView.setAdapter(adapter);
+    }
+
+    @Override
+    protected void loadData(Bundle savedInstanceState, Intent intent) {
+        super.loadData(savedInstanceState, intent);
+        getConsumeData();
+    }
+
+    private void getConsumeData() {
+        if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
+            Map<String, Object> header = new HashMap<>();
+            header.put("Authorization", OkGoUtil.getToken());
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("pageNo", currentPage);
+            map.put("pageSize", pageSize);
+
+            mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_CONSUME_LIST, ConsumeListBean.class, map, header, true);
+        }
+    }
+
+    @Override
+    public void onLoadMoreRequested() {
+        if (currentPage >= pageTotal) {
+            adapter.loadMoreEnd();
+        } else {
+            currentPage++;
+            getConsumeData();
+        }
+    }
+
+    @Override
+    public void onRefresh() {
+        currentPage = 1;
+        getConsumeData();
+    }
+}

plugin_wallet/src/main/java/com/xxrv/wallet/activity/SetPayPwdActivity.java

+package com.xxrv.wallet.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.presenter.MvpPresenter;
+import com.ruiwenliu.wrapper.weight.TitleView;
+import com.xxrv.wallet.R;
+import com.xxrv.wallet.R2;
+
+import butterknife.BindView;
+
+public class SetPayPwdActivity extends BaseStatusActivity<MvpPresenter> {
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+
+    }
+
+    @Override
+    protected int setLayout() {
+        return R.layout.activity_set_pay_pwd;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+
+    }
+}

plugin_wallet/src/main/java/com/xxrv/wallet/activity/WalletActivity.java

@@ -57,11 +57,11 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
             //提现
 
         } else if (id == R.id.rl_item_consumer_details) {
-           //消费明细
-
+            startActivity(new Intent(getApplicationContext(), ConsumeDetailActivity.class));
+            //消费明细
         } else if (id == R.id.rl_item_commission_record) {
             //佣金记录
-
+            startActivity(new Intent(getApplicationContext(), CommissionDetailActivity.class));
         } else if (id == R.id.rl_item_withdrawals_record) {
             //提现记录
 

plugin_wallet/src/main/java/com/xxrv/wallet/adapter/ConsumeListAdapter.java

+package com.xxrv.wallet.adapter;
+
+import android.support.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.rv.component.utils.DateUtils;
+import com.xxrv.wallet.R;
+import com.xxrv.wallet.bean.ConsumeListBean;
+
+import java.util.List;
+
+public class ConsumeListAdapter extends BaseQuickAdapter<ConsumeListBean.ConsumeItem, BaseViewHolder> {
+    public ConsumeListAdapter(@Nullable List<ConsumeListBean.ConsumeItem> data) {
+        super(R.layout.item_consume, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, ConsumeListBean.ConsumeItem item) {
+        switch (item.getSource()) {
+            case 0:
+                helper.setText(R.id.tv_consume_name, "活动奖励金");
+                break;
+            case 1:
+                helper.setText(R.id.tv_consume_name, "佣金");
+                break;
+            case 2:
+                helper.setText(R.id.tv_consume_name, "会员充值");
+                break;
+            case 10:
+                helper.setText(R.id.tv_consume_name, "提现");
+                break;
+            case 11:
+                helper.setText(R.id.tv_consume_name, "转账");
+                break;
+            case 12:
+                helper.setText(R.id.tv_consume_name, "购买");
+                break;
+            default:
+                break;
+        }
+
+        helper.setText(R.id.tv_income_time, DateUtils.timestampToString1(item.getCrtTime()));
+        StringBuilder builder = new StringBuilder();
+        if (item.getItype() == 0) {
+            builder.append("+");
+        } else {
+            builder.append("-");
+        }
+        builder.append("￥").append(item.getAmount());
+        helper.setText(R.id.tv_amount, builder.toString());
+
+    }
+}

plugin_wallet/src/main/java/com/xxrv/wallet/adapter/IncomeListAdapter.java

+package com.xxrv.wallet.adapter;
+
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import com.base.utils.ui.image.round.RoundImageView;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.ruiwenliu.wrapper.util.glide.GlideManager;
+import com.rv.component.utils.DateUtils;
+import com.xxrv.wallet.R;
+import com.xxrv.wallet.bean.IncomeRecordsBean;
+
+import java.util.List;
+
+public class IncomeListAdapter extends BaseQuickAdapter<IncomeRecordsBean.IncomeItem, BaseViewHolder> {
+
+    public IncomeListAdapter(@Nullable List<IncomeRecordsBean.IncomeItem> data) {
+        super(R.layout.item_commision, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, IncomeRecordsBean.IncomeItem item) {
+        StringBuilder buffer = new StringBuilder();
+        buffer.append(dealName(item.getUsername())).append("成交").append(item.getPrice()).append("元");
+        helper.setText(R.id.tv_consume_name, buffer.toString());
+
+        helper.setText(R.id.tv_income_time, DateUtils.timestampToString1(item.getCrtTime()));
+
+        if (item.getWaiting() == 1) {
+            StringBuilder builder = new StringBuilder();
+            builder.append("+").append(item.getCommission()).append("元");
+            helper.setText(R.id.tv_amount, builder.toString());
+        } else {
+            helper.setText(R.id.tv_amount, "进行中");
+        }
+    }
+
+    private String dealName(String name) {
+        if (!TextUtils.isEmpty(name)) {
+            if (name.length() == 11) {
+                return name.substring(0, 3) + "****" + name.substring(7, name.length());
+            }
+        }
+        return name;
+    }
+}

plugin_wallet/src/main/java/com/xxrv/wallet/bean/ConsumeListBean.java

+package com.xxrv.wallet.bean;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/*********
+ * {"status":200,"message":"Success",
+ * "data":{"totalCount":1,"totalPage":1,"pageNum":1,"pageSize":1,
+ * "data":[{"id":2,"source":1,"itype":1,"amount":0.20,"crtTime":1562917112547}]},"rel":true}
+ */
+public class ConsumeListBean extends BaseBean {
+    private boolean rel;
+    private ConsumeList data;
+
+    public boolean isRel() {
+        return rel;
+    }
+
+    public void setRel(boolean rel) {
+        this.rel = rel;
+    }
+
+    public ConsumeList getData() {
+        return data;
+    }
+
+    public void setData(ConsumeList data) {
+        this.data = data;
+    }
+
+    public static class ConsumeList{
+        private int totalCount;
+        private int totalPage;
+        private int pageNum;
+        private int pageSize;
+
+        private List<ConsumeItem> data;
+
+        public int getTotalCount() {
+            return totalCount;
+        }
+
+        public void setTotalCount(int totalCount) {
+            this.totalCount = totalCount;
+        }
+
+        public int getTotalPage() {
+            return totalPage;
+        }
+
+        public void setTotalPage(int totalPage) {
+            this.totalPage = totalPage;
+        }
+
+        public int getPageNum() {
+            return pageNum;
+        }
+
+        public void setPageNum(int pageNum) {
+            this.pageNum = pageNum;
+        }
+
+        public int getPageSize() {
+            return pageSize;
+        }
+
+        public void setPageSize(int pageSize) {
+            this.pageSize = pageSize;
+        }
+
+        public List<ConsumeItem> getData() {
+            return data;
+        }
+
+        public void setData(List<ConsumeItem> data) {
+            this.data = data;
+        }
+    }
+
+    public static class ConsumeItem {
+        private BigDecimal amount;
+        private long crtTime;
+        private int id;
+        private int itype;
+        private int source;
+
+        public BigDecimal getAmount() {
+            return amount;
+        }
+
+        public void setAmount(BigDecimal amount) {
+            this.amount = amount;
+        }
+
+        public long getCrtTime() {
+            return crtTime;
+        }
+
+        public void setCrtTime(long crtTime) {
+            this.crtTime = crtTime;
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public int getItype() {
+            return itype;
+        }
+
+        public void setItype(int itype) {
+            this.itype = itype;
+        }
+
+        public int getSource() {
+            return source;
+        }
+
+        public void setSource(int source) {
+            this.source = source;
+        }
+    }
+}

plugin_wallet/src/main/java/com/xxrv/wallet/bean/IncomeRecordsBean.java

+package com.xxrv.wallet.bean;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class IncomeRecordsBean extends BaseBean {
+    private boolean rel;
+    private IncomeRecordData data;
+
+    public boolean isRel() {
+        return rel;
+    }
+
+    public void setRel(boolean rel) {
+        this.rel = rel;
+    }
+
+    public IncomeRecordData getData() {
+        return data;
+    }
+
+    public void setData(IncomeRecordData data) {
+        this.data = data;
+    }
+
+    public static class IncomeRecordData {
+        private BigDecimal totalIncome;
+        private List<IncomeItem> sellingWaters;
+        private int pageNum;
+        private int pageSize;
+        private int totalCount;
+        private int totalPage;
+
+        public int getPageNum() {
+            return pageNum;
+        }
+
+        public void setPageNum(int pageNum) {
+            this.pageNum = pageNum;
+        }
+
+        public int getPageSize() {
+            return pageSize;
+        }
+
+        public void setPageSize(int pageSize) {
+            this.pageSize = pageSize;
+        }
+
+        public int getTotalCount() {
+            return totalCount;
+        }
+
+        public void setTotalCount(int totalCount) {
+            this.totalCount = totalCount;
+        }
+
+        public int getTotalPage() {
+            return totalPage;
+        }
+
+        public void setTotalPage(int totalPage) {
+            this.totalPage = totalPage;
+        }
+
+        public BigDecimal getTotalIncome() {
+            return totalIncome;
+        }
+
+        public void setTotalIncome(BigDecimal totalIncome) {
+            this.totalIncome = totalIncome;
+        }
+
+        public List<IncomeItem> getSellingWaters() {
+            return sellingWaters;
+        }
+
+        public void setSellingWaters(List<IncomeItem> sellingWaters) {
+            this.sellingWaters = sellingWaters;
+        }
+    }
+
+    public static class IncomeItem {
+        private BigDecimal commission;
+        private long crtTime;
+        private int goodNumber;
+        private String headUrl;
+        private String img;
+        private String nickName;
+        private BigDecimal price;
+        private int status;
+        private String title;
+        private long updTime;
+        private String username;
+        private int waiting;
+
+        public BigDecimal getCommission() {
+            return commission;
+        }
+
+        public void setCommission(BigDecimal commission) {
+            this.commission = commission;
+        }
+
+        public long getCrtTime() {
+            return crtTime;
+        }
+
+        public void setCrtTime(long crtTime) {
+            this.crtTime = crtTime;
+        }
+
+        public int getGoodNumber() {
+            return goodNumber;
+        }
+
+        public void setGoodNumber(int goodNumber) {
+            this.goodNumber = goodNumber;
+        }
+
+        public String getHeadUrl() {
+            return headUrl;
+        }
+
+        public void setHeadUrl(String headUrl) {
+            this.headUrl = headUrl;
+        }
+
+        public String getImg() {
+            return img;
+        }
+
+        public void setImg(String img) {
+            this.img = img;
+        }
+
+        public String getNickName() {
+            return nickName;
+        }
+
+        public void setNickName(String nickName) {
+            this.nickName = nickName;
+        }
+
+        public BigDecimal getPrice() {
+            return price;
+        }
+
+        public void setPrice(BigDecimal price) {
+            this.price = price;
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public void setStatus(int status) {
+            this.status = status;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public long getUpdTime() {
+            return updTime;
+        }
+
+        public void setUpdTime(long updTime) {
+            this.updTime = updTime;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public void setUsername(String username) {
+            this.username = username;
+        }
+
+        public int getWaiting() {
+            return waiting;
+        }
+
+        public void setWaiting(int waiting) {
+            this.waiting = waiting;
+        }
+    }
+}

plugin_wallet/src/main/java/com/xxrv/wallet/fragment/CommisionAllFragment.java

+package com.xxrv.wallet.fragment;
+
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.widget.LinearLayout;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.rv.config.RvFrameConfig;
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseFragment;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
+import com.rv.home.rv.module.ApiConfig;
+import com.rv.home.rv.module.basic.presenter.CommonPresenter;
+import com.xxrv.wallet.R;
+import com.xxrv.wallet.R2;
+import com.xxrv.wallet.adapter.IncomeListAdapter;
+import com.xxrv.wallet.bean.IncomeRecordsBean;
+import com.yuyife.okgo.OkGoUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import butterknife.BindView;
+
+public class CommisionAllFragment extends BaseFragment<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
+
+    @BindView(R2.id.recyclerView)
+    RecyclerView recyclerView;
+    @BindView(R2.id.refresh)
+    SimpleRefreshLayout refreshLayout;
+
+    private IncomeListAdapter adapter;
+
+    private int currentPage = 1;
+    private int pageSize = 10;
+    private int pageTotal = 0;
+
+    public static CommisionAllFragment getInstance() {
+        CommisionAllFragment fragment = new CommisionAllFragment();
+        return fragment;
+    }
+
+    @Override
+    public int getViewLayout() {
+        return R.layout.fragment_income_record;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayout.VERTICAL, false));
+        adapter = new IncomeListAdapter(new ArrayList<IncomeRecordsBean.IncomeItem>());
+        adapter.setOnLoadMoreListener(this, recyclerView);
+        refreshLayout.setHeaderView(new SimpleRefreshView(getContext()));
+        refreshLayout.setOnSimpleRefreshListener(this);
+        recyclerView.setAdapter(adapter);
+    }
+
+    @Override
+    protected void loadData(Bundle savedInstanceState) {
+        getIncomeData();
+    }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+        if (requestType == 0) {
+            IncomeRecordsBean bean = (IncomeRecordsBean) result;
+            if (bean.isRel() && bean.getData() != null && bean.getData().getSellingWaters() != null) {
+                if (currentPage == 1) {
+                    pageTotal = bean.getData().getTotalPage();
+                    adapter.setNewData(bean.getData().getSellingWaters());
+                    refreshLayout.onRefreshComplete();
+                    if (bean.getData().getSellingWaters().size() == 0) {
+                        adapter.setEmptyView(getEmptyView(recyclerView, -1, getString(R.string.rv_select_not_data)));
+                        adapter.notifyDataSetChanged();
+                    }
+                } else {
+                    adapter.addData(bean.getData().getSellingWaters());
+                    adapter.loadMoreComplete();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onLoadMoreRequested() {
+        if (currentPage >= pageTotal) {
+            adapter.loadMoreEnd();
+        } else {
+            currentPage++;
+            getIncomeData();
+        }
+    }
+
+    @Override
+    public void onRefresh() {
+
+    }
+
+    private void getIncomeData() {
+        if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
+            Map<String, Object> header = new HashMap<>();
+            header.put("Authorization", OkGoUtil.getToken());
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("pageNo", currentPage);
+            map.put("pageSize", pageSize);
+            mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_INCOME_RECORD, IncomeRecordsBean.class, map, header, true);
+        }
+    }
+}

plugin_wallet/src/main/java/com/xxrv/wallet/fragment/CommisionFinishFragment.java

+package com.xxrv.wallet.fragment;
+
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.widget.LinearLayout;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.rv.config.RvFrameConfig;
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseFragment;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
+import com.rv.home.rv.module.ApiConfig;
+import com.rv.home.rv.module.basic.presenter.CommonPresenter;
+import com.xxrv.wallet.R;
+import com.xxrv.wallet.R2;
+import com.xxrv.wallet.adapter.IncomeListAdapter;
+import com.xxrv.wallet.bean.IncomeRecordsBean;
+import com.yuyife.okgo.OkGoUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import butterknife.BindView;
+
+public class CommisionFinishFragment extends BaseFragment<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
+
+    @BindView(R2.id.recyclerView)
+    RecyclerView recyclerView;
+    @BindView(R2.id.refresh)
+    SimpleRefreshLayout refreshLayout;
+
+    private IncomeListAdapter adapter;
+
+    private int currentPage = 1;
+    private int pageSize = 10;
+    private int pageTotal = 0;
+
+    public static CommisionFinishFragment getInstance() {
+        CommisionFinishFragment fragment = new CommisionFinishFragment();
+        return fragment;
+    }
+
+    @Override
+    public int getViewLayout() {
+        return R.layout.fragment_income_record;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayout.VERTICAL, false));
+        adapter = new IncomeListAdapter(new ArrayList<IncomeRecordsBean.IncomeItem>());
+        adapter.setOnLoadMoreListener(this, recyclerView);
+        refreshLayout.setHeaderView(new SimpleRefreshView(getContext()));
+        refreshLayout.setOnSimpleRefreshListener(this);
+        recyclerView.setAdapter(adapter);
+    }
+
+    @Override
+    protected void loadData(Bundle savedInstanceState) {
+        getIncomeData();
+    }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+        if (requestType == 0) {
+            IncomeRecordsBean bean = (IncomeRecordsBean) result;
+            if (bean.isRel() && bean.getData() != null && bean.getData().getSellingWaters() != null) {
+                if (currentPage == 1) {
+                    pageTotal = bean.getData().getTotalPage();
+                    adapter.setNewData(bean.getData().getSellingWaters());
+                    refreshLayout.onRefreshComplete();
+                    if (bean.getData().getSellingWaters().size() == 0) {
+                        adapter.setEmptyView(getEmptyView(recyclerView, -1, getString(R.string.rv_select_not_data)));
+                        adapter.notifyDataSetChanged();
+                    }
+                } else {
+                    adapter.addData(bean.getData().getSellingWaters());
+                    adapter.loadMoreComplete();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onLoadMoreRequested() {
+        if (currentPage >= pageTotal) {
+            adapter.loadMoreEnd();
+        } else {
+            currentPage++;
+            getIncomeData();
+        }
+    }
+
+    @Override
+    public void onRefresh() {
+        currentPage = 1;
+        getIncomeData();
+    }
+
+    private void getIncomeData() {
+        if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
+            Map<String, Object> header = new HashMap<>();
+            header.put("Authorization", OkGoUtil.getToken());
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("pageNo", currentPage);
+            map.put("pageSize", pageSize);
+            map.put("type", 1);
+            mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_INCOME_RECORD, IncomeRecordsBean.class, map, header, true);
+        }
+    }
+}

plugin_wallet/src/main/java/com/xxrv/wallet/fragment/CommisionUnFinishFragment.java

+package com.xxrv.wallet.fragment;
+
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.widget.LinearLayout;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.rv.config.RvFrameConfig;
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseFragment;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
+import com.rv.home.rv.module.ApiConfig;
+import com.rv.home.rv.module.basic.presenter.CommonPresenter;
+import com.xxrv.wallet.R;
+import com.xxrv.wallet.R2;
+import com.xxrv.wallet.adapter.IncomeListAdapter;
+import com.xxrv.wallet.bean.IncomeRecordsBean;
+import com.yuyife.okgo.OkGoUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import butterknife.BindView;
+
+public class CommisionUnFinishFragment extends BaseFragment<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
+
+    @BindView(R2.id.recyclerView)
+    RecyclerView recyclerView;
+    @BindView(R2.id.refresh)
+    SimpleRefreshLayout refreshLayout;
+
+    private IncomeListAdapter adapter;
+
+    private int currentPage = 1;
+    private int pageSize = 10;
+    private int pageTotal = 0;
+
+    public static CommisionUnFinishFragment getInstance() {
+        CommisionUnFinishFragment fragment = new CommisionUnFinishFragment();
+        return fragment;
+    }
+
+    @Override
+    public int getViewLayout() {
+        return R.layout.fragment_income_record;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayout.VERTICAL, false));
+        adapter = new IncomeListAdapter(new ArrayList<IncomeRecordsBean.IncomeItem>());
+        adapter.setOnLoadMoreListener(this, recyclerView);
+        refreshLayout.setHeaderView(new SimpleRefreshView(getContext()));
+        refreshLayout.setOnSimpleRefreshListener(this);
+        recyclerView.setAdapter(adapter);
+    }
+
+    @Override
+    protected void loadData(Bundle savedInstanceState) {
+        getIncomeData();
+    }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+        if (requestType == 0) {
+            IncomeRecordsBean bean = (IncomeRecordsBean) result;
+            if (bean.isRel() && bean.getData() != null && bean.getData().getSellingWaters() != null) {
+                if (currentPage == 1) {
+                    pageTotal = bean.getData().getTotalPage();
+                    adapter.setNewData(bean.getData().getSellingWaters());
+                    refreshLayout.onRefreshComplete();
+                    if (bean.getData().getSellingWaters().size() == 0) {
+                        adapter.setEmptyView(getEmptyView(recyclerView, -1, getString(R.string.rv_select_not_data)));
+                        adapter.notifyDataSetChanged();
+                    }
+                } else {
+                    adapter.addData(bean.getData().getSellingWaters());
+                    adapter.loadMoreComplete();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onLoadMoreRequested() {
+        if (currentPage >= pageTotal) {
+            adapter.loadMoreEnd();
+        } else {
+            currentPage++;
+            getIncomeData();
+        }
+    }
+
+    @Override
+    public void onRefresh() {
+        currentPage = 1;
+        getIncomeData();
+    }
+
+    private void getIncomeData() {
+        if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
+            Map<String, Object> header = new HashMap<>();
+            header.put("Authorization", OkGoUtil.getToken());
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("pageNo", currentPage);
+            map.put("pageSize", pageSize);
+            map.put("type", 0);
+            mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_INCOME_RECORD, IncomeRecordsBean.class, map, header, true);
+        }
+    }
+}

plugin_wallet/src/main/res/drawable/bg_next_btn_able.xml

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

plugin_wallet/src/main/res/drawable/bg_next_btn_unable.xml

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

plugin_wallet/src/main/res/drawable/bg_password_item.xml

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

plugin_wallet/src/main/res/layout/activity_commision.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:orientation="vertical"
+    tools:context=".activity.CommissionDetailActivity">
+
+    <include layout="@layout/common_line" />
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recyclerview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorWrite" />
+
+    <include layout="@layout/common_line" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file

plugin_wallet/src/main/res/layout/activity_consume_detail.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/common_line" />
+
+    <include layout="@layout/common_refresh" />
+
+</LinearLayout>

plugin_wallet/src/main/res/layout/activity_set_pay_pwd.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <include layout="@layout/common_line" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_50"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/size_20"
+        android:layout_marginRight="@dimen/dp_10"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/edt_phone"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/white"
+            android:gravity="left|center_vertical"
+            android:hint="请输入该账号注册的手机号"
+            android:imeOptions="actionSend"
+            android:inputType="phone"
+            android:textColorHint="@color/colorGray"
+            android:textSize="@dimen/sp_14" />
+
+        <ImageView
+            android:id="@+id/img_clear_phone"
+            android:layout_width="@dimen/size_30"
+            android:layout_height="@dimen/size_30"
+            android:layout_gravity="center_vertical"
+            android:padding="@dimen/dp_10" />
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginRight="@dimen/dp_10">
+
+        <include layout="@layout/common_line" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_50"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginRight="@dimen/dp_10"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/edt_identify_code"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/white"
+            android:gravity="left|center_vertical"
+            android:hint="请输入验证码"
+            android:imeOptions="actionDone"
+            android:inputType="number"
+            android:maxLength="6"
+            android:textColorHint="@color/colorGray"
+            android:textSize="@dimen/sp_14" />
+
+        <View
+            android:layout_width="0.1px"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:background="@color/colorLine" />
+
+        <Button
+            android:id="@+id/btn_send"
+            android:layout_width="@dimen/size_100"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            android:gravity="center"
+            android:text="发送验证码" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginRight="@dimen/dp_10">
+
+        <include layout="@layout/common_line" />
+    </RelativeLayout>
+
+    <Button
+        android:id="@+id/btn_next"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_40"
+        android:layout_marginLeft="@dimen/size_15"
+        android:layout_marginTop="@dimen/size_20"
+        android:layout_marginRight="@dimen/size_15"
+        android:background="@drawable/bg_next_btn_unable"
+        android:gravity="center"
+        android:text="下一步"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_16" />
+
+
+</LinearLayout>

plugin_wallet/src/main/res/layout/activity_set_pwd_pay_two.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <include layout="@layout/common_line" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_50"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/size_50"
+        android:layout_marginRight="@dimen/dp_10"
+        android:orientation="horizontal"
+        android:weightSum="6">
+
+        <EditText
+            android:id="@+id/edt_pwd1"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/size_50"
+            android:layout_weight="1"
+            android:background="@drawable/bg_password_item"
+            android:gravity="center"
+            android:inputType="numberPassword|textPassword"
+            android:text="1" />
+
+        <EditText
+            android:id="@+id/edt_pwd2"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/size_50"
+            android:layout_marginLeft="@dimen/size_8"
+            android:layout_weight="1"
+            android:background="@drawable/bg_password_item"
+            android:gravity="center"
+            android:inputType="numberPassword|textPassword" />
+
+        <EditText
+            android:id="@+id/edt_pwd3"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/size_50"
+            android:layout_marginLeft="@dimen/size_8"
+            android:layout_weight="1"
+            android:background="@drawable/bg_password_item"
+            android:gravity="center"
+            android:inputType="numberPassword|textPassword" />
+
+        <EditText
+            android:id="@+id/edt_pwd4"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/size_50"
+            android:layout_marginLeft="@dimen/size_8"
+            android:layout_weight="1"
+            android:background="@drawable/bg_password_item"
+            android:gravity="center"
+            android:inputType="numberPassword|textPassword" />
+
+        <EditText
+            android:id="@+id/edt_pwd5"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/size_50"
+            android:layout_marginLeft="@dimen/size_8"
+            android:layout_weight="1"
+            android:background="@drawable/bg_password_item"
+            android:gravity="center"
+            android:inputType="numberPassword|textPassword" />
+
+        <EditText
+            android:id="@+id/edt_pwd6"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/size_50"
+            android:layout_marginLeft="@dimen/size_8"
+            android:layout_weight="1"
+            android:background="@drawable/bg_password_item"
+            android:gravity="center"
+            android:inputType="numberPassword|textPassword" />
+    </LinearLayout>
+
+
+    <Button
+        android:id="@+id/btn_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_40"
+        android:layout_marginLeft="@dimen/size_15"
+        android:layout_marginTop="@dimen/size_30"
+        android:layout_marginRight="@dimen/size_15"
+        android:background="@drawable/bg_next_btn_unable"
+        android:gravity="center"
+        android:text="确定"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_16" />
+
+
+</LinearLayout>

plugin_wallet/src/main/res/layout/fragment_income_record.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="8dp"
+        android:background="@color/white" />
+
+    <include layout="@layout/common_refresh" />
+
+</LinearLayout>

plugin_wallet/src/main/res/layout/item_commision.xml

+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/size_60"
+    android:layout_marginLeft="@dimen/dp_10"
+    android:layout_marginRight="@dimen/dp_10"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="59dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/size_5"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_consume_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="11"
+                android:textSize="@dimen/sp_14" />
+
+            <TextView
+                android:id="@+id/tv_income_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="11"
+                android:textColor="@color/colorGray"
+                android:textSize="@dimen/text_10" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_amount"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:layout_marginRight="@dimen/text_10"
+            android:gravity="right|center_vertical"
+            android:text="11"
+            android:textColor="@color/gray_707070"
+            android:textSize="@dimen/sp_14" />
+    </LinearLayout>
+
+    <include layout="@layout/common_line" />
+
+
+</LinearLayout>

plugin_wallet/src/main/res/layout/item_consume.xml

+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/size_60"
+    android:layout_marginLeft="@dimen/dp_10"
+    android:layout_marginRight="@dimen/dp_10"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="59dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/size_5"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_consume_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="11"
+                android:textSize="@dimen/sp_14" />
+
+            <TextView
+                android:id="@+id/tv_income_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="11"
+                android:textColor="@color/colorGray"
+                android:textSize="@dimen/text_10" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_amount"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:layout_marginRight="@dimen/text_10"
+            android:gravity="right|center_vertical"
+            android:text="11"
+            android:textColor="@color/gray_707070"
+            android:textSize="@dimen/sp_14" />
+    </LinearLayout>
+
+    <include layout="@layout/common_line" />
+
+
+</LinearLayout>

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

 <resources>
     <string name="app_name">plugin_wallet</string>
+    <string-array name="commision_list">
+        <item>全部</item>
+        <item>未到账</item>
+        <item>已到账</item>
+    </string-array>
 </resources>