Commit 9d1c7413 authored by zhang_z's avatar zhang_z

提交修改;

parent 341c51ce
...@@ -138,9 +138,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle ...@@ -138,9 +138,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
mPasswordDialog.setSaleorder(saleorder).show(this); mPasswordDialog.setSaleorder(saleorder).show(this);
break; break;
case C.PAY_CHANNEL.BANK: case C.PAY_CHANNEL.BANK:
// mPresenter.payInBank(); mPresenter.payInBank();
break; break;
case C.PAY_CHANNEL.ALI: case C.PAY_CHANNEL.ALI:
switch (C.PAY_SYSTEM.CURRENT) {
case C.PAY_SYSTEM.PAX.API:
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT); this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.settle_channel_ali); mViewBinding.tvTitle.setText(R.string.settle_channel_ali);
mScanFragment.setOnScanCompletedListener(barcode -> { mScanFragment.setOnScanCompletedListener(barcode -> {
...@@ -150,7 +152,14 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle ...@@ -150,7 +152,14 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
mScanFragment.setOnBackPressedListener(this::backToSettleFragment); mScanFragment.setOnBackPressedListener(this::backToSettleFragment);
this.start(mScanFragment); this.start(mScanFragment);
break; break;
case C.PAY_SYSTEM.PAX.APP:
mPresenter.payInAli(null);
break;
}
break;
case C.PAY_CHANNEL.WECHAT: case C.PAY_CHANNEL.WECHAT:
switch (C.PAY_SYSTEM.CURRENT) {
case C.PAY_SYSTEM.PAX.API:
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT); this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.settle_channel_wechat); mViewBinding.tvTitle.setText(R.string.settle_channel_wechat);
mScanFragment.setOnScanCompletedListener(barcode -> { mScanFragment.setOnScanCompletedListener(barcode -> {
...@@ -160,6 +169,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle ...@@ -160,6 +169,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
mScanFragment.setOnBackPressedListener(this::backToSettleFragment); mScanFragment.setOnBackPressedListener(this::backToSettleFragment);
this.start(mScanFragment); this.start(mScanFragment);
break; break;
case C.PAY_SYSTEM.PAX.APP:
mPresenter.payInWechat(null);
break;
}
break;
} }
} }
......
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