From 6ec45c8853d3cb6a592ecbe1d062094a77653b0f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 01 四月 2024 13:10:51 +0800
Subject: [PATCH] 2024年04月01日13:10:42

---
 app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
index 359d7e5..9621ecf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
@@ -183,6 +183,17 @@
         timer = new CountDownTimer(seconds * 1000, 1000) { // 璁剧疆鍊掕鏃朵负3绉掞紙鍗曚綅锛氭绉掞級
             public void onTick(long millisUntilFinished) {
                 int secondsRemaining = (int) (millisUntilFinished / 1000);
+                if (secondsRemaining == 0) {
+                    viewBinding.dialogConfirmTv.setText(mContext.getString(R.string.loading_affirm));
+                    viewBinding.dialogConfirmTv.setTextColor(Color.parseColor("#38C494"));
+                    viewBinding.dialogConfirmLy.setEnabled(true);
+                    viewBinding.dialogConfirmTv.setEnabled(true);
+                    if (timer != null) {
+                        timer.cancel();
+                        timer = null;
+                    }
+                    return;
+                }
                 String timeLeft = "(" + secondsRemaining + ")";
                 String text = mContext.getString(R.string.loading_affirm) + timeLeft;
                 viewBinding.dialogConfirmTv.setText(text);
@@ -192,14 +203,14 @@
             }
 
             public void onFinish() {
-                viewBinding.dialogConfirmTv.setText(mContext.getString(R.string.loading_affirm));
-                viewBinding.dialogConfirmTv.setTextColor(Color.parseColor("#38C494"));
-                viewBinding.dialogConfirmLy.setEnabled(true);
-                viewBinding.dialogConfirmTv.setEnabled(true);
-                if (timer != null) {
-                    timer.cancel();
-                    timer = null;
-                }
+//                viewBinding.dialogConfirmTv.setText(mContext.getString(R.string.loading_affirm));
+//                viewBinding.dialogConfirmTv.setTextColor(Color.parseColor("#38C494"));
+//                viewBinding.dialogConfirmLy.setEnabled(true);
+//                viewBinding.dialogConfirmTv.setEnabled(true);
+//                if (timer != null) {
+//                    timer.cancel();
+//                    timer = null;
+//                }
             }
         };
 

--
Gitblit v1.8.0