From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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..ff9f698 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
@@ -11,12 +11,13 @@
import androidx.annotation.NonNull;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogConfirmCancelBinding;
/**
* 寤舵椂纭妗�
*/
-public class DelayedConfirmationCancelDialog extends Dialog {
+public class DelayedConfirmationCancelDialog extends BaseDialog {
public DelayedConfirmationCancelDialog(@NonNull Context context) {
super(context, R.style.Custom_Dialog);
this.mContext = context;
@@ -61,6 +62,19 @@
viewBinding.loadingConfirmationTitleTv.setText(titleStr);
}
+ }
+
+ /**
+ * 闅愯棌鑷畾涔�"鏍囬"缁勪欢
+ *
+ * @param isHideTitle true 闅愯棌
+ */
+ public void isHideTitle(boolean isHideTitle) {
+ if (isHideTitle) {
+ if (viewBinding != null) {
+ viewBinding.loadingConfirmationTitleTv.setVisibility(View.GONE);
+ }
+ }
}
/**
@@ -183,23 +197,32 @@
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.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);
- viewBinding.dialogConfirmTv.setTextColor(Color.parseColor("#C2EDDE"));
viewBinding.dialogConfirmLy.setEnabled(false);
viewBinding.dialogConfirmTv.setEnabled(false);
}
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