Skip to content

T
TangKuPos
Commit 4def2891 authored by 姜敏's avatar 姜敏
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 72f14335 6ad83c87
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1050 additions and 53 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ 4def2891
......@@ -294,6 +294,12 @@ public class C {
}
public final class RCTRACE {
private static final String ROOT_URL = PKG + "rctrace/";
public static final String query = ROOT_URL + "query";
}
public final class PSB {
private static final String ROOT_URL = PKG + "psb/";
public static final String autoAdd = ROOT_URL + "autoAdd";
......
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ 4def2891
......@@ -16,6 +16,7 @@ import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Ubound;
import com.xingdata.zzdpos.model.UsskuParam;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.UserStoreInfo;
import com.xingdata.zzdpos.ui.splash.SplashPresenter;
......@@ -255,11 +256,9 @@ public final class ApiFactory {
* @param pageSize
* @return
*/
public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList
(String orderStatus, int pageNulmber, int
public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(String orderStatus, int pageNulmber, int
pageSize, long startDate, long endDate) {
return Api.getInstance().service.getSaleOrder(orderStatus, pageNulmber, pageSize,
startDate,
return Api.getInstance().service.getSaleOrder(orderStatus, pageNulmber, pageSize, startDate,
endDate).onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
......@@ -739,9 +738,22 @@ public final class ApiFactory {
}
}
public static class Rctrace {
/**
* 查询充值记录
*/
public static Observable<Pager<VipRechargeOrder>> queryRecharge(int pageNum, int pageSize) {
return Api.getInstance().service.queryRecharge(pageNum, pageSize)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
}
public static class Sta {
/**
* /**
/**
* 查询统计详情
*/
public static Observable<com.xingdata.zzdpos.model.Sta> querySta() {
......
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ 4def2891
......@@ -29,6 +29,7 @@ import com.xingdata.zzdpos.model.Ussku;
import com.xingdata.zzdpos.model.UsskuParam;
import com.xingdata.zzdpos.model.Ver;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.UserStoreInfo;
......@@ -182,6 +183,10 @@ interface ApiService {
@POST(C.URL.STA.statistics)
Observable<HttpMessage<Sta>> querySta();
@POST(C.URL.RCTRACE.query)
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int pageNum, @Query
("pageSize") int pageSize);
@POST(C.URL.PSB.queryDetail)
Observable<HttpMessage<Psb>> queryPsbDetail(@Query("psbNo") String psbNo, @Query("id") long id);
......
app/src/main/java/com/xingdata/zzdpos/base/BaseFragment.java
View file @ 4def2891
......@@ -102,4 +102,9 @@ public abstract class BaseFragment<P extends BasePresenter, B extends ViewDataBi
super.onDetach();
KeyboardUtils.hideSoftInput(getActivity());
}
public String getTabTitle() {
return null;
}
}
app/src/main/java/com/xingdata/zzdpos/model/Vip.java
View file @ 4def2891
......@@ -14,13 +14,13 @@ public class Vip implements BaseBean {
@JSONField(serialize = false)
private boolean isDefaultVip;
@Ignore
private VipRechangeOrder rctrace;
private VipRechargeOrder rctrace;
public VipRechangeOrder getRctrace() {
public VipRechargeOrder getRctrace() {
return rctrace;
}
public void setRctrace(VipRechangeOrder rctrace) {
public void setRctrace(VipRechargeOrder rctrace) {
this.rctrace = rctrace;
}
......
app/src/main/java/com/xingdata/zzdpos/model/VipRechangeOrder.java → app/src/main/java/com/xingdata/zzdpos/model/VipRechargeOrder.java
View file @ 4def2891
......@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.model;
import com.xingdata.api.print.entity.BaseGoodPrint;
import com.xingdata.api.print.entity.BaseOrderPrint;
import com.xingdata.zzdpos.base.BaseBean;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
......@@ -11,7 +12,7 @@ import java.util.List;
* Created by Administrator on 2017/12/15.
*/
public class VipRechangeOrder implements BaseOrderPrint {
public class VipRechargeOrder implements BaseOrderPrint, BaseBean {
private Long cardAmtPay;
private Long cardAmtSend;
private Long rechangeBefore;
......@@ -95,21 +96,22 @@ public class VipRechangeOrder implements BaseOrderPrint {
@Override
public String getPayAmt() {
if (cardAmtSend!=null&&cardAmtSend!=0){
return ConvertUtil.fenToYuan(cardAmtPay,false)+"+"+ConvertUtil.fenToYuan(cardAmtSend,false);
}else {
return ConvertUtil.fenToYuan(cardAmtPay,false);
if (cardAmtSend != null && cardAmtSend != 0) {
return ConvertUtil.fenToYuan(cardAmtPay, false) + "+" + ConvertUtil.fenToYuan(cardAmtSend, false);
} else {
return ConvertUtil.fenToYuan(cardAmtPay, false);
}
}
@Override
public String getVip_money() {
return ConvertUtil.fenToYuan(getRechangeAfter(),false);
return ConvertUtil.fenToYuan(getRechangeAfter(), false);
}
@Override
public String getBalanceOld() {
return ConvertUtil.fenToYuan(getRechangeBefore(),false);
return ConvertUtil.fenToYuan(getRechangeBefore(), false);
}
@Override
......@@ -139,7 +141,7 @@ public class VipRechangeOrder implements BaseOrderPrint {
@Override
public String getUserName() {
return vipName+"("+vipMobile.substring(vipMobile.length()-4)+")";
return vipName + "(" + vipMobile.substring(vipMobile.length() - 4) + ")";
}
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @ 4def2891
......@@ -11,6 +11,7 @@ import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.ActivityMainBinding;
import com.xingdata.zzdpos.databinding.ItemMenuBottomBinding;
import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
......@@ -47,7 +48,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Override
public void initView() {
mPresenter.initHandoverInfo();
List<Fragment> fragments = new ArrayList<>();
List<BaseFragment> fragments = new ArrayList<>();
fragments.add(new CasherFragment());
fragments.add(new ServiceFragment());
fragments.add(new MyselfFragment());
......
app/src/main/java/com/xingdata/zzdpos/ui/main/adapter/FragmentViewAdapter.java
View file @ 4def2891
package com.xingdata.zzdpos.ui.main.adapter;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import com.xingdata.zzdpos.base.BaseFragment;
import java.util.List;
/**
......@@ -11,10 +14,10 @@ import java.util.List;
*/
public class FragmentViewAdapter extends FragmentPagerAdapter {
private List<Fragment> fragmentList;
private List<BaseFragment> fragmentList;
public FragmentViewAdapter(List<Fragment> fragmentList, FragmentManager fm) {
public FragmentViewAdapter(List<BaseFragment> fragmentList, FragmentManager fm) {
super(fm);
this.fragmentList = fragmentList;
......@@ -31,4 +34,12 @@ public class FragmentViewAdapter extends FragmentPagerAdapter {
}
@Nullable
@Override
public CharSequence getPageTitle(int position) {
if (fragmentList.get(position).getTabTitle() != null) {
return fragmentList.get(position).getTabTitle();
}
return super.getPageTitle(position);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java
View file @ 4def2891
......@@ -3,8 +3,10 @@ package com.xingdata.zzdpos.ui.main.fragment;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.widget.Toast;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
......@@ -55,7 +57,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
ActivityUtils.startActivity(getActivity(), FeedBackActivity.class);
break;
case C.MENU.MENU_UPDATE://升级
ToastUtils.showShort("已经是最新版本");
break;
case C.MENU.MENU_HELP://帮助
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsContract.java
View file @ 4def2891
......@@ -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.RechargeListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
/**
......@@ -14,7 +15,6 @@ import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
public interface StatisticsContract {
interface View extends BaseView {
/**
* 设置统计信息
......@@ -51,6 +51,10 @@ public interface StatisticsContract {
*/
public abstract void clickOrderList();
/**
* 获取充值列表
*/
public abstract void getRechargeList(int pageNumber, RechargeListFragment msListFragment);
/**
* 获取订单列表
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @ 4def2891
......@@ -7,14 +7,17 @@ import android.view.LayoutInflater;
import android.view.View;
import com.alibaba.fastjson.JSON;
import com.blankj.utilcode.util.ToastUtils;
import com.google.gson.Gson;
import com.xingdata.zzdpos.R;
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.ViewVipRechargeBinding;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.util.ConvertUtil;
......@@ -35,10 +38,14 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
private void initData() {
if (getIntent().getExtras() != null) {
Long data = getIntent().getLongExtra(Saleorder.class.getName(), -1);
VipRechargeOrder vipRechargeOrder = (VipRechargeOrder) getIntent().getSerializableExtra(VipRechargeOrder.class.getName());
if (data > 0) {
mPresenter.getOrderDetail(String.valueOf(data));
mViewBinding.icTitle.tvTitle.setText(R.string.statistics_order_detail_hint);
}
if (vipRechargeOrder != null) {
mViewBinding.icTitle.tvTitle.setText(R.string.statistics_vip_recharge_hint);
getVipRechargeOrderSuss(vipRechargeOrder);
}
}
......@@ -50,8 +57,22 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
super.onBackPressedSupport();
}
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.setVipName(vipRechargeOrder.getVipName());
viewVipRechargeBinding.setVipTel(vipRechargeOrder.getVipMobile());
viewVipRechargeBinding.setPayAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay(), false));
viewVipRechargeBinding.setSendAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtSend(), false));
}
@Override
public void getOrderDetailSuss(Saleorder mSaleorder) {
mViewBinding.viewOrderDetail.getViewStub().inflate();
ViewOrderDetailBinding viewOrderDetailBinding = DataBindingUtil.bind(mViewBinding.viewOrderDetail.getRoot());
viewOrderDetailBinding.tvAmt.setText(ConvertUtil.fenToYuan(mSaleorder.getOrderPayAmt(), true));
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java
View file @ 4def2891
......@@ -3,7 +3,7 @@ package com.xingdata.zzdpos.ui.statistics;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.RechargeListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
/**
......@@ -12,7 +12,7 @@ import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
public class StatisticsPresenter extends StatisticsContract.Presenter {
private int pageSize = 20;
private int nowPageSize = 20;
@Override
public void onAttached() {
......@@ -33,7 +33,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
@Override
public void getOrderList(int pageNumber, int pageSize, long startDate, long endDate, OrderListFragment fragment) {
ApiFactory.Test.getSaleOrderList("99",pageNumber, pageSize, startDate, endDate).doFinally(() -> {
ApiFactory.Test.getSaleOrderList("99", pageNumber, pageSize, startDate, endDate).doFinally(() -> {
})
.subscribe(orderlist -> {
......@@ -56,12 +56,22 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
}
public void getOrderList(int pageNumber, long startDate, long endDate, OrderListFragment fragment) {
getOrderList(pageNumber, pageSize, startDate, endDate, fragment);
getOrderList(pageNumber, nowPageSize, startDate, endDate, fragment);
}
@Override
public void getRechargeList(int pageNumber, RechargeListFragment msListFragment) {
ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize)
.subscribe(vipRechargeOrderPager -> {
msListFragment.setData(vipRechargeOrderPager, vipRechargeOrderPager.isFirstPage());
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
/**
* 状态，0：已完成，１：退货，7赊账，99：全部订单
......@@ -70,7 +80,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
*/
@Override
public void getSaleOrderList(String orderNo, int pageNumber, String wd) {
ApiFactory.Test.getSaleOrderList(pageNumber, pageSize, "99", orderNo, wd)
ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", orderNo, wd)
.subscribe(saleorderPager -> {
//判断是否能加载更多
if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsAdapter.java → app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsOrderAdapter.java
View file @ 4def2891
......@@ -16,10 +16,10 @@ import com.xingdata.zzdpos.model.Saleorder;
import java.util.List;
public class StatisticsAdapter extends BaseAdapter<Saleorder, ItemStatisticsBinding> {
public class StatisticsOrderAdapter extends BaseAdapter<Saleorder, ItemStatisticsBinding> {
public StatisticsAdapter(@Nullable List<Saleorder> data) {
public StatisticsOrderAdapter(@Nullable List<Saleorder> data) {
super(R.layout.item_statistics, data);
}
......@@ -32,7 +32,7 @@ public class StatisticsAdapter extends BaseAdapter<Saleorder, ItemStatisticsBind
}else {
mViewBinding.tvLeftTop.setText(item.getOrderNo());
}
mViewBinding.tvRightTop.setText("+"+item.getPayAmt());
mViewBinding.tvLeftBottom.setText(TimeUtils.millis2String(item.getCreateTime()));
switch (item.getPayType()){
case C.PAY_CHANNEL.CASH:
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsRechargeAdapter.java 0 → 100644
View file @ 4def2891
package com.xingdata.zzdpos.ui.statistics.adapter;
import android.support.annotation.Nullable;
import android.util.TimeUtils;
import android.view.View;
import android.view.ViewGroup;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemStatisticsBinding;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.List;
public class StatisticsRechargeAdapter extends BaseAdapter<VipRechargeOrder, ItemStatisticsBinding> {
public StatisticsRechargeAdapter(@Nullable List<VipRechargeOrder> data) {
super(R.layout.item_statistics, data);
}
@Override
protected void convert(ItemStatisticsBinding mViewBinding, VipRechargeOrder item) {
mViewBinding.tvLeftTop.setText(item.getUserName());
mViewBinding.tvLeftBottom.setText(com.blankj.utilcode.util.TimeUtils.millis2String(item.getCreateTime()));
mViewBinding.tvRightTop.setText("+"+ ConvertUtil.fenToYuan(item.getCardAmtPay(),false));
}
@Override
protected View getItemView(int layoutResId, ViewGroup parent) {
return super.getItemView(layoutResId, parent);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java
View file @ 4def2891
......@@ -12,6 +12,7 @@ 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;
......@@ -21,6 +22,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
private int fragmentMenu;
private OrderMainFragment mOrderMainFragment = new OrderMainFragment();
private OrderSearchFragment mOrderSearchFragment = new OrderSearchFragment();
private MsMainFragment mMsMainFragment = new MsMainFragment();
@Override
public int getLayoutId() {
......@@ -62,12 +64,14 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
break;
case C.MENU.MENU_STATISTICS_MS:
FragmentUtils.add(getChildFragmentManager(), mMsMainFragment, mViewBinding.mainFrame.getId(), false, true);
mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.tvTitle.setText(R.string.menu_ms);
mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
break;
}
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/GaveTicketListFragment.java 0 → 100644
View file @ 4def2891
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 0 → 100644
View file @ 4def2891
package com.xingdata.zzdpos.ui.statistics.fragment.ms;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMsMainBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBinding> {
private FragmentViewAdapter mFragmentStateAdapter;
private List<Long> dateLongs = new ArrayList<>();
private List<BaseFragment> fragments = new ArrayList<>();
private int month;
@Override
public int getLayoutId() {
return R.layout.fragment_ms_main;
}
@Override
public void initView() {
Calendar calendar = Calendar.getInstance();
//获得当前时间的月份，月份从0开始所以结果要加1
month = calendar.get(Calendar.MONTH) + 1;
initViewPager();
}
public void initViewPager() {
if (fragments.size() == 0) {
fragments.add(new RechargeListFragment());
fragments.add(new GaveTicketListFragment());
fragments.add(new UsedTicketListFragment());
mFragmentStateAdapter = new FragmentViewAdapter(fragments, getChildFragmentManager());
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
} else {
mFragmentStateAdapter = new FragmentViewAdapter(fragments, getChildFragmentManager());
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
new android.os.Handler().postDelayed(new Runnable() {
@Override
public void run() {
mViewBinding.viewPagerData.setCurrentItem(0, false);
}
}, 1);
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/RechargeListFragment.java 0 → 100644
View file @ 4def2891
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.VipRechargeOrder;
import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeAdapter;
import java.util.ArrayList;
public class RechargeListFragment extends BaseFragment<StatisticsPresenter, FragmentMsListBinding> {
private StatisticsRechargeAdapter mStatisticsRechargeAdapter;
private int pagerNum;
@Override
public int getLayoutId() {
return R.layout.fragment_ms_list;
}
@Override
public void initView() {
pagerNum = 1;
if (mStatisticsRechargeAdapter == null) {
mStatisticsRechargeAdapter = new StatisticsRechargeAdapter(new ArrayList<>());
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsRechargeAdapter);
} else {
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsRechargeAdapter);
}
mStatisticsRechargeAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
intent.putExtra(VipRechargeOrder.class.getName(), mStatisticsRechargeAdapter.getData().get(position));
ActivityUtils.startActivity(intent);
}
});
mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
mStatisticsRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
mPresenter.getRechargeList(pagerNum, this);
}
private void onRefresh() {
pagerNum = 1;
mPresenter.getRechargeList(pagerNum, this);
}
private void onLoadMore() {
pagerNum++;
mPresenter.getRechargeList(pagerNum, this);
}
/**
* 设置数据
*
* @param pager 数据
* @param isRefresh 是否刷新
*/
public void setData(Pager<VipRechargeOrder> pager, boolean isRefresh) {
if (isRefresh) {
mStatisticsRechargeAdapter.setEnableLoadMore(true);
mViewBinding.srlProduct.setRefreshing(false);
}
if (isRefresh) mStatisticsRechargeAdapter.setNewData(pager.getList());
else if (pager.getList().size() > 0) mStatisticsRechargeAdapter.addData(pager.getList());
if (pager.isLastPage()) mStatisticsRechargeAdapter.loadMoreEnd(isRefresh);
else mStatisticsRechargeAdapter.loadMoreComplete();
if (mStatisticsRechargeAdapter.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/statistics/fragment/ms/UsedTicketListFragment.java 0 → 100644
View file @ 4def2891
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;
public class UsedTicketListFragment 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/order/OrderListFragment.java
View file @ 4def2891
......@@ -19,7 +19,8 @@ import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsAdapter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
......@@ -28,7 +29,7 @@ import java.util.List;
public class OrderListFragment extends BaseFragment<StatisticsPresenter, FragmentOrderListBinding> {
private StatisticsAdapter mStatisticsAdapter;
private StatisticsOrderAdapter mStatisticsAdapter;
private Long monthDateStart;
private Long monthDateEnd;
private int pagerNum ;
......@@ -68,7 +69,7 @@ public class OrderListFragment extends BaseFragment<StatisticsPresenter, Fragmen
mViewBinding.tvEmpty.setText(R.string.statistics_search_empty);
if (mStatisticsAdapter == null) {
mStatisticsAdapter = new StatisticsAdapter(new ArrayList<>());
mStatisticsAdapter = new StatisticsOrderAdapter(new ArrayList<>());
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderSearchFragment.java
View file @ 4def2891
......@@ -11,7 +11,7 @@ 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.adapter.StatisticsAdapter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderAdapter;
import java.util.ArrayList;
......@@ -19,7 +19,7 @@ import java.util.List;
public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, FragmentOrderSearchBinding> {
private StatisticsAdapter mStatisticsAdapter;
private StatisticsOrderAdapter mStatisticsAdapter;
private Pager<Saleorder> saleorders;
private int pagerNum = 1;
private String wd = "";
......@@ -34,7 +34,7 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
public void initView() {
if (mStatisticsAdapter == null) {
mStatisticsAdapter = new StatisticsAdapter(new ArrayList<>());
mStatisticsAdapter = new StatisticsOrderAdapter(new ArrayList<>());
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
} else {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipRechargeAdapter.java
View file @ 4def2891
......@@ -5,10 +5,8 @@ import android.support.annotation.Nullable;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemVipListItemBinding;
import com.xingdata.zzdpos.databinding.ItemVipRechargeItemBinding;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechangeOrder;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import java.util.List;
......@@ -16,15 +14,15 @@ import java.util.List;
* Created by JM_DEV on 2017/12/25.
*/
public class VipRechargeAdapter extends BaseAdapter<VipRechangeOrder, ItemVipRechargeItemBinding> {
public class VipRechargeAdapter extends BaseAdapter<VipRechargeOrder, ItemVipRechargeItemBinding> {
private Context mContext;
public VipRechargeAdapter(Context mContext, @Nullable List<VipRechangeOrder> data) {
public VipRechargeAdapter(Context mContext, @Nullable List<VipRechargeOrder> data) {
super(R.layout.item_vip_recharge_item, data);
this.mContext=mContext;
}
@Override
protected void convert(ItemVipRechargeItemBinding mViewBinding, VipRechangeOrder item) {
protected void convert(ItemVipRechargeItemBinding mViewBinding, VipRechargeOrder item) {
// mViewBinding.vipName.setText(item.getVipName());
// mViewBinding.vipMobile.setText(String.valueOf(item.getVipMobile()));
// mViewBinding.vipDiscount.setText(String.valueOf(item.getVipDefDiscount()));
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @ 4def2891
......@@ -12,9 +12,10 @@ 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.model.VipRechangeOrder;
import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
......@@ -27,7 +28,7 @@ import java.util.List;
*/
public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
private VipRechargeAdapter vipRechargeAdapter;
private List<VipRechangeOrder> orders = new ArrayList<>();
private List<VipRechargeOrder> orders = new ArrayList<>();
@Override
public int getLayoutId() {
......
app/src/main/res/layout/activity_main.xml
View file @ 4def2891
......@@ -11,7 +11,6 @@
<android.support.design.widget.TabLayout
android:id="@+id/tab_layout"
style="@style/Base.Widget.Design.TabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
......
app/src/main/res/layout/activity_statistics_detail.xml
View file @ 4def2891
......@@ -28,6 +28,11 @@
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" />
</FrameLayout>
<LinearLayout
......@@ -38,7 +43,6 @@
android:background="@color/white_caocao"
android:elevation="@dimen/view_line_L2"
android:orientation="horizontal"
android:weightSum="2"
app:layout_constraintBottom_toBottomOf="parent">
<Button
......
app/src/main/res/layout/fragment_ms_list.xml 0 → 100644
View file @ 4def2891
<layout>
<data>
<import type="android.view.View" />
</data>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
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.38" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/srl_product"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="@dimen/all_padding"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/statistics_recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
<LinearLayout
android:id="@+id/ll_empty"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white_caocao"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/srl_product"
app:layout_constraintEnd_toEndOf="@id/srl_product"
app:layout_constraintStart_toStartOf="@id/srl_product"
app:layout_constraintTop_toTopOf="@id/srl_product">
<TextView
android:id="@+id/tv_empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/all_margin"
android:drawableTop="@mipmap/nong"
android:gravity="center"
android:lineSpacingExtra="@dimen/all_padding"
android:textColor="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_ms_main.xml 0 → 100644
View file @ 4def2891
<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/gray_zhouyu"
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.38" />
<android.support.design.widget.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="33dp"
android:background="@color/white_caocao"
app:layout_constraintTop_toTopOf="parent"
app:tabIndicatorColor="@color/red_lvzhi"
app:tabIndicatorHeight="@dimen/view_line_L2">
</android.support.design.widget.TabLayout>
<android.support.v4.view.ViewPager
android:id="@+id/viewPager_data"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/gray"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tab_layout">
</android.support.v4.view.ViewPager>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_order_main.xml
View file @ 4def2891
......@@ -17,11 +17,11 @@
app:layout_constraintGuide_percent="0.38" />
<android.support.design.widget.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="30dp"
android:background="@color/white_caocao"
app:layout_constraintTop_toTopOf="parent"
app:tabIndicatorHeight="0dp"
app:tabMinWidth="100dp"
......
app/src/main/res/layout/view_order_detail.xml
View file @ 4def2891
......@@ -302,14 +302,90 @@
android:background="@color/gray_zhouyu" />
<LinearLayout
android:padding="@dimen/dp_4"
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:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:visibility="gone">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
<TextView
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:maxLines="2"
android:text="品名"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="5"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tv_count"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:text="数量"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_name"
app:layout_constraintRight_toLeftOf="@+id/tv_price"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_initial_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/gray"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/tv_price"
app:layout_constraintLeft_toRightOf="@+id/tv_count"
app:layout_constraintRight_toLeftOf="@+id/tv_amt1"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/tv_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:text="单价"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_count"
app:layout_constraintRight_toLeftOf="@+id/tv_amt1"
app:layout_constraintTop_toBottomOf="@id/tv_initial_price" />
<TextView
android:id="@+id/tv_amt1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:text="小计"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_price"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/view_vip_recharge.xml 0 → 100644
View file @ 4def2891
This diff is collapsed.
app/src/main/res/values/strings.xml
View file @ 4def2891
......@@ -610,6 +610,7 @@
<string name="statistics_search_empty">没有查询到订单~</string>
<string name="statistics_order_edit_hint">请输入单号</string>
<string name="statistics_order_detail_hint">订单详情</string>
<string name="statistics_vip_recharge_hint">充值记录</string>
<!--商品详情POS-->
<string name="oder_detail_date">交易时间:</string>
<string name="oder_detail_no">订单号:</string>
......
app/src/main/res/values/styles.xml
View file @ 4def2891
......@@ -334,11 +334,7 @@
<item name="android:textColorHint">@color/hint</item>
</style>
<style name="Base.Widget.Design.TabLayout" parent="android:Widget">
<item name="tabBackground">@color/white_caocao</item>
<item name="tabIndicatorColor">#FFF</item>
<item name="tabIndicatorHeight">0dp</item>
</style>
<style name="button" parent="view_base">
<item name=" android:background">@drawable/red_border</item>
......
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