Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 app/src/main/java/com/hdl/photovoltaic/widget/DelayedConfirmationCancelDialog.java

@@ -11,12 +11,13 @@
import androidx.annotation.NonNull;

import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogConfirmCancelBinding;

/**
 * 延时确认框
 */
public class DelayedConfirmationCancelDialog extends Dialog {
public class DelayedConfirmationCancelDialog extends BaseDialog {
    public DelayedConfirmationCancelDialog(@NonNull Context context) {
        super(context, R.style.Custom_Dialog);
        this.mContext = context;
@@ -61,6 +62,19 @@
            viewBinding.loadingConfirmationTitleTv.setText(titleStr);
        }

    }

    /**
     * 隐藏自定义"标题"组件
     *
     * @param isHideTitle true 隐藏
     */
    public void isHideTitle(boolean isHideTitle) {
        if (isHideTitle) {
            if (viewBinding != null) {
                viewBinding.loadingConfirmationTitleTv.setVisibility(View.GONE);
            }
        }
    }

    /**
@@ -183,6 +197,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 +217,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;
//                }
            }
        };