Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

 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);
            }