|
@@ -113,28 +113,35 @@ public class ScanCodePayActivity extends BaseActivity {
|
|
|
tx_pay_result_money.setText("共" + total + "张,合计¥" + payAmount);
|
|
|
}
|
|
|
|
|
|
- private void jumpToLogin(){
|
|
|
+ private void jumpToMain(){
|
|
|
stopCountDownTimer();
|
|
|
- ActivityUtils.activityFinish(ScanCodePayActivity.this, true);
|
|
|
+ Intent i = new Intent (this , MainActivity.class )
|
|
|
+ .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
|
+ startActivity(i);
|
|
|
}
|
|
|
+
|
|
|
private void stopCountDownTimer(){
|
|
|
if (timer != null){
|
|
|
timer.cancel();
|
|
|
+ timer = null;
|
|
|
}
|
|
|
}
|
|
|
private void startCountDownTimer(){
|
|
|
- timer = new CountDownTimer(COUNTDOWN_TIME, 1000) {
|
|
|
- @SuppressLint("SetTextI18n")
|
|
|
- @Override
|
|
|
- public void onTick(long millisUntilFinished) {
|
|
|
- titleBar.setRightTitle(millisUntilFinished / 1000 + "s");
|
|
|
- }
|
|
|
+ if (timer == null){
|
|
|
+ timer = new CountDownTimer(COUNTDOWN_TIME, 1000) {
|
|
|
+ @SuppressLint("SetTextI18n")
|
|
|
+ @Override
|
|
|
+ public void onTick(long millisUntilFinished) {
|
|
|
+ titleBar.setRightTitle(millisUntilFinished / 1000 + "s");
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onFinish() {
|
|
|
+ jumpToMain();
|
|
|
+ }
|
|
|
+ };
|
|
|
+ timer.start();
|
|
|
+ }
|
|
|
|
|
|
- @Override
|
|
|
- public void onFinish() {
|
|
|
- jumpToLogin();
|
|
|
- }
|
|
|
- };
|
|
|
- timer.start();
|
|
|
}
|
|
|
}
|