Skip to content

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

一键补货

parent d0c4b973
Hide whitespace changes
Inline Side-by-side
Showing with 1051 additions and 1097 deletions
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/ReplenishmentActivity.java
View file @ 2aba1a2e
...@@ -5,17 +5,19 @@ import com.blankj.utilcode.util.KeyboardUtils; ...@@ -5,17 +5,19 @@ import com.blankj.utilcode.util.KeyboardUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityReplenishmentBinding; import com.xingdata.zzdpos.databinding.ActivityReplenishmentBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Psb; import com.xingdata.zzdpos.model.Psb;
import com.xingdata.zzdpos.model.Sssku; import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentDetailFragment;
import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentFragment; import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentFragment;
import java.util.List; import java.util.List;
public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ActivityReplenishmentBinding> implements ReplenishmentContract.View { public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ActivityReplenishmentBinding> implements ReplenishmentContract.View {
private ReplenishmentFragment mReplenishmentFragment = new ReplenishmentFragment(); private ReplenishmentFragment mReplenishmentFragment = new ReplenishmentFragment();
// private ReplenishmentDetailFragment mReplenishmentDetailFragment = new ReplenishmentDetailFragment(); private ReplenishmentDetailFragment mReplenishmentDetailFragment = new ReplenishmentDetailFragment();
private boolean isAllowFragment = true; private boolean isAllowFragment = true;
LoadingDialog mLoadingDialog = new LoadingDialog(); LoadingDialog mLoadingDialog = new LoadingDialog();
...@@ -26,7 +28,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ...@@ -26,7 +28,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
@Override @Override
public void initView() { public void initView() {
loadRootFragment(R.id.f_bottom, mReplenishmentFragment, true, false); mPresenter.queryPsbList();
} }
...@@ -39,16 +41,22 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ...@@ -39,16 +41,22 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
@Override @Override
public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C) { public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C) {
mReplenishmentFragment.showReplenishmentList(A, B, C); if (mReplenishmentFragment.isAdded()){
mReplenishmentFragment.showReplenishmentList(A, B, C,false);
}else {
mReplenishmentFragment.showReplenishmentList(A, B, C,true);
loadRootFragment(R.id.f_bottom, mReplenishmentFragment, true, false);
}
} }
@Override @Override
public void openReplenishmentDetailFragment(List<Sssku> ssskuList) { public void openReplenishmentDetailFragment(List<Sssku> ssskuList) {
// if (isAllowFragment) { if (isAllowFragment) {
// isAllowFragment = false; isAllowFragment = false;
// mReplenishmentDetailFragment.setSsskuList(ssskuList); mReplenishmentDetailFragment.setSsskuList(ssskuList);
// start(mReplenishmentDetailFragment); start(mReplenishmentDetailFragment);
// } }
} }
...@@ -84,4 +92,6 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ...@@ -84,4 +92,6 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
public void isAllowFragment(Boolean is) { public void isAllowFragment(Boolean is) {
isAllowFragment = is; isAllowFragment = is;
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/ReplenishmentPresenter.java
View file @ 2aba1a2e
...@@ -24,8 +24,6 @@ public class ReplenishmentPresenter extends ReplenishmentContract.Presenter { ...@@ -24,8 +24,6 @@ public class ReplenishmentPresenter extends ReplenishmentContract.Presenter {
} }
@Override @Override
public void clickAdd() { public void clickAdd() {
mView.isShowLoading(true); mView.isShowLoading(true);
...@@ -42,10 +40,12 @@ public class ReplenishmentPresenter extends ReplenishmentContract.Presenter { ...@@ -42,10 +40,12 @@ public class ReplenishmentPresenter extends ReplenishmentContract.Presenter {
@Override @Override
public void queryPsbList() { public void queryPsbList() {
mView.isShowLoading(true);
unConfirmedPsbList.clear(); unConfirmedPsbList.clear();
unReceivePsbList.clear(); unReceivePsbList.clear();
finishedPsbList.clear(); finishedPsbList.clear();
ApiFactory.Psb.queryPsb(1, 200).doFinally(() -> { ApiFactory.Psb.queryPsb(1, 200).doFinally(() -> {
mView.isShowLoading(false);
}) })
.subscribe(psbPager -> { .subscribe(psbPager -> {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/adpter/ReplenishmentDetailAdapter.java
View file @ 2aba1a2e
//package com.xingdata.zzdpos.ui.manage.replenishment.adpter; package com.xingdata.zzdpos.ui.manage.replenishment.adpter;
//
//
//import android.support.annotation.Nullable; import android.support.annotation.Nullable;
//import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
//import android.text.Editable; import android.text.Editable;
//import android.text.TextWatcher; import android.text.TextWatcher;
//import android.view.View; import android.view.View;
//import android.view.ViewGroup; import android.view.ViewGroup;
//import android.widget.EditText; import android.widget.EditText;
//
//
//import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
//import com.xingdata.zzdpos.model.Sssku; import com.xingdata.zzdpos.base.BaseAdapter;
//import com.xingdata.zzdpos.util.ConvertUtil; import com.xingdata.zzdpos.base.BaseViewHolder;
// import com.xingdata.zzdpos.databinding.ItemReplenishmentDetailBinding;
//import java.util.List; import com.xingdata.zzdpos.model.Sssku;
// import com.xingdata.zzdpos.util.ConvertUtil;
//public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenishmentDetailBinding> {
// private Boolean isTouch = true; import java.util.List;
// private UpdatePriceListener mUpdatePriceListener;
// public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenishmentDetailBinding> {
// public ReplenishmentDetailAdapter(@Nullable List<Sssku> data, boolean Touch) { private Boolean isTouch = true;
// super(R.layout.item_replenishment_detail, data); private UpdatePriceListener mUpdatePriceListener;
// isTouch = Touch;
// public ReplenishmentDetailAdapter(@Nullable List<Sssku> data, boolean Touch) {
// } super(R.layout.item_replenishment_detail, data);
// isTouch = Touch;
//
// @Override }
// protected void convert(ItemReplenishmentDetailBinding mViewBinding, Sssku item) {
// mViewBinding.imgGoods.setImageURI(item.getSpuImg());
// mViewBinding.tvGoodsName.setText(item.getSpuName()); @Override
// mViewBinding.tvGoodsCode.setText(item.getSpuBarcode() + ""); protected void convert(ItemReplenishmentDetailBinding mViewBinding, Sssku item) {
// mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName()); mViewBinding.imgGoods.setImageURI(item.getSpuImg());
// mViewBinding.tvGoodsPrice.setText(ConvertUtil.fenToYuan(item.getSkuCost(), false)); mViewBinding.tvGoodsName.setText(item.getSpuName());
// mViewBinding.tvStock.setText(item.getSkuStock() + ""); mViewBinding.tvGoodsCode.setText(item.getSpuBarcode() + "");
// if (item.getSkuCnt() != null) { mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
// mViewBinding.etCount.setText(item.getSkuCnt() + ""); mViewBinding.tvGoodsPrice.setText(ConvertUtil.fenToYuan(item.getSkuCost(), false));
// } else { mViewBinding.tvStock.setText(item.getSkuStock() + "");
// item.setSkuCnt(1); if (item.getSkuCnt() != null) {
// } mViewBinding.etCount.setText(item.getSkuCnt() + "");
// } else {
// if (!isTouch) { item.setSkuCnt(1);
// mViewBinding.etCount.setEnabled(false); }
// mViewBinding.etCount.setTextColor(ContextCompat.getColor(mContext,R.color.white_cargo));
// mViewBinding.btnDown.setVisibility(View.GONE); if (!isTouch) {
// mViewBinding.btnUp.setVisibility(View.GONE); mViewBinding.etCount.setEnabled(false);
// } mViewBinding.etCount.setTextColor(ContextCompat.getColor(mContext, R.color.white_cargo));
// } mViewBinding.btnDown.setVisibility(View.GONE);
// mViewBinding.btnUp.setVisibility(View.GONE);
// }
// @Override }
// protected void convert(BaseViewHolder helper, Sssku item) {
//
// if (isTouch) { @Override
// helper.getView(R.id.btn_up).setOnClickListener(v -> { protected void convert(BaseViewHolder helper, Sssku item) {
// Integer sellCount = item.getSkuCnt();
// if (sellCount >= 0 && sellCount < 9999) { if (isTouch) {
// helper.setText(R.id.et_count, String.valueOf(++sellCount)); helper.getView(R.id.btn_up).setOnClickListener(v -> {
// item.setSkuCnt(sellCount); Integer sellCount = item.getSkuCnt();
//// mUpdatePriceListener.updatePrice(1L*(item.getSkuCost())); if (sellCount >= 0 && sellCount < 9999) {
// } helper.setText(R.id.et_count, String.valueOf(++sellCount));
// }); item.setSkuCnt(sellCount);
// helper.getView(R.id.btn_down).setOnClickListener(v -> { // mUpdatePriceListener.updatePrice(1L*(item.getSkuCost()));
// Integer sellCount = item.getSkuCnt(); }
// if (sellCount == 1) { });
// return; helper.getView(R.id.btn_down).setOnClickListener(v -> {
// } Integer sellCount = item.getSkuCnt();
// if (sellCount > 1 && sellCount <= 9999) { if (sellCount == 1) {
// helper.setText(R.id.et_count, String.valueOf(--sellCount)); return;
// item.setSkuCnt(sellCount); }
//// mUpdatePriceListener.updatePrice(-1L*(item.getSkuCost())); if (sellCount > 1 && sellCount <= 9999) {
// helper.setText(R.id.et_count, String.valueOf(--sellCount));
// } item.setSkuCnt(sellCount);
// }); // mUpdatePriceListener.updatePrice(-1L*(item.getSkuCost()));
// ((EditText) helper.getView(R.id.et_count)).addTextChangedListener((new TextWatcher() {
// }
// @Override });
// public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { ((EditText) helper.getView(R.id.et_count)).addTextChangedListener((new TextWatcher() {
//
// } @Override
// public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
// @Override
// public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
// Integer sellCount = ((EditText) helper.getView(R.id.et_count)).getText().toString().length() == 0 ? 1 : Integer.valueOf(((EditText) helper.getView(R.id.et_count)).getText().toString());
// if (sellCount==0){ @Override
// sellCount=1; public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
// helper.setText(R.id.et_count,""); Integer sellCount = ((EditText) helper.getView(R.id.et_count)).getText().toString().length() == 0 ? 1 : Integer.valueOf(((EditText) helper.getView(R.id.et_count)).getText().toString());
// if (sellCount == 0) {
// } sellCount = 1;
// Integer changedNum = sellCount - item.getSkuCnt(); helper.setText(R.id.et_count, "");
// item.setSkuCnt(sellCount);
// mUpdatePriceListener.updatePrice(item.getSkuCost() * changedNum); }
// } Integer changedNum = sellCount - item.getSkuCnt();
// item.setSkuCnt(sellCount);
// @Override mUpdatePriceListener.updatePrice(item.getSkuCost() * changedNum);
// public void afterTextChanged(Editable editable) { }
// }
// @Override
// public void afterTextChanged(Editable editable) {
// })); }
// }
// super.convert(helper, item);
// } }));
// }
// @Override super.convert(helper, item);
// protected View getItemView(int layoutResId, ViewGroup parent) { }
// return super.getItemView(layoutResId, parent);
// }
//
// public void setmUpdatePriceListener(UpdatePriceListener updatePriceListener) {
// public void setmUpdatePriceListener(UpdatePriceListener updatePriceListener) { this.mUpdatePriceListener = updatePriceListener;
// this.mUpdatePriceListener = updatePriceListener; }
// }
//
// public abstract static class UpdatePriceListener {
// public abstract static class UpdatePriceListener {
// public abstract void updatePrice(long amt);
// public abstract void updatePrice(long amt); }
// }
// }
//}
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentDetailFragment.java
View file @ 2aba1a2e
//package com.xingdata.zzdpos.ui.manage.replenishment.fragment; package com.xingdata.zzdpos.ui.manage.replenishment.fragment;
//
//
//import android.annotation.SuppressLint; import android.annotation.SuppressLint;
//import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
//import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
//import android.view.KeyEvent; import android.view.KeyEvent;
//import android.view.View; import android.view.View;
//import android.widget.TextView; import android.widget.TextView;
//
//import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.KeyboardUtils;
//import com.blankj.utilcode.util.TimeUtils; import com.blankj.utilcode.util.TimeUtils;
//import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
//import com.xingdata.api.print.ZX_PrintPOS; import com.xingdata.api.print.ZX_PrintPOS;
//import com.xingdata.zzdhd.R; import com.xingdata.zzdpos.R;
//import com.xingdata.zzdhd.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
//import com.xingdata.zzdhd.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
//import com.xingdata.zzdhd.databinding.FragmentReplenishementDetailBinding; import com.xingdata.zzdpos.databinding.FragmentReplenishementDetailBinding;
//import com.xingdata.zzdhd.model.Psb; import com.xingdata.zzdpos.model.Psb;
//import com.xingdata.zzdhd.model.Sssku; import com.xingdata.zzdpos.model.Sssku;
//import com.xingdata.zzdhd.ui.dialog.PromptDialog; import com.xingdata.zzdpos.ui.dialog.PromptDialog;
//import com.xingdata.zzdhd.ui.login.LoginPresenter; import com.xingdata.zzdpos.ui.login.LoginPresenter;
//import com.xingdata.zzdhd.ui.manager.replenishment.ReplenishmentPresenter; import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentPresenter;
//import com.xingdata.zzdhd.ui.manager.replenishment.adpter.ReplenishmentDetailAdapter; import com.xingdata.zzdpos.ui.manage.replenishment.adpter.ReplenishmentDetailAdapter;
//import com.xingdata.zzdhd.util.ConvertUtil; import com.xingdata.zzdpos.util.ConvertUtil;
//import com.xingdata.zzdhd.util.OnClickListener;
//
//import java.util.ArrayList; import java.util.ArrayList;
//import java.util.List; import java.util.List;
//import java.util.regex.Matcher; import java.util.regex.Matcher;
//import java.util.regex.Pattern; import java.util.regex.Pattern;
//
//
///** /**
// * Created by Administrator on 2017/11/24. * Created by Administrator on 2017/11/24.
// */ */
//
//public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPresenter, FragmentReplenishementDetailBinding> { public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPresenter, FragmentReplenishementDetailBinding> {
//
// private ReplenishmentDetailAdapter mReplenishmentDetailAdapter; private ReplenishmentDetailAdapter mReplenishmentDetailAdapter;
// private List<Sssku> ssskuList = new ArrayList<>(); private List<Sssku> ssskuList = new ArrayList<>();
// private Psb mPsb; private Psb mPsb;
// private long sumPrice; private long sumPrice;
// private boolean isAdd = true; private boolean isAdd = true;
//
// @Override @Override
// public int getLayoutId() { public int getLayoutId() {
// return R.layout.fragment_replenishement_detail; return R.layout.fragment_replenishement_detail;
// } }
//
// @Override @Override
// public void initView() { public void initView() {
//
// initRecycycler(); initRecycycler();
// mViewBinding.btnSearch.setOnClickListener(view -> { // mViewBinding.btnSearch.setOnClickListener(view -> {
// scrollToItem(mViewBinding.etKeyword.getText().toString().trim()); // scrollToItem(mViewBinding.etKeyword.getText().toString().trim());
// }); // });
...@@ -88,80 +88,80 @@ ...@@ -88,80 +88,80 @@
// ZX_PrintPOS.getInstance(mContext).printOrder(1, mPsb); // ZX_PrintPOS.getInstance(mContext).printOrder(1, mPsb);
// } // }
// }); // });
// } }
//
// private void initRecycycler() {
// mViewBinding.replenishmentRightRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
// if (mPsb != null && mPsb.getPsbStatus() != null) {
// switch (mPsb.getPsbStatus()) {
// case 3:
// mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
// break;
// case 1:
// mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
// break;
// case 0:
// mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, false);
// break;
// default:
// mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
// break;
// }
// } else {
// mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
// }
// mReplenishmentDetailAdapter.setEmptyView(getEmptyView());
// mViewBinding.replenishmentRightRecycler.setAdapter(mReplenishmentDetailAdapter);
// mReplenishmentDetailAdapter.setOnItemLongClickListener((adapter, view, position) -> {
// PromptDialog delDialog = new PromptDialog();
// delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// mReplenishmentDetailAdapter.getData().remove(position);
// mReplenishmentDetailAdapter.notifyDataSetChanged();
// delDialog.dismiss();
// }
// }, new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// delDialog.dismiss();
// }
// }).setCancelables(false).show((BaseActivity) mContext);
// return false;
// });
// mReplenishmentDetailAdapter.setmUpdatePriceListener(new ReplenishmentDetailAdapter.UpdatePriceListener() {
// @Override
// public void updatePrice(long amt) {
// sumPrice = sumPrice + amt;
// mViewBinding.setFinallyPrice(ConvertUtil.fenToYuan(sumPrice, true));
// }
// });
// initData();
// }
//
// private void initData() {
// if (isAdd) {
// mViewBinding.setIsShowSupplier(false);
// } else {
// mViewBinding.setIsShowSupplier(true);
// mViewBinding.setSupplierName(mPsb.getOutChannelNameabcn());
// mViewBinding.setSupplierAddress(mPsb.getOutCityProvName() + mPsb.getOutCityName() + mPsb.getOutCityCountyName() + mPsb.getOutCityAddress());
// mViewBinding.setSupplierTel(mPsb.getOutContactMob());
// mViewBinding.setDate(TimeUtils.millis2String(mPsb.getCreateTime()));
// mViewBinding.setNo(mPsb.getPsbNo());
// }
// if (this.ssskuList.size() != 0) {
// mViewBinding.setSumNum(ssskuList.size() + "种");
// mViewBinding.setFinallyPrice(ConvertUtil.fenToYuan(getSumPrice(), true));
// } else {
// mViewBinding.setSumNum("0个");
// mViewBinding.setFinallyPrice("￥0.00");
// }
// mViewBinding.setShopOderName(LoginPresenter.loginReturnBean.getOperName());
// mViewBinding.setShopName(LoginPresenter.loginReturnBean.getShopNameAbcn());
// mViewBinding.setShopAddress(LoginPresenter.loginReturnBean.getCityProvName() + LoginPresenter.loginReturnBean.getCityName() + LoginPresenter.loginReturnBean.getCityCountyName() + LoginPresenter.loginReturnBean.getCityAddress());
// mViewBinding.setShopTel(LoginPresenter.loginReturnBean.getContactTel());
// //
private void initRecycycler() {
mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
if (mPsb != null && mPsb.getPsbStatus() != null) {
switch (mPsb.getPsbStatus()) {
case 3:
mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
break;
case 1:
mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
break;
case 0:
mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, false);
break;
default:
mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
break;
}
} else {
mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
}
mReplenishmentDetailAdapter.setEmptyView(getEmptyView());
mViewBinding.recyclerView.setAdapter(mReplenishmentDetailAdapter);
mReplenishmentDetailAdapter.setOnItemLongClickListener((adapter, view, position) -> {
PromptDialog delDialog = new PromptDialog();
delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {
@Override
public void onClick(View view) {
mReplenishmentDetailAdapter.getData().remove(position);
mReplenishmentDetailAdapter.notifyDataSetChanged();
delDialog.dismiss();
}
}, new View.OnClickListener() {
@Override
public void onClick(View view) {
delDialog.dismiss();
}
}).setCancelables(false).show((BaseActivity) mContext);
return false;
});
mReplenishmentDetailAdapter.setmUpdatePriceListener(new ReplenishmentDetailAdapter.UpdatePriceListener() {
@Override
public void updatePrice(long amt) {
sumPrice = sumPrice + amt;
mViewBinding.setFinallyPrice(ConvertUtil.fenToYuan(sumPrice, true));
}
});
initData();
}
private void initData() {
if (isAdd) {
mViewBinding.setIsShowSupplier(false);
} else {
mViewBinding.setIsShowSupplier(true);
mViewBinding.setSupplierName(mPsb.getOutChannelNameabcn());
mViewBinding.setSupplierAddress(mPsb.getOutCityProvName() + mPsb.getOutCityName() + mPsb.getOutCityCountyName() + mPsb.getOutCityAddress());
mViewBinding.setSupplierTel(mPsb.getOutContactMob());
mViewBinding.setDate(TimeUtils.millis2String(mPsb.getCreateTime()));
mViewBinding.setNo(mPsb.getPsbNo());
}
if (this.ssskuList.size() != 0) {
mViewBinding.setSumNum(ssskuList.size() + "种");
mViewBinding.setFinallyPrice(ConvertUtil.fenToYuan(getSumPrice(), true));
} else {
mViewBinding.setSumNum("0个");
mViewBinding.setFinallyPrice("￥0.00");
}
mViewBinding.setShopOderName(LoginPresenter.loginReturnBean.getOperName());
mViewBinding.setShopName(LoginPresenter.loginReturnBean.getShopNameAbcn());
mViewBinding.setShopAddress(LoginPresenter.loginReturnBean.getCityProvName() + LoginPresenter.loginReturnBean.getCityName() + LoginPresenter.loginReturnBean.getCityCountyName() + LoginPresenter.loginReturnBean.getCityAddress());
mViewBinding.setShopTel(LoginPresenter.loginReturnBean.getContactTel());
// if (mPsb != null && mPsb.getPsbStatus() != null) { // if (mPsb != null && mPsb.getPsbStatus() != null) {
// switch (mPsb.getPsbStatus()) { // switch (mPsb.getPsbStatus()) {
// case 3: // case 3:
...@@ -180,86 +180,82 @@ ...@@ -180,86 +180,82 @@
// break; // break;
// } // }
// } // }
//
// } }
//
// public long getSumPrice() { public long getSumPrice() {
// sumPrice = 0; sumPrice = 0;
// for (Sssku sssku : mReplenishmentDetailAdapter.getData()) { for (Sssku sssku : mReplenishmentDetailAdapter.getData()) {
// sumPrice = sumPrice + sssku.getSellSumAmt(); sumPrice = sumPrice + sssku.getSellSumAmt();
// } }
// return sumPrice; return sumPrice;
// } }
//
//
// public void setSsskuList(List<Sssku> ssskuList) { public void setSsskuList(List<Sssku> ssskuList) {
// this.ssskuList = ssskuList; this.ssskuList = ssskuList;
// isAdd = true; isAdd = true;
// this.mPsb = null; this.mPsb = null;
// } }
//
// public void setPsb(Psb psb) { public void setPsb(Psb psb) {
// this.mPsb = psb; this.mPsb = psb;
// this.ssskuList = psb.getSsskuList(); this.ssskuList = psb.getSsskuList();
// isAdd = false; isAdd = false;
// } }
//
//
// @Override @Override
// public void onDestroy() { public void onDestroy() {
// mPresenter.isAllowFragment(true); mPresenter.isAllowFragment(true);
// super.onDestroy(); super.onDestroy();
// } }
//
// /** /**
// * 获取空页面 * 获取空页面
// * *
// * *
// * @return 空页面 * @return 空页面
// */ */
// protected View getEmptyView() { protected View getEmptyView() {
// @SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null); @SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
// Drawable drawable=getResources().getDrawable(R.mipmap.bg_no_null); TextView textView=((TextView) view.findViewById(R.id.tv_empty));
// drawable.setBounds(0,0,200,200); textView.setText(R.string.replenishment_detail_full);
// textView.setTextColor(getResources().getColor(R.color.black));
// TextView textView=((TextView) view.findViewById(R.id.tv_empty)); return view;
// textView.setCompoundDrawablesRelative(null,drawable,null,null); }
// textView.setText(R.string.replenishment_detail_full); private void scrollToItem(String string) {
// textView.setTextColor(getResources().getColor(R.color.black));
// return view; if (string.length() == 0) {
// } ToastUtils.showShort("请输入搜索内容");
// private void scrollToItem(String string) { return;
// }
// if (string.length() == 0) { Pattern pattern = Pattern.compile(string, Pattern.CASE_INSENSITIVE);
// ToastUtils.showShort("请输入搜索内容");
// return; for (int i = 0; i < mReplenishmentDetailAdapter.getData().size(); i++) {
// } Matcher matcher = pattern.matcher((mReplenishmentDetailAdapter.getData().get(i)).getSpuBarcode() + "");
// Pattern pattern = Pattern.compile(string, Pattern.CASE_INSENSITIVE); if (matcher.find()) {
// ((LinearLayoutManager) mViewBinding.recyclerView.getLayoutManager()).scrollToPositionWithOffset(i, 0);
// for (int i = 0; i < mReplenishmentDetailAdapter.getData().size(); i++) { ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
// Matcher matcher = pattern.matcher((mReplenishmentDetailAdapter.getData().get(i)).getSpuBarcode() + ""); KeyboardUtils.hideSoftInput(getActivity());
// if (matcher.find()) { return;
// ((LinearLayoutManager) mViewBinding.replenishmentRightRecycler.getLayoutManager()).scrollToPositionWithOffset(i, 0); }
// ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName()); matcher = pattern.matcher((mReplenishmentDetailAdapter.getData().get(i)).getSpuAb() + "");
// KeyboardUtils.hideSoftInput(getActivity()); if (matcher.find()) {
// return; ((LinearLayoutManager) mViewBinding.recyclerView.getLayoutManager()).scrollToPositionWithOffset(i, 0);
// } ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
// matcher = pattern.matcher((mReplenishmentDetailAdapter.getData().get(i)).getSpuAb() + ""); KeyboardUtils.hideSoftInput(getActivity());
// if (matcher.find()) { return;
// ((LinearLayoutManager) mViewBinding.replenishmentRightRecycler.getLayoutManager()).scrollToPositionWithOffset(i, 0); }
// ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName()); matcher = pattern.matcher((mReplenishmentDetailAdapter.getData().get(i)).getSpuName() + "");
// KeyboardUtils.hideSoftInput(getActivity()); if (matcher.find()) {
// return; ((LinearLayoutManager) mViewBinding.recyclerView.getLayoutManager()).scrollToPositionWithOffset(i, 0);
// } ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
// matcher = pattern.matcher((mReplenishmentDetailAdapter.getData().get(i)).getSpuName() + ""); KeyboardUtils.hideSoftInput(getActivity());
// if (matcher.find()) { return;
// ((LinearLayoutManager) mViewBinding.replenishmentRightRecycler.getLayoutManager()).scrollToPositionWithOffset(i, 0); }
// ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName()); }
// KeyboardUtils.hideSoftInput(getActivity());
// return; ToastUtils.showShort("没有找到相关货品");
// } }
// } }
//
// ToastUtils.showShort("没有找到相关货品");
// }
//}
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentFragment.java
View file @ 2aba1a2e
...@@ -19,6 +19,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog; ...@@ -19,6 +19,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter; import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentPresenter; import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentPresenter;
import com.xingdata.zzdpos.ui.manage.replenishment.adpter.ReplenishmentAdapter; import com.xingdata.zzdpos.ui.manage.replenishment.adpter.ReplenishmentAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -39,6 +40,9 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter, ...@@ -39,6 +40,9 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
private int[] titleInts = {R.string.manage_replenishment_unConfirmed, R.string.manage_replenishment_unReceive, R.string.manage_replenishment_finished}; private int[] titleInts = {R.string.manage_replenishment_unConfirmed, R.string.manage_replenishment_unReceive, R.string.manage_replenishment_finished};
private FragmentViewAdapter mFragmentPagerAdapter; private FragmentViewAdapter mFragmentPagerAdapter;
private List<BaseFragment> fragments; private List<BaseFragment> fragments;
private List<Psb> psbA;
private List<Psb> psbB;
private List<Psb> psbC;
@Override @Override
...@@ -50,14 +54,24 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter, ...@@ -50,14 +54,24 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
public void initView() { public void initView() {
initData(); initData();
initTab(); initTab();
mPresenter.queryPsbList();
((ReplenishmentListFragment) fragments.get(0)).setData(psbA);
((ReplenishmentListFragment) fragments.get(1)).setData(psbB);
((ReplenishmentListFragment) fragments.get(2)).setData(psbC);
mViewBinding.btnAdd.setOnClickListener(view -> { mViewBinding.btnAdd.setOnClickListener(view -> {
mPresenter.clickAdd(); mPresenter.clickAdd();
}); });
mViewBinding.icTitle.ivRight.setImageResource(R.mipmap.but_sweep_yard); mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
mViewBinding.icTitle.edTitle.setHint("请输入供货商名称"); @Override
protected void myOnClickListener(View v) {
getActivity().finish();
}
});
mViewBinding.icTitle.ivRight.setVisibility(View.GONE);
mViewBinding.icTitle.edTitle.setHint("请输入供货商名称");
mViewBinding.icTitle.edTitle.setOnClickListener(view -> { mViewBinding.icTitle.edTitle.setOnClickListener(view -> {
if (mViewBinding.icTitle.edTitle.getText().toString().trim().length() == 0) { if (mViewBinding.icTitle.edTitle.getText().toString().trim().length() == 0) {
ToastUtils.showShort("请输入供货商名称"); ToastUtils.showShort("请输入供货商名称");
...@@ -143,10 +157,16 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter, ...@@ -143,10 +157,16 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
} }
public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C) { public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C,boolean isFrist) {
((ReplenishmentListFragment) fragments.get(0)).setData(A, true); if (isFrist){
((ReplenishmentListFragment) fragments.get(1)).setData(B, true); this.psbA = A;
((ReplenishmentListFragment) fragments.get(2)).setData(C, true); this.psbB = B;
this.psbC = C;
}else {
((ReplenishmentListFragment) fragments.get(0)).setData(psbA,true);
((ReplenishmentListFragment) fragments.get(1)).setData(psbB,true);
((ReplenishmentListFragment) fragments.get(2)).setData(psbC,true);
}
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentListFragment.java
View file @ 2aba1a2e
...@@ -33,6 +33,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent ...@@ -33,6 +33,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
private ReplenishmentAdapter mReplenishmentAdapter; private ReplenishmentAdapter mReplenishmentAdapter;
private List<Psb> psbArrayList = new ArrayList<>(); private List<Psb> psbArrayList = new ArrayList<>();
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.fragment_replenishment_list; return R.layout.fragment_replenishment_list;
...@@ -41,7 +42,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent ...@@ -41,7 +42,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
@Override @Override
public void initView() { public void initView() {
if (mReplenishmentAdapter == null) { if (mReplenishmentAdapter == null) {
mReplenishmentAdapter = new ReplenishmentAdapter(psbArrayList); mReplenishmentAdapter = new ReplenishmentAdapter(new ArrayList<>());
mViewBinding.recycler.setLayoutManager(new LinearLayoutManager(getActivity())); mViewBinding.recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.recycler.setAdapter(mReplenishmentAdapter); mViewBinding.recycler.setAdapter(mReplenishmentAdapter);
...@@ -61,7 +62,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent ...@@ -61,7 +62,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
}); });
mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh); mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
setData(psbArrayList,true);
} }
private void onRefresh() { private void onRefresh() {
...@@ -83,10 +84,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent ...@@ -83,10 +84,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
* @param isRefresh 是否刷新 * @param isRefresh 是否刷新
*/ */
public void setData(List<Psb> psbList, boolean isRefresh) { public void setData(List<Psb> psbList, boolean isRefresh) {
if (mReplenishmentAdapter == null) {
psbArrayList = psbList;
return;
}
if (isRefresh) { if (isRefresh) {
mReplenishmentAdapter.setEnableLoadMore(true); mReplenishmentAdapter.setEnableLoadMore(true);
mViewBinding.srlProduct.setRefreshing(false); mViewBinding.srlProduct.setRefreshing(false);
...@@ -103,9 +101,13 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent ...@@ -103,9 +101,13 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
} }
public void setData(List<Psb> psbList){
this.psbArrayList=psbList;
}
public void searchSucc(String wd) { public void searchSucc(String wd) {
List<Psb> psbs = new ArrayList<>(); List<Psb> psbs = new ArrayList<>();
if (psbArrayList == null) { if (psbArrayList .size()==0) {
return; return;
} }
for (Psb psb : psbArrayList) { for (Psb psb : psbArrayList) {
...@@ -133,7 +135,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent ...@@ -133,7 +135,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
} }
} }
}, 500); }, 300);
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java
View file @ 2aba1a2e
...@@ -80,11 +80,11 @@ public class VipPresenter extends VipContract.Presenter { ...@@ -80,11 +80,11 @@ public class VipPresenter extends VipContract.Presenter {
@Override @Override
public void saleorderQuery(Long vipID) { public void saleorderQuery(Long vipID) {
ApiFactory.Saleorder.querySaleorderByVipId(vipID,0,100).subscribe(ticketList -> { // ApiFactory.Saleorder.querySaleorderByVipId(vipID,0,100).subscribe(ticketList -> {
mView.ticketQuerySus(ticketList); // mView.ticketQuerySus(ticketList);
}, throwable -> { // }, throwable -> {
ToastUtils.showShort(throwable.getMessage()); // ToastUtils.showShort(throwable.getMessage());
}); // });
} }
......
app/src/main/res/drawable/frame_frame_zhouyu_bg.xml 0 → 100644
View file @ 2aba1a2e
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- This is the main color -->
<item>
<shape>
<!-- 边框颜色 -->
<solid android:color="@color/black_baozheng"/>
</shape>
</item>
<!-- 给View的上 左 右设置8dp的边框 -->
<item android:bottom="@dimen/view_line_L050" android:top="@dimen/view_line_L050"
android:start="@dimen/view_line_L050" android:end="@dimen/view_line_L050">
<shape>
<!-- View填充颜色 -->
<solid android:color="@color/gray_zhouyu" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/fragment_replenishement.xml
View file @ 2aba1a2e
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
android:background="@color/gray_kongming" /> android:background="@color/gray_kongming" />
<LinearLayout <LinearLayout
android:id="@+id/btn_add"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/btn_add"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_4" android:drawablePadding="@dimen/dp_4"
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ 2aba1a2e
...@@ -55,525 +55,448 @@ ...@@ -55,525 +55,448 @@
type="String" /> type="String" />
</data> </data>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white" android:background="@color/gray_zhouyu"
android:orientation="vertical"
android:splitMotionEvents="false"> android:splitMotionEvents="false">
<!--<android.support.v7.widget.CardView--> <include
<!--android:id="@+id/f_left"--> android:id="@+id/ly_title"
<!--android:layout_width="0dp"--> layout="@layout/title_order" />
<!--android:layout_height="0dp"-->
<!--android:layout_marginEnd="@dimen/all_padding"--> <android.support.constraint.ConstraintLayout
<!--android:background="@color/white"--> android:layout_width="match_parent"
<!--app:cardElevation="@dimen/all_padding"--> android:layout_height="wrap_content"
<!--app:layout_constraintBottom_toBottomOf="parent"--> android:layout_marginTop="@dimen/all_margin"
<!--app:layout_constraintHorizontal_weight="10"--> android:background="@color/white_caocao">
<!--app:layout_constraintLeft_toLeftOf="parent"-->
<!--app:layout_constraintRight_toLeftOf="@+id/f_right"--> <TextView
<!--app:layout_constraintTop_toTopOf="parent"--> android:id="@+id/tv_supplier_title"
<!--app:layout_constraintVertical_weight="25">--> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<!--<android.support.constraint.ConstraintLayout--> android:paddingBottom="@dimen/all_padding"
<!--android:layout_width="match_parent"--> android:paddingStart="@dimen/all_padding_left_right"
<!--android:layout_height="match_parent"--> android:paddingTop="@dimen/all_padding"
<!--android:background="@color/white">--> android:text="供货方"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size"
<!--<TextView--> android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
<!--android:id="@+id/tv_supplier_title"--> app:layout_constraintStart_toStartOf="parent"
<!--android:layout_width="wrap_content"--> app:layout_constraintTop_toTopOf="parent" />
<!--android:layout_height="wrap_content"-->
<!--android:layout_margin="@dimen/all_margin"--> <TextView
<!--android:text="供货方"--> android:id="@+id/tv_supplier_name"
<!--android:textColor="@color/black"--> android:layout_width="wrap_content"
<!--android:textSize="@dimen/all_text_size_big"--> android:layout_height="wrap_content"
<!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"--> android:layout_margin="@dimen/all_padding_left_right"
<!--app:layout_constraintStart_toStartOf="parent"--> android:drawableStart="@mipmap/icon_stores"
<!--app:layout_constraintTop_toTopOf="parent" />--> android:text="@{supplierName}"
android:textColor="@color/black"
<!--<View--> android:textSize="@dimen/all_text_size_low"
<!--android:id="@+id/view_line_left_1"--> android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
<!--android:layout_width="match_parent"--> app:layout_constraintBottom_toBottomOf="@id/tv_supplier_title"
<!--android:layout_height="@dimen/all_slight_line_width"--> app:layout_constraintEnd_toEndOf="parent"
<!--android:layout_margin="@dimen/all_margin"--> app:layout_constraintTop_toTopOf="@id/tv_supplier_title" />
<!--android:background="@color/line"-->
<!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"--> <View
<!--app:layout_constraintTop_toBottomOf="@id/tv_supplier_title" />--> android:layout_width="match_parent"
android:layout_height="@dimen/all_slight_line_width"
android:background="@color/gray_kongming"
<!--<LinearLayout--> android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
<!--android:id="@+id/ll_supplier_name"--> app:layout_constraintTop_toTopOf="@id/tv_supplier_title" />
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"--> <View
<!--android:layout_margin="@dimen/all_margin"--> android:id="@+id/view_line_left_1"
<!--android:gravity="center_vertical"--> android:layout_width="match_parent"
<!--android:orientation="horizontal"--> android:layout_height="@dimen/all_slight_line_width"
<!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"--> android:background="@color/gray_kongming"
<!--app:layout_constraintEnd_toEndOf="parent"--> android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
<!--app:layout_constraintStart_toStartOf="parent"--> app:layout_constraintTop_toBottomOf="@id/tv_supplier_title" />
<!--app:layout_constraintTop_toTopOf="@id/view_line_left_1">-->
<LinearLayout
<!--<ImageView--> android:id="@+id/ll_supplier"
<!--android:layout_width="wrap_content"--> android:layout_width="match_parent"
<!--android:layout_height="wrap_content"--> android:layout_height="wrap_content"
<!--android:src="@mipmap/icon_stores" />--> android:orientation="vertical"
android:paddingEnd="@dimen/all_padding_left_right"
<!--<TextView--> android:paddingStart="@dimen/all_padding_left_right"
<!--android:layout_width="wrap_content"--> app:layout_constraintTop_toTopOf="@id/view_line_left_1">
<!--android:layout_height="wrap_content"-->
<!--android:paddingBottom="@dimen/dp_4"--> <LinearLayout
<!--android:paddingLeft="@dimen/all_padding"--> android:id="@+id/ll_supplier_name"
<!--android:paddingTop="@dimen/dp_4"--> android:layout_width="match_parent"
<!--android:text="@{supplierName}"--> android:layout_height="wrap_content"
<!--android:textColor="@color/black" />--> android:gravity="center_vertical"
<!--</LinearLayout>--> android:orientation="horizontal"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}">
<!--<LinearLayout-->
<!--android:id="@+id/ll_supplier_address"--> <ImageView
<!--android:layout_width="0dp"--> android:layout_width="wrap_content"
<!--android:layout_height="wrap_content"--> android:layout_height="wrap_content"
<!--android:gravity="center_vertical"--> android:src="@mipmap/icon_stores" />
<!--android:orientation="horizontal"--> <TextView
<!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"--> android:layout_width="wrap_content"
<!--app:layout_constraintEnd_toEndOf="@id/ll_supplier_name"--> android:layout_height="wrap_content"
<!--app:layout_constraintStart_toStartOf="@id/ll_supplier_name"--> android:paddingBottom="@dimen/dp_4"
<!--app:layout_constraintTop_toBottomOf="@id/ll_supplier_name">--> android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
<!--<ImageView--> android:text="@{supplierName}"
<!--android:layout_width="wrap_content"--> android:textColor="@color/black"
<!--android:layout_height="wrap_content"--> android:textSize="@dimen/all_text_size_low" />
<!--android:src="@mipmap/icon_address" />--> </LinearLayout>
<!--<TextView--> <LinearLayout
<!--android:layout_width="wrap_content"--> android:id="@+id/ll_supplier_address"
<!--android:layout_height="wrap_content"--> android:layout_width="match_parent"
<!--android:paddingBottom="@dimen/dp_4"--> android:layout_height="wrap_content"
<!--android:paddingLeft="@dimen/all_padding"--> android:gravity="center_vertical"
<!--android:paddingTop="@dimen/dp_4"-->
<!--android:text="@{supplierAddress}"--> android:orientation="horizontal"
<!--android:textColor="@color/black" />--> android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}">
<!--</LinearLayout>-->
<ImageView
<!--<LinearLayout--> android:layout_width="wrap_content"
<!--android:id="@+id/ll_supplier_phone"--> android:layout_height="wrap_content"
<!--android:layout_width="0dp"--> android:src="@mipmap/icon_address" />
<!--android:layout_height="wrap_content"-->
<!--android:gravity="center_vertical"--> <TextView
android:layout_width="wrap_content"
<!--android:orientation="horizontal"--> android:layout_height="wrap_content"
<!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"--> android:paddingBottom="@dimen/dp_4"
<!--app:layout_constraintEnd_toEndOf="@id/ll_supplier_name"--> android:paddingLeft="@dimen/all_padding"
<!--app:layout_constraintStart_toStartOf="@id/ll_supplier_name"--> android:paddingTop="@dimen/dp_4"
<!--app:layout_constraintTop_toBottomOf="@id/ll_supplier_address">--> android:text="@{supplierAddress}"
android:textColor="@color/black"
<!--<ImageView--> android:textSize="@dimen/all_text_size_low" />
<!--android:layout_width="wrap_content"--> </LinearLayout>
<!--android:layout_height="wrap_content"-->
<!--android:src="@mipmap/icon_telephone" />--> <LinearLayout
android:id="@+id/ll_supplier_phone"
<!--<TextView--> android:layout_width="match_parent"
<!--android:layout_width="wrap_content"--> android:layout_height="wrap_content"
<!--android:layout_height="wrap_content"--> android:gravity="center_vertical"
<!--android:paddingBottom="@dimen/dp_4"-->
<!--android:paddingLeft="@dimen/all_padding"--> android:orientation="horizontal"
<!--android:paddingTop="@dimen/dp_4"--> android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}">
<!--android:text="@{supplierTel}"-->
<!--android:textColor="@color/black" />--> <ImageView
<!--</LinearLayout>--> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_telephone" />
<!--<TextView-->
<!--android:id="@+id/tv_shop_title"--> <TextView
<!--android:layout_width="wrap_content"--> android:layout_width="wrap_content"
<!--android:layout_height="wrap_content"--> android:layout_height="wrap_content"
<!--android:layout_marginEnd="@dimen/all_margin"--> android:paddingBottom="@dimen/dp_4"
<!--android:layout_marginStart="@dimen/all_margin"--> android:paddingLeft="@dimen/all_padding"
<!--android:layout_marginTop="@dimen/all_margin_big"--> android:paddingTop="@dimen/dp_4"
<!--android:text="定货方"--> android:text="@{supplierTel}"
<!--android:textColor="@color/black"--> android:textColor="@color/black"
<!--android:textSize="@dimen/all_text_size_big"--> android:textSize="@dimen/all_text_size_low" />
<!--app:layout_constraintStart_toStartOf="parent"--> </LinearLayout>
<!--app:layout_constraintTop_toBottomOf="@id/ll_supplier_phone"-->
<!--app:layout_goneMarginTop="@dimen/all_margin" />-->
</LinearLayout>
<!--<View-->
<!--android:id="@+id/view_line_left_2"--> <TextView
<!--android:layout_width="match_parent"--> android:id="@+id/tv_shop_title"
<!--android:layout_height="@dimen/all_slight_line_width"--> android:layout_width="wrap_content"
<!--android:layout_margin="@dimen/all_margin"--> android:layout_height="wrap_content"
<!--android:background="@color/line"--> android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right"
<!--app:layout_constraintTop_toBottomOf="@id/tv_shop_title" />--> android:paddingTop="@dimen/all_padding"
android:text="定货方"
android:textColor="@color/black"
<!--<LinearLayout--> android:textSize="@dimen/all_text_size"
<!--android:id="@+id/ll_shop_name"--> app:layout_constraintStart_toStartOf="parent"
<!--android:layout_width="0dp"--> app:layout_constraintTop_toBottomOf="@id/ll_supplier"
<!--android:layout_height="wrap_content"--> app:layout_goneMarginTop="@dimen/all_margin" />
<!--android:layout_margin="@dimen/all_margin"-->
<!--android:gravity="center_vertical"--> <TextView
<!--android:orientation="horizontal"--> android:id="@+id/tv_shop_name"
<!--app:layout_constraintEnd_toEndOf="parent"--> android:layout_width="wrap_content"
<!--app:layout_constraintStart_toStartOf="parent"--> android:layout_height="wrap_content"
<!--app:layout_constraintTop_toTopOf="@id/view_line_left_2">--> android:layout_marginEnd="@dimen/all_padding_left_right"
android:drawableStart="@mipmap/icon_stores"
<!--<ImageView--> android:text="@{shopName}"
<!--android:layout_width="wrap_content"--> android:textColor="@color/black"
<!--android:layout_height="wrap_content"--> android:textSize="@dimen/all_text_size"
<!--android:src="@mipmap/icon_stores" />--> app:layout_constraintBottom_toBottomOf="@id/tv_shop_title"
app:layout_constraintEnd_toEndOf="parent"
<!--<TextView--> app:layout_constraintTop_toTopOf="@id/tv_shop_title" />
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"--> <View
<!--android:paddingBottom="@dimen/dp_4"--> android:layout_width="match_parent"
<!--android:paddingLeft="@dimen/all_padding"--> android:layout_height="@dimen/all_slight_line_width"
<!--android:paddingTop="@dimen/dp_4"--> android:background="@color/gray_kongming"
<!--android:text="@{shopName}"--> app:layout_constraintTop_toTopOf="@id/tv_shop_title" />
<!--android:textColor="@color/black" />-->
<!--</LinearLayout>--> <View
android:id="@+id/view_line_left_2"
<!--<LinearLayout--> android:layout_width="match_parent"
<!--android:id="@+id/ll_shop_address"--> android:layout_height="@dimen/all_slight_line_width"
<!--android:layout_width="0dp"--> android:background="@color/gray_kongming"
<!--android:layout_height="wrap_content"--> app:layout_constraintTop_toBottomOf="@id/tv_shop_title" />
<!--android:gravity="center_vertical"--> <LinearLayout
<!--android:orientation="horizontal"--> android:id="@+id/ll_shop"
<!--app:layout_constraintEnd_toEndOf="@id/ll_shop_name"--> android:layout_width="match_parent"
<!--app:layout_constraintStart_toStartOf="@id/ll_shop_name"--> android:layout_height="wrap_content"
<!--app:layout_constraintTop_toBottomOf="@id/ll_shop_name">--> android:orientation="vertical"
android:paddingEnd="@dimen/all_padding_left_right"
<!--<ImageView--> android:paddingStart="@dimen/all_padding_left_right"
<!--android:layout_width="wrap_content"--> app:layout_constraintTop_toBottomOf="@id/tv_shop_title">
<!--android:layout_height="wrap_content"-->
<!--android:src="@mipmap/icon_address" />--> <LinearLayout
android:id="@+id/ll_shop_name"
<!--<TextView--> android:layout_width="match_parent"
<!--android:layout_width="wrap_content"--> android:layout_height="wrap_content"
<!--android:layout_height="wrap_content"--> android:gravity="center_vertical"
<!--android:paddingBottom="@dimen/dp_4"--> android:orientation="horizontal"
<!--android:paddingLeft="@dimen/all_padding"--> app:layout_constraintEnd_toEndOf="parent"
<!--android:paddingTop="@dimen/dp_4"--> app:layout_constraintStart_toStartOf="parent"
<!--android:text="@{shopAddress}"--> app:layout_constraintTop_toTopOf="@id/view_line_left_2">
<!--android:textColor="@color/black" />-->
<!--</LinearLayout>--> <ImageView
android:layout_width="wrap_content"
<!--<LinearLayout--> android:layout_height="wrap_content"
<!--android:id="@+id/ll_shop_phone"--> android:src="@mipmap/icon_stores" />
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"--> <TextView
android:layout_width="wrap_content"
<!--android:gravity="center_vertical"--> android:layout_height="wrap_content"
<!--android:orientation="horizontal"--> android:paddingBottom="@dimen/dp_4"
<!--app:layout_constraintEnd_toEndOf="@id/ll_shop_name"--> android:paddingLeft="@dimen/all_padding"
<!--app:layout_constraintStart_toStartOf="@id/ll_shop_name"--> android:paddingTop="@dimen/dp_4"
<!--app:layout_constraintTop_toBottomOf="@id/ll_shop_address">--> android:text="@{shopName}"
android:textColor="@color/black"
<!--<ImageView--> android:textSize="@dimen/all_text_size_low" />
<!--android:layout_width="wrap_content"--> </LinearLayout>
<!--android:layout_height="wrap_content"-->
<!--android:src="@mipmap/icon_telephone" />--> <LinearLayout
android:id="@+id/ll_shop_address"
<!--<TextView--> android:layout_width="match_parent"
<!--android:layout_width="wrap_content"--> android:layout_height="wrap_content"
<!--android:layout_height="wrap_content"-->
<!--android:paddingBottom="@dimen/dp_4"--> android:gravity="center_vertical"
<!--android:paddingLeft="@dimen/all_padding"--> android:orientation="horizontal"
<!--android:paddingTop="@dimen/dp_4"--> app:layout_constraintEnd_toEndOf="@id/ll_shop_name"
<!--android:text="@{shopTel}"--> app:layout_constraintStart_toStartOf="@id/ll_shop_name"
<!--android:textColor="@color/black" />--> app:layout_constraintTop_toBottomOf="@id/ll_shop_name">
<!--</LinearLayout>-->
<ImageView
<!--<View--> android:layout_width="wrap_content"
<!--android:id="@+id/view_line_left_3"--> android:layout_height="wrap_content"
<!--android:layout_width="match_parent"--> android:src="@mipmap/icon_address" />
<!--android:layout_height="@dimen/all_slight_line_width"-->
<!--android:layout_margin="@dimen/all_margin"--> <TextView
<!--android:background="@color/line"--> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"--> android:paddingBottom="@dimen/dp_4"
<!--app:layout_constraintTop_toBottomOf="@id/ll_shop_phone" />--> android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
<!--<LinearLayout--> android:text="@{shopAddress}"
<!--android:id="@+id/ll_date"--> android:textColor="@color/black"
<!--android:layout_width="0dp"--> android:textSize="@dimen/all_text_size_low" />
<!--android:layout_height="wrap_content"--> </LinearLayout>
<!--android:layout_marginTop="@dimen/all_margin"-->
<!--android:gravity="center_vertical"--> <LinearLayout
<!--android:orientation="horizontal"--> android:id="@+id/ll_shop_phone"
<!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"--> android:layout_width="match_parent"
<!--app:layout_constraintEnd_toEndOf="@id/ll_shop_name"--> android:layout_height="wrap_content"
<!--app:layout_constraintStart_toStartOf="@id/ll_shop_name"-->
<!--app:layout_constraintTop_toBottomOf="@id/view_line_left_3">--> android:gravity="center_vertical"
android:orientation="horizontal"
<!--<ImageView--> app:layout_constraintEnd_toEndOf="@id/ll_shop_name"
<!--android:layout_width="wrap_content"--> app:layout_constraintStart_toStartOf="@id/ll_shop_name"
<!--android:layout_height="wrap_content"--> app:layout_constraintTop_toBottomOf="@id/ll_shop_address">
<!--android:src="@mipmap/icon_dates_green" />-->
<ImageView
<!--<TextView--> android:layout_width="wrap_content"
<!--android:layout_width="wrap_content"--> android:layout_height="wrap_content"
<!--android:layout_height="wrap_content"--> android:src="@mipmap/icon_telephone" />
<!--android:paddingBottom="@dimen/dp_4"-->
<!--android:paddingLeft="@dimen/all_padding"--> <TextView
<!--android:paddingTop="@dimen/dp_4"--> android:layout_width="wrap_content"
<!--android:text="@{date}"--> android:layout_height="wrap_content"
<!--android:textColor="@color/black" />--> android:paddingBottom="@dimen/dp_4"
<!--</LinearLayout>--> android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
<!--<LinearLayout--> android:text="@{shopTel}"
<!--android:id="@+id/ll_no"--> android:textColor="@color/black"
<!--android:layout_width="0dp"--> android:textSize="@dimen/all_text_size_low" />
<!--android:layout_height="wrap_content"--> </LinearLayout>
<!--android:gravity="center_vertical"--> </LinearLayout>
<!--android:orientation="horizontal"-->
<!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"--> <View
<!--app:layout_constraintEnd_toEndOf="@id/ll_shop_name"--> android:id="@+id/view_line_left_3"
<!--app:layout_constraintStart_toStartOf="@id/ll_shop_name"--> android:layout_width="match_parent"
<!--app:layout_constraintTop_toBottomOf="@id/ll_date">--> android:layout_height="@dimen/all_slight_line_width"
android:background="@color/gray_kongming"
<!--<ImageView--> android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
<!--android:layout_width="wrap_content"--> app:layout_constraintTop_toBottomOf="@id/ll_shop" />
<!--android:layout_height="wrap_content"-->
<!--android:src="@mipmap/icon_no_green" />--> <LinearLayout
android:id="@+id/ll_date"
<!--<TextView--> android:layout_width="0dp"
<!--android:layout_width="wrap_content"--> android:layout_height="wrap_content"
<!--android:layout_height="wrap_content"--> android:gravity="center_vertical"
<!--android:paddingBottom="@dimen/dp_4"--> android:orientation="horizontal"
<!--android:paddingLeft="@dimen/all_padding"--> android:paddingEnd="@dimen/all_padding_left_right"
<!--android:paddingTop="@dimen/dp_4"--> android:paddingStart="@dimen/all_padding_left_right"
<!--android:text="@{no}"--> android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
<!--android:textColor="@color/black" />--> app:layout_constraintEnd_toEndOf="@id/ll_shop"
<!--</LinearLayout>--> app:layout_constraintStart_toStartOf="@id/ll_shop"
app:layout_constraintTop_toBottomOf="@id/view_line_left_3">
<!--<LinearLayout--> <ImageView
<!--android:id="@+id/ll_result"--> android:layout_width="wrap_content"
<!--android:layout_width="0dp"--> android:layout_height="wrap_content"
<!--android:layout_height="wrap_content"--> android:src="@mipmap/icon_dates_green" />
<!--android:layout_marginBottom="@dimen/all_margin"-->
<!--android:gravity="center"--> <TextView
<!--android:orientation="horizontal"--> android:layout_width="wrap_content"
<!--app:layout_constraintBottom_toBottomOf="parent"--> android:layout_height="wrap_content"
<!--app:layout_constraintEnd_toEndOf="parent"--> android:paddingBottom="@dimen/dp_4"
<!--app:layout_constraintHorizontal_weight="1"--> android:paddingLeft="@dimen/all_padding"
<!--app:layout_constraintStart_toEndOf="@id/ll_num">--> android:paddingTop="@dimen/dp_4"
android:text="@{date}"
<!--<TextView--> android:textColor="@color/black"
<!--android:layout_width="wrap_content"--> android:textSize="@dimen/all_text_size_low" />
<!--android:layout_height="wrap_content"--> </LinearLayout>
<!--android:gravity="center"-->
<!--android:paddingBottom="@dimen/dp_4"--> <LinearLayout
<!--android:paddingLeft="@dimen/all_padding"--> android:id="@+id/ll_no"
<!--android:paddingRight="@dimen/all_padding"--> android:layout_width="0dp"
<!--android:paddingTop="@dimen/dp_4"--> android:layout_height="wrap_content"
<!--android:text="@{finallyPrice}"--> android:gravity="center_vertical"
<!--android:textColor="@color/reddeep"--> android:orientation="horizontal"
<!--android:textSize="@dimen/all_text_size_big" />--> android:paddingEnd="@dimen/all_padding_left_right"
<!--</LinearLayout>--> android:paddingStart="@dimen/all_padding_left_right"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf="@id/ll_shop"
<!--<LinearLayout--> app:layout_constraintStart_toStartOf="@id/ll_shop"
<!--android:id="@+id/ll_num"--> app:layout_constraintTop_toBottomOf="@id/ll_date">
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"--> <ImageView
<!--android:gravity="center"--> android:layout_width="wrap_content"
<!--android:orientation="horizontal"--> android:layout_height="wrap_content"
<!--app:layout_constraintBottom_toBottomOf="@id/ll_result"--> android:src="@mipmap/icon_no_green" />
<!--app:layout_constraintEnd_toStartOf="@id/ll_result"-->
<!--app:layout_constraintHorizontal_weight="1"--> <TextView
<!--app:layout_constraintStart_toStartOf="parent"--> android:layout_width="wrap_content"
<!--app:layout_constraintTop_toTopOf="@id/ll_result">--> android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
<!--<TextView--> android:paddingLeft="@dimen/all_padding"
<!--android:layout_width="wrap_content"--> android:paddingTop="@dimen/dp_4"
<!--android:layout_height="wrap_content"--> android:text="@{no}"
<!--android:padding="@dimen/dp_4"--> android:textColor="@color/black"
<!--android:text="@{sumNum}"--> android:textSize="@dimen/all_text_size_low" />
<!--android:textColor="@color/reddeep"--> </LinearLayout>
<!--android:textSize="@dimen/all_text_size_big"-->
<!--android:textStyle="bold" />-->
<LinearLayout
android:id="@+id/ll_result"
<!--</LinearLayout>--> android:layout_width="0dp"
android:layout_height="wrap_content"
<!--<TextView--> android:layout_marginBottom="@dimen/all_margin"
<!--android:id="@+id/tv_result_hint"--> android:gravity="center"
<!--android:layout_width="wrap_content"--> android:orientation="horizontal"
<!--android:layout_height="wrap_content"--> app:layout_constraintEnd_toEndOf="parent"
<!--android:layout_margin="@dimen/all_margin"--> app:layout_constraintHorizontal_weight="1"
<!--android:text="金额"--> app:layout_constraintStart_toEndOf="@id/ll_num"
<!--android:textColor="@color/black"--> app:layout_constraintTop_toBottomOf="@id/tv_result_hint">
<!--app:layout_constraintBottom_toTopOf="@id/ll_result"-->
<!--app:layout_constraintEnd_toEndOf="@id/ll_result"--> <TextView
<!--app:layout_constraintStart_toStartOf="@id/ll_result" />--> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<!--<TextView--> android:gravity="center"
<!--android:layout_width="wrap_content"--> android:paddingBottom="@dimen/dp_4"
<!--android:layout_height="wrap_content"--> android:paddingLeft="@dimen/all_padding"
<!--android:layout_margin="@dimen/all_margin"--> android:paddingRight="@dimen/all_padding"
<!--android:text="种类"--> android:paddingTop="@dimen/dp_4"
<!--android:textColor="@color/black"--> android:text="@{finallyPrice}"
<!--app:layout_constraintBottom_toBottomOf="@id/tv_result_hint"--> android:textColor="@color/reddeep"
<!--app:layout_constraintEnd_toEndOf="@id/ll_num"--> android:textSize="@dimen/all_text_size_big" />
<!--app:layout_constraintStart_toStartOf="@id/ll_num"--> </LinearLayout>
<!--app:layout_constraintTop_toTopOf="@id/tv_result_hint" />-->
<!--<View--> <LinearLayout
<!--android:id="@+id/view_line_left_bottom"--> android:id="@+id/ll_num"
<!--android:layout_width="match_parent"--> android:layout_width="0dp"
<!--android:layout_height="@dimen/all_margin"--> android:layout_height="wrap_content"
<!--android:layout_marginBottom="100dp"--> android:gravity="center"
<!--android:background="@color/lyt_main_bg"--> android:orientation="horizontal"
<!--app:layout_constraintBottom_toBottomOf="parent" />--> app:layout_constraintBottom_toBottomOf="@id/ll_result"
<!--</android.support.constraint.ConstraintLayout>--> app:layout_constraintEnd_toStartOf="@id/ll_result"
<!--</android.support.v7.widget.CardView>--> app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/ll_result">
<!--<android.support.constraint.ConstraintLayout-->
<!--android:id="@+id/f_right"--> <TextView
<!--android:layout_width="0dp"--> android:layout_width="wrap_content"
<!--android:layout_height="0dp"--> android:layout_height="wrap_content"
<!--android:background="@color/white"--> android:padding="@dimen/dp_4"
<!--android:splitMotionEvents="false"--> android:text="@{sumNum}"
<!--app:layout_constraintBottom_toBottomOf="parent"--> android:textColor="@color/reddeep"
<!--app:layout_constraintHorizontal_weight="22"--> android:textSize="@dimen/all_text_size_big"
<!--app:layout_constraintLeft_toRightOf="@+id/f_left"--> android:textStyle="bold" />
<!--app:layout_constraintRight_toRightOf="parent"-->
<!--app:layout_constraintTop_toTopOf="parent"-->
<!--app:layout_constraintVertical_weight="25">--> </LinearLayout>
<View
<!--<EditText--> android:layout_width="match_parent"
<!--android:id="@+id/et_keyword"--> android:layout_height="@dimen/all_slight_line_width"
<!--style="@style/dialog_edit"--> android:background="@color/gray_kongming"
<!--android:layout_width="wrap_content"--> app:layout_constraintTop_toBottomOf="@id/ll_no" />
<!--android:layout_height="0dp"-->
<!--android:layout_marginEnd="@dimen/all_margin"--> <TextView
<!--android:drawableEnd="@mipmap/ic_scan"--> android:id="@+id/tv_result_hint"
<!--android:hint="@string/inventory_add_et_hint"--> android:layout_width="wrap_content"
<!--android:inputType="number"--> android:layout_height="wrap_content"
<!--android:maxLength="19"--> android:layout_marginEnd="8dp"
<!--android:minWidth="@dimen/fragment_store_et_min_width"--> android:paddingTop="@dimen/all_margin"
<!--android:paddingEnd="@dimen/fragment_detail_padding_end"--> android:text="金额"
<!--android:paddingStart="@dimen/all_margin"--> android:textColor="@color/black"
<!--android:singleLine="true"--> app:layout_constraintEnd_toEndOf="@+id/ll_result"
<!--app:layout_constraintBottom_toBottomOf="@id/btn_search"--> app:layout_constraintStart_toStartOf="@id/ll_result"
<!--app:layout_constraintRight_toRightOf="@id/btn_search"--> app:layout_constraintTop_toBottomOf="@id/ll_no" />
<!--app:layout_constraintTop_toTopOf="@id/btn_search" />-->
<TextView
<!--<ImageButton--> android:layout_width="wrap_content"
<!--android:id="@+id/btn_search"--> android:layout_height="wrap_content"
<!--android:layout_width="@dimen/fragment_store_btn_width"--> android:layout_margin="@dimen/all_margin"
<!--android:layout_height="@dimen/fragment_store_et_height"--> android:paddingTop="@dimen/all_margin"
<!--android:layout_marginEnd="@dimen/all_margin"--> android:text="缺货种类"
<!--android:layout_marginTop="@dimen/all_margin"--> android:textColor="@color/black"
<!--android:background="@drawable/shape_store_btn_search_select"--> app:layout_constraintBottom_toBottomOf="@id/tv_result_hint"
<!--android:contentDescription="@string/store_search"--> app:layout_constraintEnd_toEndOf="@id/ll_num"
<!--android:scaleType="centerInside"--> app:layout_constraintStart_toStartOf="@id/ll_num"
<!--android:src="@mipmap/store_search"--> app:layout_constraintTop_toTopOf="@id/tv_result_hint" />
<!--app:layout_constraintEnd_toEndOf="parent"-->
<!--app:layout_constraintTop_toTopOf="parent" />--> <TextView
android:layout_width="match_parent"
<!--<TextView--> android:layout_height="wrap_content"
<!--android:layout_width="wrap_content"--> android:background="@color/gray_zhouyu"
<!--android:layout_height="wrap_content"--> android:padding="@dimen/all_padding_left_right"
<!--android:layout_margin="@dimen/all_margin"--> android:text="定货明细"
<!--android:text="@string/replenishment_detail_title"--> android:textColor="@color/black_baozheng"
<!--android:textColor="@color/black"--> android:textSize="@dimen/all_text_size_small_title"
<!--android:textSize="@dimen/all_sub_title_size"--> android:textStyle="bold"
<!--app:layout_constraintBottom_toBottomOf="@id/et_keyword"--> app:layout_constraintTop_toBottomOf="@id/ll_result" />
<!--app:layout_constraintStart_toStartOf="parent"-->
<!--app:layout_constraintTop_toTopOf="@id/et_keyword" />--> </android.support.constraint.ConstraintLayout>
<android.support.v7.widget.RecyclerView
<!--<View--> android:id="@+id/recycler_view"
<!--android:id="@+id/view_line"--> android:layout_width="match_parent"
<!--android:layout_width="match_parent"--> android:layout_height="wrap_content">
<!--android:layout_height="@dimen/all_slight_line_width"--> </android.support.v7.widget.RecyclerView>
<!--android:layout_marginLeft="@dimen/all_padding"-->
<!--android:layout_marginRight="@dimen/all_margin"--> </LinearLayout>
<!--android:layout_marginTop="@dimen/all_padding"-->
<!--android:background="@color/line"-->
<!--app:layout_constraintTop_toBottomOf="@id/et_keyword" />-->
<!--<android.support.v7.widget.RecyclerView-->
<!--android:id="@+id/replenishment_right_recycler"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="0dp"-->
<!--android:layout_marginTop="@dimen/view_line_L1"-->
<!--android:splitMotionEvents="false"-->
<!--app:layout_constraintBottom_toTopOf="@id/cl_btn"-->
<!--app:layout_constraintEnd_toEndOf="parent"-->
<!--app:layout_constraintStart_toStartOf="parent"-->
<!--app:layout_constraintTop_toBottomOf="@id/view_line" />-->
<!--<android.support.constraint.ConstraintLayout-->
<!--android:id="@+id/cl_btn"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="100dp"-->
<!--app:layout_constraintBottom_toBottomOf="parent"-->
<!--app:layout_constraintTop_toBottomOf="@id/replenishment_right_recycler">-->
<!--<View-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="@dimen/all_slight_line_width"-->
<!--android:layout_marginLeft="@dimen/all_padding"-->
<!--android:layout_marginRight="@dimen/all_margin"-->
<!--android:layout_marginTop="@dimen/view_line_L1"-->
<!--android:background="@color/line"-->
<!--app:layout_constraintTop_toTopOf="parent" />-->
<!--<Button-->
<!--android:id="@+id/btn_end"-->
<!--style="@style/button_positive"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginBottom="@dimen/all_margin"-->
<!--android:layout_marginLeft="@dimen/all_margin"-->
<!--android:layout_marginRight="@dimen/all_margin"-->
<!--android:stateListAnimator="@null"-->
<!--android:text="@string/replenishment_detail_submit"-->
<!--app:layout_constraintBottom_toBottomOf="parent"-->
<!--app:layout_constraintEnd_toEndOf="parent" />-->
<!--<Button-->
<!--android:id="@+id/btn_print"-->
<!--style="@style/button_positive"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginBottom="@dimen/all_margin"-->
<!--android:layout_marginLeft="@dimen/all_margin"-->
<!--android:layout_marginRight="@dimen/all_margin"-->
<!--android:stateListAnimator="@null"-->
<!--android:text="@string/replenishment_detail_print"-->
<!--android:visibility="gone"-->
<!--app:layout_constraintBottom_toBottomOf="parent"-->
<!--app:layout_constraintStart_toStartOf="parent" />-->
<!--<Button-->
<!--android:id="@+id/btn_canel"-->
<!--style="@style/button_passive"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginBottom="@dimen/all_margin"-->
<!--android:layout_marginEnd="@dimen/all_margin_big"-->
<!--android:stateListAnimator="@null"-->
<!--android:text="@string/replenishment_detail_cancel"-->
<!--app:layout_constraintBottom_toBottomOf="parent"-->
<!--app:layout_constraintEnd_toStartOf="@id/btn_end"-->
<!--app:layout_goneMarginLeft="@dimen/all_margin"-->
<!--app:layout_goneMarginRight="@dimen/all_margin" />-->
<!--</android.support.constraint.ConstraintLayout>-->
<!--</android.support.constraint.ConstraintLayout>-->
</android.support.constraint.ConstraintLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/item_replenishment.xml
View file @ 2aba1a2e
...@@ -67,10 +67,10 @@ ...@@ -67,10 +67,10 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/all_padding" android:paddingStart="@dimen/all_padding"
android:text="@{shopName}" android:text="@{shopName}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size" /> android:textSize="@dimen/all_text_size_low" />
</LinearLayout> </LinearLayout>
<TextView <TextView
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:text="@{date}" android:text="@{date}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size" /> android:textSize="@dimen/all_text_size_low" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
android:paddingStart="@dimen/all_padding" android:paddingStart="@dimen/all_padding"
android:text="@{no}" android:text="@{no}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size" /> android:textSize="@dimen/all_text_size_low" />
</LinearLayout> </LinearLayout>
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
android:text="@{supplierName}" android:text="@{supplierName}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size" /> android:textSize="@dimen/all_text_size_low" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
android:text="@{supplierAddress}" android:text="@{supplierAddress}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size" /> android:textSize="@dimen/all_text_size_low" />
</LinearLayout> </LinearLayout>
<android.support.constraint.Guideline <android.support.constraint.Guideline
......
app/src/main/res/layout/item_replenishment_detail.xml
View file @ 2aba1a2e
...@@ -9,219 +9,203 @@ ...@@ -9,219 +9,203 @@
</data> </data>
<android.support.v7.widget.CardView <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding" android:background="@drawable/singleline_white_gray"
android:layout_marginEnd="@dimen/all_margin" android:padding="@dimen/all_padding">
android:layout_marginStart="@dimen/all_padding"
android:layout_marginBottom="@dimen/all_padding" <com.facebook.drawee.view.SimpleDraweeView
app:cardCornerRadius="@dimen/all_shape_radius" android:id="@+id/img_goods"
app:cardElevation="1dp"> android:layout_width="65dp"
android:layout_height="65dp"
<!--<android.support.constraint.ConstraintLayout--> app:placeholderImage="@mipmap/icon_goods_default" />
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"--> <TextView
<!--android:padding="@dimen/all_padding"--> android:id="@+id/tv_goods_name"
<!--android:background="@drawable/black_border">--> style="@style/other_select_blacktext_style"
android:layout_width="0dp"
<!--<com.facebook.drawee.view.SimpleDraweeView--> android:layout_height="wrap_content"
<!--android:id="@+id/img_goods"--> android:layout_marginEnd="@dimen/all_padding_left_right"
<!--android:layout_width="130dp"--> android:layout_marginStart="@dimen/all_padding_left_right"
<!--android:layout_height="130dp"--> android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
<!--app:placeholderImage="@mipmap/icon_goods_default" />-->
app:layout_constraintStart_toEndOf="@id/img_goods"
<!--<TextView--> app:layout_constraintTop_toTopOf="@id/img_goods" />
<!--android:id="@+id/tv_goods_name"-->
<!--style="@style/other_select_blacktext_style"--> <TextView
<!--android:layout_width="0dp"--> android:id="@+id/tv_goods_code_hint"
<!--android:layout_height="wrap_content"--> style="@style/other_select_smallstyle"
<!--android:layout_marginEnd="@dimen/all_margin"--> android:layout_width="wrap_content"
<!--android:layout_marginTop="@dimen/all_margin"--> android:layout_height="28dp"
<!--android:layout_marginStart="@dimen/all_padding"--> android:layout_marginTop="@dimen/all_padding"
<!--android:text="贝斯克莱因和美妖精生日巧克力蛋糕"--> android:text="条码："
<!--app:layout_constraintEnd_toEndOf="@id/guideline_center"--> app:layout_constraintStart_toStartOf="@id/tv_goods_name"
<!--app:layout_constraintStart_toEndOf="@id/img_goods"--> app:layout_constraintTop_toBottomOf="@id/tv_goods_name" />
<!--app:layout_constraintTop_toTopOf="@id/img_goods" />-->
<TextView
<!--<TextView--> android:id="@+id/tv_goods_code"
<!--android:id="@+id/tv_goods_code_hint"--> style="@style/other_select_smallstyle"
<!--style="@style/other_select_smallstyle"--> android:layout_width="wrap_content"
<!--android:layout_width="wrap_content"--> android:layout_height="0dp"
<!--android:layout_height="wrap_content"--> android:text="12783163981789"
<!--android:layout_marginTop="@dimen/all_padding"--> app:layout_constraintBottom_toBottomOf="@id/tv_goods_code_hint"
<!--android:text="条码："--> app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"
<!--app:layout_constraintStart_toStartOf="@id/tv_goods_name"--> app:layout_constraintTop_toTopOf="@id/tv_goods_code_hint" />
<!--app:layout_constraintTop_toBottomOf="@id/tv_goods_name" />-->
<!--<TextView--> <TextView
<!--android:id="@+id/tv_goods_code"--> android:id="@+id/tv_goods_size"
<!--style="@style/other_select_smallstyle"--> android:layout_width="wrap_content"
<!--android:layout_width="wrap_content"--> android:layout_height="wrap_content"
<!--android:layout_height="0dp"--> android:text="规格"
<!--android:text="12783163981789"--> android:textSize="@dimen/all_text_size_small"
<!--app:layout_constraintBottom_toBottomOf="@id/tv_goods_code_hint"--> android:background="@drawable/frame_frame_zhouyu_bg"
<!--app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"--> android:padding="@dimen/dp_4"
<!--app:layout_constraintTop_toTopOf="@id/tv_goods_code_hint" />--> app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
<!--<TextView-->
<!--android:id="@+id/tv_goods_size"--> <TextView
<!--style="@style/store_product_size"--> android:id="@+id/tv_goods_price"
<!--android:layout_width="wrap_content"--> android:layout_width="wrap_content"
<!--android:layout_height="wrap_content"--> android:layout_height="wrap_content"
<!--android:text="规格"--> android:text="999"
<!--app:layout_constraintBottom_toBottomOf="@id/tv_goods_price"--> android:textColor="@color/store_product_price"
<!--app:layout_constraintStart_toStartOf="@id/tv_goods_name"--> android:textSize="@dimen/big_text_size"
<!--app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />--> android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/tv_rmb"
<!--<TextView--> app:layout_constraintStart_toEndOf="@id/tv_rmb"
<!--android:id="@+id/tv_goods_price"--> app:layout_constraintTop_toTopOf="@id/tv_price_hint" />
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"--> <TextView
<!--android:layout_marginBottom="@dimen/all_margin"--> android:id="@+id/tv_rmb"
<!--android:layout_marginEnd="@dimen/all_margin"--> android:layout_width="wrap_content"
<!--android:text="999"--> android:layout_height="wrap_content"
<!--android:textColor="@color/store_product_price"--> android:layout_marginBottom="2dp"
<!--android:textSize="@dimen/fragment_store_product_price"--> android:text="@string/money_rmb"
<!--app:layout_constraintBottom_toBottomOf="@id/img_goods"--> android:textColor="@color/store_product_price"
<!--app:layout_constraintEnd_toEndOf="@id/guideline_center" />--> android:textSize="@dimen/all_text_size_small"
app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
<!--<TextView--> app:layout_constraintStart_toEndOf="@+id/tv_price_hint"
<!--android:layout_width="wrap_content"--> app:layout_constraintTop_toTopOf="@id/tv_price_hint" />
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginBottom="2dp"-->
<!--android:text="@string/money_rmb"--> <View
<!--android:textColor="@color/store_product_price"--> android:layout_width="@dimen/all_line_width"
<!--android:textSize="@dimen/item_superpurchase_textsize_big"--> android:layout_height="0dp"
<!--app:layout_constraintBottom_toBottomOf="@id/tv_goods_price"--> android:layout_marginBottom="@dimen/all_margin"
<!--app:layout_constraintEnd_toStartOf="@+id/tv_goods_price" />--> android:layout_marginTop="@dimen/all_margin"
android:background="@color/lyt_main_bg"
app:layout_constraintBottom_toBottomOf="@id/img_goods"
<!--<View--> app:layout_constraintTop_toTopOf="@id/img_goods" />
<!--android:layout_width="@dimen/all_line_width"-->
<!--android:layout_height="0dp"--> <LinearLayout
<!--android:layout_marginBottom="@dimen/all_margin"--> android:id="@+id/linearLayout"
<!--android:layout_marginTop="@dimen/all_margin"--> android:layout_width="wrap_content"
<!--android:background="@color/lyt_main_bg"--> android:layout_height="@dimen/dialog_cart_item_button_height"
<!--app:layout_constraintBottom_toBottomOf="@id/img_goods"--> android:gravity="center"
<!--app:layout_constraintEnd_toEndOf="@id/guideline_center"--> android:orientation="horizontal"
<!--app:layout_constraintTop_toTopOf="@id/img_goods" />--> app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
app:layout_constraintEnd_toEndOf="parent"
<!--<LinearLayout--> >
<!--android:id="@+id/linearLayout"-->
<!--android:layout_width="wrap_content"--> <ImageButton
<!--android:layout_height="@dimen/dialog_cart_item_button_height"--> android:id="@+id/btn_down"
<!--android:layout_margin="@dimen/all_margin"--> android:layout_width="wrap_content"
<!--android:gravity="center"--> android:layout_height="match_parent"
<!--android:orientation="horizontal"--> android:layout_marginEnd="@dimen/all_margin"
android:layout_weight="1"
<!--app:layout_constraintBottom_toBottomOf="parent"--> android:background="@color/white"
<!--app:layout_constraintEnd_toEndOf="parent"--> android:src="@mipmap/but_reduce"
<!--app:layout_constraintStart_toStartOf="@id/guideline_center">--> tools:layout_editor_absoluteX="602dp"
tools:layout_editor_absoluteY="97dp" />
<!--<ImageButton-->
<!--android:id="@+id/btn_down"--> <EditText
<!--android:layout_width="wrap_content"--> android:id="@+id/et_count"
<!--android:layout_height="match_parent"--> android:layout_width="50dp"
<!--android:layout_marginEnd="@dimen/all_margin"--> android:layout_height="match_parent"
<!--android:layout_weight="1"--> android:layout_weight="1"
<!--android:background="@color/white"--> android:background="@drawable/selector_edit_frame_blue_background"
<!--android:src="@mipmap/but_cut"--> android:gravity="center"
<!--tools:layout_editor_absoluteX="602dp"--> android:hint="1"
<!--tools:layout_editor_absoluteY="97dp" />--> android:inputType="number"
android:maxLength="4"
<!--<EditText--> android:saveEnabled="false"
<!--android:id="@+id/et_count"--> tools:layout_editor_absoluteX="540dp"
<!--android:layout_width="100dp"--> tools:layout_editor_absoluteY="192dp" />
<!--android:layout_height="match_parent"-->
<!--android:layout_weight="1"--> <ImageButton
<!--android:background="@drawable/hint_border"--> android:id="@+id/btn_up"
<!--android:gravity="center"--> android:layout_width="wrap_content"
<!--android:hint="1"--> android:layout_height="match_parent"
<!--android:inputType="number"--> android:layout_marginStart="@dimen/all_margin"
<!--android:maxLength="4"--> android:layout_weight="1"
<!--android:saveEnabled="false"--> android:background="@color/white"
<!--tools:layout_editor_absoluteX="540dp"--> android:src="@mipmap/but_add"
<!--tools:layout_editor_absoluteY="192dp" />--> tools:layout_editor_absoluteX="666dp"
tools:layout_editor_absoluteY="97dp" />
<!--<ImageButton--> </LinearLayout>
<!--android:id="@+id/btn_up"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="match_parent"--> <TextView
<!--android:layout_marginStart="@dimen/all_margin"--> android:id="@+id/tv_stock_hint"
<!--android:layout_weight="1"--> style="@style/other_select_smallstyle"
<!--android:background="@color/white"--> android:layout_width="wrap_content"
<!--android:src="@mipmap/but_plus"--> android:layout_height="wrap_content"
<!--tools:layout_editor_absoluteX="666dp"--> android:layout_marginTop="@dimen/all_padding"
<!--tools:layout_editor_absoluteY="97dp" />--> android:text="库存："
<!--</LinearLayout>--> android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint"
app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
<!--<TextView-->
<!--android:id="@+id/tv_stock_hint"--> <TextView
<!--android:layout_width="0dp"--> android:id="@+id/tv_stock"
<!--android:layout_height="wrap_content"--> style="@style/other_select_smallstyle"
<!--android:gravity="right"--> android:layout_width="wrap_content"
<!--android:text="库存："--> android:layout_height="wrap_content"
<!--android:textColor="@color/black"--> android:text="0个"
<!--android:textSize="@dimen/big_text_size"--> android:textStyle="bold"
<!--app:layout_constraintBottom_toTopOf="@id/linearLayout"--> app:layout_constraintBottom_toBottomOf="@id/tv_stock_hint"
<!--app:layout_constraintEnd_toStartOf="@id/tv_stock"--> app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"
<!--app:layout_constraintHorizontal_weight="1"--> app:layout_constraintTop_toTopOf="@id/tv_stock_hint" />
<!--app:layout_constraintStart_toStartOf="@id/guideline_center"-->
<!--app:layout_constraintTop_toTopOf="parent" />--> <TextView
android:id="@+id/tv_traffic_hint"
<!--<TextView--> style="@style/other_select_smallstyle"
<!--android:id="@+id/tv_stock"--> android:layout_width="wrap_content"
<!--android:layout_width="0dp"--> android:layout_height="wrap_content"
<!--android:layout_height="wrap_content"--> android:layout_marginStart="@dimen/all_margin_big"
<!--android:text="0个"--> android:text="在途："
<!--android:textColor="@color/black"--> android:textStyle="bold"
<!--android:textSize="@dimen/big_text_size"--> app:layout_constraintBottom_toBottomOf="@id/tv_stock"
<!--app:layout_constraintBottom_toTopOf="@id/linearLayout"--> app:layout_constraintStart_toEndOf="@id/tv_stock"
<!--app:layout_constraintEnd_toStartOf="@id/tv_traffic_hint"--> app:layout_constraintTop_toTopOf="@id/tv_stock" />
<!--app:layout_constraintHorizontal_weight="1"-->
<!--app:layout_constraintStart_toEndOf="@id/tv_stock_hint"--> <TextView
<!--app:layout_constraintTop_toTopOf="parent" />--> android:id="@+id/tv_traffic"
style="@style/other_select_smallstyle"
<!--<TextView--> android:layout_width="wrap_content"
<!--android:id="@+id/tv_traffic_hint"--> android:layout_height="wrap_content"
<!--android:layout_width="0dp"--> android:text="0个"
<!--android:layout_height="wrap_content"--> android:textStyle="bold"
<!--android:gravity="right"--> app:layout_constraintBottom_toBottomOf="@id/tv_traffic_hint"
<!--android:text="在途："--> app:layout_constraintStart_toEndOf="@id/tv_traffic_hint" />
<!--android:textColor="@color/black"-->
<!--android:textSize="@dimen/big_text_size"--> <TextView
<!--app:layout_constraintBottom_toTopOf="@id/linearLayout"--> android:id="@+id/tv_price_hint"
<!--app:layout_constraintEnd_toStartOf="@id/tv_traffic"--> style="@style/other_select_smallstyle"
<!--app:layout_constraintHorizontal_weight="1"--> android:layout_width="wrap_content"
<!--app:layout_constraintStart_toEndOf="@id/tv_stock"--> android:layout_height="wrap_content"
<!--app:layout_constraintTop_toTopOf="parent" />--> android:layout_marginTop="@dimen/all_padding"
android:text="进价："
<!--<TextView--> android:textStyle="bold"
<!--android:id="@+id/tv_traffic"--> app:layout_constraintStart_toStartOf="@id/tv_stock_hint"
<!--android:layout_width="0dp"--> app:layout_constraintTop_toBottomOf="@id/tv_stock_hint" />
<!--android:layout_height="wrap_content"-->
<!--android:text="0个"-->
<!--android:textColor="@color/black"-->
<!--android:textSize="@dimen/big_text_size"--> </android.support.constraint.ConstraintLayout>
<!--app:layout_constraintBottom_toTopOf="@id/linearLayout"-->
<!--app:layout_constraintEnd_toEndOf="parent"-->
<!--app:layout_constraintHorizontal_weight="1"-->
<!--app:layout_constraintStart_toEndOf="@id/tv_traffic_hint"-->
<!--app:layout_constraintTop_toTopOf="parent" />-->
<!--<android.support.constraint.Guideline-->
<!--android:id="@+id/guideline_center"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="vertical"-->
<!--app:layout_constraintGuide_percent="0.60" />-->
<!--</android.support.constraint.ConstraintLayout>-->
</android.support.v7.widget.CardView>
</layout> </layout>
\ No newline at end of file
app/src/main/res/values/dimens.xml
View file @ 2aba1a2e
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<dimen name="big_text_size">18sp</dimen> <dimen name="big_text_size">18sp</dimen>
<dimen name="sbig_text_size">25sp</dimen> <dimen name="sbig_text_size">25sp</dimen>
<dimen name="all_text_size">16sp</dimen> <dimen name="all_text_size">16sp</dimen>
<dimen name="all_text_size_small_title">17sp</dimen>
<dimen name="all_text_size_low">14sp</dimen> <dimen name="all_text_size_low">14sp</dimen>
<dimen name="all_text_size_small">12sp</dimen> <dimen name="all_text_size_small">12sp</dimen>
<dimen name="all_text_size_small_small">10sp</dimen> <dimen name="all_text_size_small_small">10sp</dimen>
......
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