Merge branch 'wjc_new' into develop_new

mac

2024-05-30 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f

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

@@ -14,13 +14,14 @@
import androidx.constraintlayout.widget.ConstraintSet;

import com.hdl.photovoltaic.R;
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_Dialog);