Skip to content

T
TangKuPos
Commit e1e3a298 authored by 陈前's avatar 陈前
Browse files
Options

时间控件

parent 6ad83c87
Show whitespace changes
Inline Side-by-side
Showing with 674 additions and 232 deletions
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ e1e3a298
......@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.model.Gbound;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.NewSssku;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Ubound;
import com.xingdata.zzdpos.model.UsskuParam;
......@@ -581,6 +582,14 @@ public final class ApiFactory {
.retryWhen(new RetryHelper(3));
}
public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int size,int usedFlag) {
return Api.getInstance().service.queryTicket(num, size,usedFlag).
onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public static Observable<String> batchSend(String birthdayType, String vipLevel, Long
vipId, Long truleId) {
return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId, truleId)
......@@ -753,7 +762,7 @@ public final class ApiFactory {
public static class Sta {
/**
/**
* /**
* 查询统计详情
*/
public static Observable<com.xingdata.zzdpos.model.Sta> querySta() {
......@@ -871,8 +880,8 @@ public final class ApiFactory {
.retryWhen(new RetryHelper(3));
}
public static Observable<Pager<Vip>> getVipList(int pageNumber,String vipLevel) {
return Api.getInstance().service.getVipList(vipLevel,pageNumber, 12)
public static Observable<Pager<Vip>> getVipList(int pageNumber, String vipLevel) {
return Api.getInstance().service.getVipList(vipLevel, pageNumber, 12)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
......
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ e1e3a298
......@@ -209,6 +209,10 @@ interface ApiService {
@POST(C.URL.TICKET.query)
Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("vipId") Long vipId);
@POST(C.URL.TICKET.query)
Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
("pageSize") int pageSize,@Query("usedFlag") int usedFlag);
@POST(C.URL.TICKET.ticketBatchSend)
Observable<HttpMessage<String>> ticketBatchSend(@Query("birthdayType") String birthdayType,
@Query("vipLevel") String vipLevel,
......
app/src/main/java/com/xingdata/zzdpos/model/Ticket.java
View file @ e1e3a298
package com.xingdata.zzdpos.model;
import com.xingdata.zzdpos.base.BaseBean;
import java.util.Date;
public class Ticket {
public class Ticket implements BaseBean {
private boolean isSelected;
......
app/src/main/java/com/xingdata/zzdpos/model/VipRechargeOrder.java
View file @ e1e3a298
......@@ -15,6 +15,7 @@ import java.util.List;
public class VipRechargeOrder implements BaseOrderPrint, BaseBean {
private Long cardAmtPay;
private Long cardAmtSend;
private String orderNo;
private Long rechangeBefore;
private Long rechangeAfter;
private String vipName;
......@@ -62,6 +63,10 @@ public class VipRechargeOrder implements BaseOrderPrint, BaseBean {
this.rctraceNo = rctraceNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public String getVipMobile() {
return vipMobile;
}
......@@ -126,6 +131,9 @@ public class VipRechargeOrder implements BaseOrderPrint, BaseBean {
@Override
public String getOrderNo() {
if (orderNo != null && orderNo.length() != 0) {
return orderNo;
}
return rctraceNo;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsActivity.java
View file @ e1e3a298
......@@ -15,12 +15,13 @@ import com.xingdata.zzdpos.databinding.ActivityStatisticsBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsDateFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsTitleFragment;
public class StatisticsActivity extends BaseActivity<StatisticsPresenter, ActivityStatisticsBinding> implements StatisticsContract.View {
private StatisticsDateFragment mStatisticsDateFragment = new StatisticsDateFragment();
private StatisticsFragment mStatisticsFragment = new StatisticsFragment();
private StatisticsTitleFragment mStatisticsTitleFragment = new StatisticsTitleFragment();
......@@ -57,8 +58,10 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
mStatisticsTitleFragment.searchSuc(saleorderPager, wd);
}
@Override
public void showDateFragment() {
FragmentUtils.add(getSupportFragmentManager(), mStatisticsDateFragment, mViewBinding.fragmentContainer.getId(), false, true);
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsContract.java
View file @ e1e3a298
......@@ -5,6 +5,7 @@ import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.UsedTicketListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.RechargeListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
......@@ -26,6 +27,11 @@ public interface StatisticsContract {
*/
void showOrderListFragment();
/**
* 跳转日期搜索
*/
void showDateFragment();
/**
* 跳转营销页
*/
......@@ -40,7 +46,10 @@ public interface StatisticsContract {
}
abstract class Presenter extends BasePresenter<View> {
/**
* 跳转日期搜索
*/
public abstract void clickDate();
/**
* 跳转营销页
*/
......@@ -56,6 +65,11 @@ public interface StatisticsContract {
*/
public abstract void getRechargeList(int pageNumber, RechargeListFragment msListFragment);
/**
* 获取已发优惠券列表
*/
public abstract void getTicketList(int pageNumber, UsedTicketListFragment msListFragment);
/**
* 获取订单列表
*/
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @ e1e3a298
......@@ -14,11 +14,14 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityStatisticsDetailBinding;
import com.xingdata.zzdpos.databinding.ItemSettleSaledetailBinding;
import com.xingdata.zzdpos.databinding.ViewOrderDetailBinding;
import com.xingdata.zzdpos.databinding.ViewTicketBinding;
import com.xingdata.zzdpos.databinding.ViewVipRechargeBinding;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPresenter, ActivityStatisticsDetailBinding> implements StatisticsDetailContract.View {
......@@ -31,6 +34,12 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
@Override
public void initView() {
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
finish();
}
});
initData();
}
......@@ -39,6 +48,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
if (getIntent().getExtras() != null) {
Long data = getIntent().getLongExtra(Saleorder.class.getName(), -1);
VipRechargeOrder vipRechargeOrder = (VipRechargeOrder) getIntent().getSerializableExtra(VipRechargeOrder.class.getName());
Ticket ticket = (Ticket) getIntent().getSerializableExtra(Ticket.class.getName());
if (data > 0) {
mPresenter.getOrderDetail(String.valueOf(data));
mViewBinding.icTitle.tvTitle.setText(R.string.statistics_order_detail_hint);
......@@ -47,23 +57,36 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
mViewBinding.icTitle.tvTitle.setText(R.string.statistics_vip_recharge_hint);
getVipRechargeOrderSuss(vipRechargeOrder);
}
if (ticket != null) {
mViewBinding.icTitle.tvTitle.setText(R.string.statistics_used_ticket_hint);
getTicketSuss(ticket);
}
}
}
@Override
public void onBackPressedSupport() {
super.onBackPressedSupport();
}
private void getTicketSuss(Ticket ticket) {
mViewBinding.llBottom.setVisibility(View.GONE);
mViewBinding.viewTicket.getViewStub().inflate();
ViewTicketBinding viewTicketBinding = DataBindingUtil.bind(mViewBinding.viewTicket.getRoot());
viewTicketBinding.tvAmt.setText(ConvertUtil.fenToYuan(ticket.getTicketValAmt(), true));
viewTicketBinding.setDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket.getUpdateTime()));
viewTicketBinding.setOrderNo(ticket.getUseOrderNo());
}
private void getVipRechargeOrderSuss(VipRechargeOrder vipRechargeOrder) {
mViewBinding.btnConfirm.setVisibility(View.GONE);
mViewBinding.viewVipRecharge.getViewStub().inflate();
ViewVipRechargeBinding viewVipRechargeBinding = DataBindingUtil.bind(mViewBinding.viewVipRecharge.getRoot());
viewVipRechargeBinding.tvAmt.setText(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay() + vipRechargeOrder.getCardAmtSend(), true));
viewVipRechargeBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(vipRechargeOrder.getCreateTime()));
viewVipRechargeBinding.setOrderNo(vipRechargeOrder.getRctraceNo());
viewVipRechargeBinding.setOrderNo(vipRechargeOrder.getOrderNo());
viewVipRechargeBinding.setVipName(vipRechargeOrder.getVipName());
viewVipRechargeBinding.setVipTel(vipRechargeOrder.getVipMobile());
viewVipRechargeBinding.setPayAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay(), false));
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java
View file @ e1e3a298
......@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.statistics;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.UsedTicketListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.RechargeListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
......@@ -19,6 +20,10 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
}
@Override
public void clickDate() {
mView.showDateFragment();
}
@Override
public void clickMs() {
......@@ -64,10 +69,17 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
public void getRechargeList(int pageNumber, RechargeListFragment msListFragment) {
ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize)
.subscribe(vipRechargeOrderPager -> {
msListFragment.setData(vipRechargeOrderPager, vipRechargeOrderPager.isFirstPage());
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void getTicketList(int pageNumber, UsedTicketListFragment msListFragment) {
ApiFactory.Ticket.query(pageNumber, nowPageSize, 1)
.subscribe(ticketPager -> {
msListFragment.setData(ticketPager, ticketPager.isFirstPage());
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsTicketAdapter.java 0 → 100644
View file @ e1e3a298
package com.xingdata.zzdpos.ui.statistics.adapter;
import android.support.annotation.Nullable;
import android.view.View;
import android.view.ViewGroup;
import com.blankj.utilcode.util.TimeUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemStatisticsBinding;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.List;
public class StatisticsTicketAdapter extends BaseAdapter<Ticket, ItemStatisticsBinding> {
public StatisticsTicketAdapter(@Nullable List<Ticket> data) {
super(R.layout.item_statistics, data);
}
@Override
protected void convert(ItemStatisticsBinding mViewBinding, Ticket item) {
mViewBinding.tvLeftTop.setText(ConvertUtil.fenToYuanNoZero(item.getTicketValAmt())+"元优惠券");
mViewBinding.tvLeftBottom.setText(TimeUtils.date2String(item.getCreateTime()));
}
@Override
protected View getItemView(int layoutResId, ViewGroup parent) {
return super.getItemView(layoutResId, parent);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsDateFragment.java 0 → 100644
View file @ e1e3a298
package com.xingdata.zzdpos.ui.statistics.fragment;
import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.View;
import android.widget.DatePicker;
import android.widget.TextView;
import com.blankj.utilcode.util.FragmentUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentStatisticsDateBinding;
import com.xingdata.zzdpos.databinding.FragmentStatisticsTitleBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.MsMainFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderMainFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderSearchFragment;
import com.xingdata.zzdpos.util.OnClickListener;
import com.xingdata.zzdpos.util.StringUtil;
import java.text.SimpleDateFormat;
public class StatisticsDateFragment extends BaseFragment<StatisticsPresenter, FragmentStatisticsDateBinding> {
private float textSize;
private View.OnFocusChangeListener mOnFocusChangeListener;
private View.OnClickListener mOnClickListener;
@Override
public int getLayoutId() {
return R.layout.fragment_statistics_date;
}
@Override
public void initView() {
initListener();
textSize = mViewBinding.editStart.getTextSize();
mViewBinding.editStart.setOnFocusChangeListener(mOnFocusChangeListener);
mViewBinding.editEnd.setOnFocusChangeListener(mOnFocusChangeListener);
mViewBinding.editStart.setOnClickListener(mOnClickListener);
mViewBinding.editEnd.setOnClickListener(mOnClickListener);
mViewBinding.editStart.setText(StringUtil.monthStart());
mViewBinding.editEnd.setText(TimeUtils.millis2String(System.currentTimeMillis(), new SimpleDateFormat(StringUtil.defaultDatePattern)));
String[] strings = mViewBinding.editStart.getText().toString().split("-");
mViewBinding.datePicker.setMaxDate(System.currentTimeMillis());
mViewBinding.datePicker.init(Integer.valueOf(strings[0]), Integer.valueOf(strings[1]) - 1, Integer.valueOf(strings[2]), new DatePicker.OnDateChangedListener() {
@Override
public void onDateChanged(DatePicker datePicker, int i, int i1, int i2) {
String month = String.valueOf(i1 + 1).length() >= 2 ? String.valueOf(i1 + 1) : "0" + String.valueOf(i1 + 1);
String day = String.valueOf(i2).length() >= 2 ? String.valueOf(i2) : "0" + String.valueOf(i2);
if (mViewBinding.editStart.isFocused()) {
mViewBinding.editStart.setText(i + "-" + month + "-" + day);
} else if (mViewBinding.editEnd.isFocused()) {
mViewBinding.editEnd.setText(i + "-" + month + "-" + day);
}
}
});
// mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
// @Override
// protected void myOnClickListener(View v) {
// if (mViewBinding.icTitle.edTitle.isFocused()) {
// mViewBinding.icTitle.edTitle.clearFocus();
// return;
// }
// if (mOrderSearchFragment.isAdded()) {
// FragmentUtils.remove(mOrderSearchFragment);
// return;
// }
// pop();
// }
// });
}
private void initListener() {
mOnFocusChangeListener = new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View view, boolean b) {
if (b) {
((TextView) view).setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize + 5);
((TextView) view).setTextColor(getResources().getColor(R.color.red_guanyu));
String[] strings = ((TextView) view).getText().toString().split("-");
mViewBinding.datePicker.updateDate(Integer.valueOf(strings[0]), Integer.valueOf(strings[1]), Integer.valueOf(strings[2]));
} else {
((TextView) view).setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
((TextView) view).setTextColor(getResources().getColor(R.color.gray_kongming));
}
}
};
mOnClickListener = new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
if (v.isFocused()) {
} else {
v.setFocusable(true);
v.setFocusableInTouchMode(true);
v.requestFocus();
}
}
};
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java
View file @ e1e3a298
......@@ -59,7 +59,12 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
return false;
});
mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
mPresenter.clickDate();
}
});
break;
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/GaveTicketListFragment.java deleted 100644 → 0
View file @ 6ad83c87
package com.xingdata.zzdpos.ui.statistics.fragment.ms;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMsListBinding;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeAdapter;
public class GaveTicketListFragment extends BaseFragment<StatisticsPresenter, FragmentMsListBinding> {
private int pagerNum;
@Override
public int getLayoutId() {
return R.layout.fragment_ms_list;
}
@Override
public void initView() {
// pagerNum=1;
// Calendar calendar = Calendar.getInstance();
////获得当前时间的月份，月份从0开始所以结果要加1
// int monthNow = calendar.get(Calendar.MONTH) + 1;
// calendar.setTimeInMillis(monthDateStart);
// int monthStart = calendar.get(Calendar.MONTH) + 1;
// if (monthStart == monthNow) {
// mViewBinding.setMonth("本月");
// } else {
// mViewBinding.setMonth(monthStart + "月");
// }
// mViewBinding.setAmt("收入：￥230.00");
// mViewBinding.llTitle.setOnClickListener(new OnClickListener() {
// @Override
// protected void myOnClickListener(View v) {
// pop();
// }
// });
// mViewBinding.tvEmpty.setText(R.string.statistics_search_empty);
//
// if (mStatisticsAdapter == null) {
// mStatisticsAdapter = new StatisticsAdapter(new ArrayList<>());
// mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
// mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
//
// } else {
// mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
// mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
// }
//
// mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
// @Override
// public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
// intent.putExtra(Saleorder.class.getName(), mStatisticsAdapter.getData().get(position).getId());
// ActivityUtils.startActivity(intent);
// }
// });
//
// mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
// mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
//
// mPresenter.getOrderList(pagerNum, monthDateStart, monthDateEnd, this);
}
// private void onRefresh() {
// pagerNum = 1;
// mPresenter.getOrderList(pagerNum, monthDateStart, monthDateEnd, this);
// }
//
// private void onLoadMore() {
// pagerNum++;
// mPresenter.getOrderList(pagerNum, monthDateStart, monthDateEnd, this);
// }
// /**
// * 设置数据
// *
// * @param pager 数据
// * @param isRefresh 是否刷新
// */
// public void setData(Pager<Saleorder> pager, boolean isRefresh) {
// if (isRefresh) {
// mStatisticsAdapter.setEnableLoadMore(true);
// mViewBinding.srlProduct.setRefreshing(false);
// }
// if (isRefresh) mStatisticsAdapter.setNewData(pager.getList());
// else if (pager.getList().size() > 0) mStatisticsAdapter.addData(pager.getList());
// if (pager.isLastPage()) mStatisticsAdapter.loadMoreEnd(isRefresh);
// else mStatisticsAdapter.loadMoreComplete();
//
// if (mStatisticsAdapter.getData().size() == 0) {
// mViewBinding.llEmpty.setVisibility(View.VISIBLE);
// mViewBinding.statisticsRecycler.setVisibility(View.GONE);
// } else {
// mViewBinding.llEmpty.setVisibility(View.GONE);
// mViewBinding.statisticsRecycler.setVisibility(View.VISIBLE);
// }
// }
public void setRechargeData() {
}
@Override
public String getTabTitle() {
return "已发优惠券";
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/MsMainFragment.java
View file @ e1e3a298
......@@ -37,7 +37,6 @@ public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBi
public void initViewPager() {
if (fragments.size() == 0) {
fragments.add(new RechargeListFragment());
fragments.add(new GaveTicketListFragment());
fragments.add(new UsedTicketListFragment());
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/RechargeListFragment.java
View file @ e1e3a298
......@@ -33,7 +33,7 @@ public class RechargeListFragment extends BaseFragment<StatisticsPresenter, Frag
public void initView() {
pagerNum = 1;
mViewBinding.tvEmpty.setText(R.string.statistics_search_empty_recharge);
if (mStatisticsRechargeAdapter == null) {
mStatisticsRechargeAdapter = new StatisticsRechargeAdapter(new ArrayList<>());
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/UsedTicketListFragment.java
View file @ e1e3a298
package com.xingdata.zzdpos.ui.statistics.fragment.ms;
import android.content.Intent;
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.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMsListBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsTicketAdapter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsTicketAdapter;
import java.util.ArrayList;
public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, FragmentMsListBinding> {
private StatisticsTicketAdapter mStatisticsTicketAdapter;
private int pagerNum;
@Override
public int getLayoutId() {
return R.layout.fragment_ms_list;
......@@ -21,97 +33,75 @@ public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, Fr
@Override
public void initView() {
pagerNum = 1;
mViewBinding.tvEmpty.setText(R.string.statistics_search_empty_ticket);
if (mStatisticsTicketAdapter == null) {
mStatisticsTicketAdapter = new StatisticsTicketAdapter(new ArrayList<>());
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsTicketAdapter);
} else {
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsTicketAdapter);
}
mStatisticsTicketAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
intent.putExtra(Ticket.class.getName(), mStatisticsTicketAdapter.getData().get(position));
ActivityUtils.startActivity(intent);
}
});
// pagerNum=1;
// Calendar calendar = Calendar.getInstance();
////获得当前时间的月份，月份从0开始所以结果要加1
// int monthNow = calendar.get(Calendar.MONTH) + 1;
// calendar.setTimeInMillis(monthDateStart);
// int monthStart = calendar.get(Calendar.MONTH) + 1;
// if (monthStart == monthNow) {
// mViewBinding.setMonth("本月");
// } else {
// mViewBinding.setMonth(monthStart + "月");
// }
// mViewBinding.setAmt("收入：￥230.00");
// mViewBinding.llTitle.setOnClickListener(new OnClickListener() {
// @Override
// protected void myOnClickListener(View v) {
// pop();
// }
// });
// mViewBinding.tvEmpty.setText(R.string.statistics_search_empty);
//
// if (mStatisticsAdapter == null) {
// mStatisticsAdapter = new StatisticsAdapter(new ArrayList<>());
// mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
// mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
//
// } else {
// mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
// mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
// }
//
// mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
// @Override
// public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
// intent.putExtra(Saleorder.class.getName(), mStatisticsAdapter.getData().get(position).getId());
// ActivityUtils.startActivity(intent);
// }
// });
//
// mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
// mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
//
// mPresenter.getOrderList(pagerNum, monthDateStart, monthDateEnd, this);
mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
mStatisticsTicketAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
mPresenter.getTicketList(pagerNum, this);
}
// private void onRefresh() {
// pagerNum = 1;
// mPresenter.getOrderList(pagerNum, monthDateStart, monthDateEnd, this);
// }
//
// private void onLoadMore() {
// pagerNum++;
// mPresenter.getOrderList(pagerNum, monthDateStart, monthDateEnd, this);
// }
// /**
// * 设置数据
// *
// * @param pager 数据
// * @param isRefresh 是否刷新
// */
// public void setData(Pager<Saleorder> pager, boolean isRefresh) {
// if (isRefresh) {
// mStatisticsAdapter.setEnableLoadMore(true);
// mViewBinding.srlProduct.setRefreshing(false);
// }
// if (isRefresh) mStatisticsAdapter.setNewData(pager.getList());
// else if (pager.getList().size() > 0) mStatisticsAdapter.addData(pager.getList());
// if (pager.isLastPage()) mStatisticsAdapter.loadMoreEnd(isRefresh);
// else mStatisticsAdapter.loadMoreComplete();
//
// if (mStatisticsAdapter.getData().size() == 0) {
// mViewBinding.llEmpty.setVisibility(View.VISIBLE);
// mViewBinding.statisticsRecycler.setVisibility(View.GONE);
// } else {
// mViewBinding.llEmpty.setVisibility(View.GONE);
// mViewBinding.statisticsRecycler.setVisibility(View.VISIBLE);
// }
// }
public void setRechargeData() {
private void onRefresh() {
pagerNum = 1;
mPresenter.getTicketList(pagerNum, this);
}
private void onLoadMore() {
pagerNum++;
mPresenter.getTicketList(pagerNum, this);
}
/**
* 设置数据
*
* @param pager 数据
* @param isRefresh 是否刷新
*/
public void setData(Pager<Ticket> pager, boolean isRefresh) {
if (isRefresh) {
mStatisticsTicketAdapter.setEnableLoadMore(true);
mViewBinding.srlProduct.setRefreshing(false);
}
if (isRefresh) mStatisticsTicketAdapter.setNewData(pager.getList());
else if (pager.getList().size() > 0) mStatisticsTicketAdapter.addData(pager.getList());
if (pager.isLastPage()) mStatisticsTicketAdapter.loadMoreEnd(isRefresh);
else mStatisticsTicketAdapter.loadMoreComplete();
if (mStatisticsTicketAdapter.getData().size() == 0) {
mViewBinding.llEmpty.setVisibility(View.VISIBLE);
mViewBinding.statisticsRecycler.setVisibility(View.GONE);
} else {
mViewBinding.llEmpty.setVisibility(View.GONE);
mViewBinding.statisticsRecycler.setVisibility(View.VISIBLE);
}
}
@Override
public String getTabTitle() {
return "核销优惠券";
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipExpenseListFragment.java
View file @ e1e3a298
......@@ -10,8 +10,8 @@ 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.FragmentVipinfoBinding;
import com.xingdata.zzdpos.model.VipRechangeOrder;
import com.xingdata.zzdpos.databinding.FragmentVipExpenseListBinding;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
......@@ -22,9 +22,9 @@ import java.util.List;
/**
* 会员消费记录
*/
public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentVipinfoBinding> {
public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentVipExpenseListBinding> {
private VipRechargeAdapter vipRechargeAdapter;
private List<VipRechangeOrder> orders = new ArrayList<>();
private List<VipRechargeOrder> orders = new ArrayList<>();
@Override
public int getLayoutId() {
......@@ -41,7 +41,7 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
mViewBinding.infoTitle.popMenu.setOnClickListener(view ->{
mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
new VipEditMenuDialog().show((BaseActivity) getActivity());
});
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
......@@ -51,7 +51,7 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
}
private void onLoadMore() {
vipRechargeAdapter.addData(new VipRechangeOrder());
vipRechargeAdapter.addData(new VipRechargeOrder());
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.loadMoreComplete();
ToastUtils.showShort("刷新成功");
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @ e1e3a298
......@@ -11,12 +11,10 @@ import com.bigkoo.pickerview.OptionsPickerView;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipinfoBinding;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
......
app/src/main/java/com/xingdata/zzdpos/util/OnClickListener.java
View file @ e1e3a298
......@@ -17,7 +17,7 @@ public abstract class OnClickListener implements View.OnClickListener {
mExitTime = System.currentTimeMillis();
myOnClickListener(view);
} else {
ToastUtils.showLong("您操作太快了");
// ToastUtils.showLong("您操作太快了");
}
}
......
app/src/main/res/drawable-v24/frame_bottom_guanyu_bg.xml 0 → 100644
View file @ e1e3a298
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- This is the main color -->
<item>
<shape>
<!-- 边框颜色 -->
<solid android:color="@color/red_guanyu"/>
</shape>
</item>
<!-- 给View的上 左 右设置8dp的边框 -->
<item android:bottom="2dp" >
<shape>
<!-- View填充颜色 -->
<solid android:color="#FFFFFF" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable-v24/frame_bottom_kongming_bg.xml 0 → 100644
View file @ e1e3a298
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- This is the main color -->
<item>
<shape>
<!-- 边框颜色 -->
<solid android:color="@color/gray_kongming"/>
</shape>
</item>
<!-- 给View的上 左 右设置8dp的边框 -->
<item android:bottom="2dp" >
<shape>
<!-- View填充颜色 -->
<solid android:color="#FFFFFF" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/textview_frame_bottom_textcolor_selector.xml 0 → 100644
View file @ e1e3a298
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/frame_bottom_guanyu_bg" android:state_focused="true" />
<item android:drawable="@drawable/frame_bottom_kongming_bg" android:state_focused="false" />
</selector>
\ No newline at end of file
app/src/main/res/layout/activity_statistics_detail.xml
View file @ e1e3a298
......@@ -28,11 +28,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/view_order_detail" />
<ViewStub
android:id="@+id/view_vip_recharge"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/view_vip_recharge" />
<ViewStub
android:id="@+id/view_ticket"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/view_ticket" />
</FrameLayout>
<LinearLayout
......
app/src/main/res/layout/fragment_statistics_date.xml 0 → 100644
View file @ e1e3a298
<layout>
<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"
android:background="@color/white_caocao"
tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragmfragment_integral_indexyout -->
<android.support.constraint.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.20" />
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:elevation="@dimen/view_line_L2">
<TextView
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="取消"
android:textColor="@color/red_guanyu"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="选择时间"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/big_text_size" />
<TextView
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="完成"
android:textColor="@color/red_guanyu"
app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout>
<TextView
android:id="@+id/tv_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding"
android:gravity="center"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"
android:text="至"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/guideline" />
<TextView
android:id="@+id/edit_start"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding"
android:background="@drawable/textview_frame_bottom_textcolor_selector"
android:gravity="center"
android:padding="@dimen/all_padding"
app:layout_constraintBottom_toBottomOf="@id/tv_center"
app:layout_constraintEnd_toStartOf="@id/tv_center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_center" />
<TextView
android:id="@+id/edit_end"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding"
android:background="@drawable/textview_frame_bottom_textcolor_selector"
android:gravity="center"
android:padding="@dimen/all_padding"
app:layout_constraintBottom_toBottomOf="@id/tv_center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_center"
app:layout_constraintTop_toTopOf="@id/tv_center" />
<DatePicker
android:id="@+id/date_picker"
style="@android:style/Theme.Holo.Light.NoActionBar.TranslucentDecor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin_big"
android:calendarViewShown="false"
android:datePickerMode="spinner"
android:spinnersShown="true"
app:layout_constraintTop_toTopOf="@id/tv_center">
</DatePicker>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/title_order.xml
View file @ e1e3a298
......@@ -77,7 +77,8 @@
android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent"
android:background="@color/transparent"
android:visibility="gone"
android:visibility="visible"
android:src="@mipmap/ic_dates"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
......
app/src/main/res/layout/view_ticket.xml 0 → 100644
View file @ e1e3a298
<?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="date"
type="String" />
<variable
name="orderNo"
type="String" />
</data>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:padding="@dimen/dp_4">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<TextView
android:id="@+id/tv_amt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:singleLine="true"
android:text="￥9999"
android:textColor="@color/red900"
android:textSize="@dimen/all_text_size_big"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_amt_hint" />
<TextView
android:id="@+id/tv_amt_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_margin"
android:text="优惠券面值"
android:textColor="@color/black_baozheng"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/view1"
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_zhouyu"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_amt" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/view1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding"
android:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:weightSum="2">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/ticket_detail_date"
android:textSize="@dimen/small_text_size" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/ticket_detail_no"
android:textSize="@dimen/small_text_size" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical">
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:singleLine="true"
android:text="@{date}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:singleLine="true"
android:text="@{orderNo}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1"
android:background="@color/gray_zhouyu" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1"
android:background="@color/gray_zhouyu" />
<LinearLayout
android:id="@+id/ll_goods_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_padding"
android:orientation="vertical"
android:padding="@dimen/dp_4"
android:visibility="gone">
</LinearLayout>
</LinearLayout>
</ScrollView>
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</FrameLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ e1e3a298
......@@ -608,9 +608,12 @@
<string name="statistics_todayRecharge_hint">今日充值</string>
<string name="statistics_todayVipAdd_hint">今日新增会员</string>
<string name="statistics_search_empty">没有查询到订单~</string>
<string name="statistics_search_empty_recharge">没有查询到充值记录~</string>
<string name="statistics_search_empty_ticket">没有查询到相关优惠券~</string>
<string name="statistics_order_edit_hint">请输入单号</string>
<string name="statistics_order_detail_hint">订单详情</string>
<string name="statistics_vip_recharge_hint">充值记录</string>
<string name="statistics_used_ticket_hint">充值记录</string>
<!--商品详情POS-->
<string name="oder_detail_date">交易时间:</string>
<string name="oder_detail_no">订单号:</string>
......@@ -620,6 +623,7 @@
<string name="oder_detail_discountAmt">优惠金额:</string>
<string name="oder_detail_SumAmt">合计金额:</string>
<string name="oder_detail_cutAmt">抹零金额:</string>
<string name="ticket_detail_date">使用时间:</string>
<string name="ticket_detail_no">销售单号:</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment