From 971a24a9e58a21bc306897fd3ad63012a399f7db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 23 五月 2025 14:07:18 +0800
Subject: [PATCH] Merge branch '1.2.1' into 1.2.0_google
---
app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java | 3 +++
1 files changed, 3 insertions(+), 0 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 ff9f698..4074faa 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
@@ -201,6 +201,7 @@
viewBinding.dialogConfirmTv.setText(mContext.getString(R.string.loading_affirm));
viewBinding.dialogConfirmLy.setEnabled(true);
viewBinding.dialogConfirmTv.setEnabled(true);
+ viewBinding.dialogConfirmTv.setTextColor(getContext().getColor(R.color.text_FFACACAC));
if (timer != null) {
timer.cancel();
timer = null;
@@ -209,6 +210,8 @@
}
String timeLeft = "(" + secondsRemaining + ")";
String text = mContext.getString(R.string.loading_affirm) + timeLeft;
+ viewBinding.dialogConfirmTv.setTextColor(getContext().getColor(R.color.text_FF5B5B5B));
+// viewBinding.dialogConfirmTv.setTextColor(getContext().getColor(R.color.text_245EC3));
viewBinding.dialogConfirmTv.setText(text);
viewBinding.dialogConfirmLy.setEnabled(false);
viewBinding.dialogConfirmTv.setEnabled(false);
--
Gitblit v1.8.0