Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

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

@@ -8,36 +8,36 @@
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
import android.view.View;
import android.widget.FrameLayout;

import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.constraintlayout.widget.ConstraintSet;

import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.databinding.LoadingConfirmInputBinding;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogConfirmInputBinding;
import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;

/**
 * 输入确认框
 */
public class ConfirmationInputDialog extends Dialog {
public class ConfirmationInputDialog extends BaseDialog {

    public ConfirmationInputDialog(@NonNull Context context) {
        super(context, R.style.Custom_AlertDialog);
        super(context, R.style.Custom_Dialog);
        this.mContext = context;
    }

    private final Context mContext;
    private onNoOnclickListener noOnclickListener;//取消按钮被点击了的监听器
    private onYesOnclickListener yesOnclickListener;//确定按钮被点击了的监听器
    private LoadingConfirmInputBinding viewBinding;
    private String titleStr, yesStr, noStr;
    private DialogConfirmInputBinding viewBinding;
    private String titleStr, yesStr, noStr,edit_content;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        viewBinding = LoadingConfirmInputBinding.inflate(getLayoutInflater());
        viewBinding = DialogConfirmInputBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());
//        setCancelable(true);//系统后退可以取消
        //空白处不能取消动画
@@ -100,6 +100,22 @@
    }

    /**
     * 输入框内容
     *
     * @param edit_content 输入框内容
     */
    public void setEditContent(String edit_content) {
        if (TextUtils.isEmpty(edit_content)) {
            return;
        }
        this.edit_content = edit_content;
        if (viewBinding != null) {
            viewBinding.loadingConfirmationInputEt.setText(edit_content);
        }

    }

    /**
     * 自定义"确认"文本
     *
     * @param confirm 内容
@@ -152,21 +168,11 @@
            }
        });


        viewBinding.loadingConfirmationClickTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                v.setSelected(!v.isSelected());
                if (v.isSelected()) {
                    viewBinding.loadingConfirmationInputEt.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
                    viewBinding.loadingConfirmationHideIv.setImageDrawable(AppCompatResources.getDrawable(mContext, R.drawable.show));
                } else {
                    viewBinding.loadingConfirmationInputEt.setTransformationMethod(PasswordTransformationMethod.getInstance());
                    viewBinding.loadingConfirmationHideIv.setImageDrawable(AppCompatResources.getDrawable(mContext, R.drawable.hide));
                }
                //设置光标位置
                viewBinding.loadingConfirmationInputEt.setSelection(viewBinding.loadingConfirmationInputEt.getText().length());

                //一键清空文本
                viewBinding.loadingConfirmationInputEt.setText("");
            }
        });
    }
@@ -190,6 +196,9 @@
        if (!TextUtils.isEmpty(noStr)) {
            viewBinding.dialogCancelTv.setText(noStr);
        }
        if (!TextUtils.isEmpty(edit_content)) {
            viewBinding.loadingConfirmationInputEt.setText(edit_content);
        }
    }

    private void initView() {