Commit 9d1c7413 authored by zhang_z's avatar zhang_z

提交修改;

parent 341c51ce
...@@ -138,27 +138,41 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle ...@@ -138,27 +138,41 @@ 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:
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT); switch (C.PAY_SYSTEM.CURRENT) {
mViewBinding.tvTitle.setText(R.string.settle_channel_ali); case C.PAY_SYSTEM.PAX.API:
mScanFragment.setOnScanCompletedListener(barcode -> { this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
this.pop(); mViewBinding.tvTitle.setText(R.string.settle_channel_ali);
mPresenter.payInAli(barcode); mScanFragment.setOnScanCompletedListener(barcode -> {
}); this.pop();
mScanFragment.setOnBackPressedListener(this::backToSettleFragment); mPresenter.payInAli(barcode);
this.start(mScanFragment); });
mScanFragment.setOnBackPressedListener(this::backToSettleFragment);
this.start(mScanFragment);
break;
case C.PAY_SYSTEM.PAX.APP:
mPresenter.payInAli(null);
break;
}
break; break;
case C.PAY_CHANNEL.WECHAT: case C.PAY_CHANNEL.WECHAT:
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT); switch (C.PAY_SYSTEM.CURRENT) {
mViewBinding.tvTitle.setText(R.string.settle_channel_wechat); case C.PAY_SYSTEM.PAX.API:
mScanFragment.setOnScanCompletedListener(barcode -> { this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
this.pop(); mViewBinding.tvTitle.setText(R.string.settle_channel_wechat);
mPresenter.payInWechat(barcode); mScanFragment.setOnScanCompletedListener(barcode -> {
}); this.pop();
mScanFragment.setOnBackPressedListener(this::backToSettleFragment); mPresenter.payInWechat(barcode);
this.start(mScanFragment); });
mScanFragment.setOnBackPressedListener(this::backToSettleFragment);
this.start(mScanFragment);
break;
case C.PAY_SYSTEM.PAX.APP:
mPresenter.payInWechat(null);
break;
}
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