From 162ca0f6633f3aa246a40e8ba3d3e9a54f3a4cb5 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期六, 11 五月 2024 14:45:21 +0800
Subject: [PATCH] 依赖1.0.21 sdk，解决数据乱的问题
---
app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 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 f260d96..9621ecf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
@@ -24,8 +24,8 @@
CountDownTimer timer;
private final Context mContext;
- private ConfirmationCancelDialog.onNoOnclickListener noOnclickListener;//鍙栨秷鎸夐挳琚偣鍑讳簡鐨勭洃鍚櫒
- private ConfirmationCancelDialog.onYesOnclickListener yesOnclickListener;//纭畾鎸夐挳琚偣鍑讳簡鐨勭洃鍚櫒
+ private onNoOnclickListener noOnclickListener;//鍙栨秷鎸夐挳琚偣鍑讳簡鐨勭洃鍚櫒
+ private onYesOnclickListener yesOnclickListener;//纭畾鎸夐挳琚偣鍑讳簡鐨勭洃鍚櫒
private DialogConfirmCancelBinding viewBinding;
private String titleStr, contentStr, yesStr, noStr;
@@ -52,7 +52,7 @@
*
* @param title 鍐呭
*/
- public void setTitle(String title) {
+ public void setTitleContent(String title) {
if (TextUtils.isEmpty(title)) {
return;
}
@@ -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;
+// }
}
};
@@ -212,7 +223,7 @@
*
* @param onNoOnclickListener -
*/
- public void setNoOnclickListener(ConfirmationCancelDialog.onNoOnclickListener onNoOnclickListener) {
+ public void setNoOnclickListener(onNoOnclickListener onNoOnclickListener) {
if (onNoOnclickListener != null) {
this.noOnclickListener = onNoOnclickListener;
}
@@ -223,7 +234,7 @@
*
* @param yesOnclickListener -
*/
- public void setYesOnclickListener(ConfirmationCancelDialog.onYesOnclickListener yesOnclickListener) {
+ public void setYesOnclickListener(onYesOnclickListener yesOnclickListener) {
if (yesOnclickListener != null) {
this.yesOnclickListener = yesOnclickListener;
}
--
Gitblit v1.8.0