Skip to content

T
TangKuPos
Commit a6323d0f authored by zhang_z's avatar zhang_z
Browse files
Options

Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos 

# Conflicts:
#	app/src/main/AndroidManifest.xml
parent f04be52d
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/PayAdapter.java
View file @ a6323d0f
...@@ -18,41 +18,41 @@ public class PayAdapter extends BaseAdapter<Pay, ItemPayBinding> { ...@@ -18,41 +18,41 @@ public class PayAdapter extends BaseAdapter<Pay, ItemPayBinding> {
@Override @Override
protected void convert(ItemPayBinding mViewBinding, Pay item) { protected void convert(ItemPayBinding mViewBinding, Pay item) {
// int resLogo, resBackground; int resLogo, resBackground;
// switch (item.getPayType()) { switch (item.getPayType()) {
// case C.PAY_CHANNEL.CASH: case C.PAY_CHANNEL.CASH:
// resLogo = R.mipmap.pay_cash; resLogo = R.mipmap.pay_cash;
// resBackground = R.color.red_diaochan; resBackground = R.color.red_diaochan;
// break; break;
// case C.PAY_CHANNEL.WECHAT: case C.PAY_CHANNEL.WECHAT:
// resLogo = R.mipmap.pay_wechat; resLogo = R.mipmap.pay_wechat;
// resBackground = R.color.green_kongrun; resBackground = R.color.green_kongrun;
// break; break;
// case C.PAY_CHANNEL.ALI: case C.PAY_CHANNEL.ALI:
// resLogo = R.mipmap.pay_alipay; resLogo = R.mipmap.pay_alipay;
// resBackground = R.color.blue_yuefei; resBackground = R.color.blue_yuefei;
// break; break;
// case C.PAY_CHANNEL.BANK: case C.PAY_CHANNEL.BANK:
// resLogo = R.mipmap.pay_card; resLogo = R.mipmap.pay_card;
// resBackground = R.color.cyan_liubei; resBackground = R.color.cyan_liubei;
// break; break;
// case C.PAY_CHANNEL.CARD: case C.PAY_CHANNEL.CARD:
// resLogo = R.mipmap.pay_membershipcard; resLogo = R.mipmap.pay_membershipcard;
// resBackground = R.color.yellow_huangxin; resBackground = R.color.yellow_huangxin;
// break; break;
// case C.PAY_CHANNEL.TALLY: case C.PAY_CHANNEL.TALLY:
// resLogo = R.mipmap.pay_credit; resLogo = R.mipmap.pay_credit;
// resBackground = R.color.purple_yanqing; resBackground = R.color.purple_yanqing;
// break; break;
// default: default:
// resLogo = R.mipmap.pay_cash; resLogo = R.mipmap.pay_cash;
// resBackground = R.color.red_diaochan; resBackground = R.color.red_diaochan;
// break; break;
// } }
// mViewBinding.ivLogo.setImageResource(resLogo); mViewBinding.ivLogo.setImageResource(resLogo);
//
// GenericDraweeHierarchy hierarchy = mViewBinding.ivBackground.getHierarchy(); GenericDraweeHierarchy hierarchy = mViewBinding.ivBackground.getHierarchy();
// hierarchy.setBackgroundImage(mContext.getResources().getDrawable(resBackground)); hierarchy.setBackgroundImage(mContext.getResources().getDrawable(resBackground));
// mViewBinding.ivBackground.setHierarchy(hierarchy); mViewBinding.ivBackground.setHierarchy(hierarchy);
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/CashPayFragment.java
View file @ a6323d0f
...@@ -59,7 +59,7 @@ public class CashPayFragment extends BaseFragment<SettlePresenter, FragmentPayCa ...@@ -59,7 +59,7 @@ public class CashPayFragment extends BaseFragment<SettlePresenter, FragmentPayCa
* @param payAmt 实付价格 * @param payAmt 实付价格
*/ */
private void clickSettle(Long payAmt) { private void clickSettle(Long payAmt) {
if (payAmt - mOrderAmt > 0) { if (payAmt - mOrderAmt >= 0) {
mPresenter.payInCash(payAmt, payAmt - mOrderAmt); mPresenter.payInCash(payAmt, payAmt - mOrderAmt);
} }
} }
......
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