Merge branch '1.2.1' into 1.2.0_google

wjc

2025-05-23 971a24a9e58a21bc306897fd3ad63012a399f7db

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