yinds преди 2 дни
родител
ревизия
0afdb96d65

+ 7 - 3
app/src/main/java/com/hw/nativeapp/ui/activity/PaymentMethodActivity.java

@@ -317,10 +317,14 @@ public class PaymentMethodActivity extends BaseActivity  {
         orderTimer.start();
     }
 
-    private void jumpToLogin(){
+
+    private void jumpToMain(){
         stopCountDownTimer();
-        ActivityUtils.activityFinish(PaymentMethodActivity.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();
@@ -337,7 +341,7 @@ public class PaymentMethodActivity extends BaseActivity  {
 
             @Override
             public void onFinish() {
-                jumpToLogin();
+                jumpToMain();
             }
         };
         timer.start();

+ 21 - 14
app/src/main/java/com/hw/nativeapp/ui/activity/ScanCodePayActivity.java

@@ -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();
     }
 }