From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java | 2 --
1 files changed, 0 insertions(+), 2 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 8219c57..ff9f698 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java
@@ -199,7 +199,6 @@
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) {
@@ -211,7 +210,6 @@
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);
}
--
Gitblit v1.8.0