Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

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

@@ -4,30 +4,45 @@
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;

import androidx.annotation.NonNull;

import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogStaticListBinding;
import com.hdl.photovoltaic.utils.UnitConversionUtils;

/**
 * 静态列表弹窗
 */
public class ListStaticDialog extends Dialog {
public class ListStaticDialog extends BaseDialog {
    private onNoListener onNoOnclickListener;
    private onHDLChinaListener onHDLChinaListener;
    private onHDLBahrainListener onHDLBahrainListener;
    private DialogStaticListBinding viewBinding;
    private String contentStr1, contentStr2;
    private Context mContext;

    public ListStaticDialog(@NonNull Context context) {
        super(context, R.style.Custom_Dialog);
        super(context, R.style.DefaultFilteringDialog);
        mContext = context;
    }

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        Window window = getWindow();
        if (window != null) {
            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
            WindowManager.LayoutParams layoutParams = window.getAttributes();
            layoutParams.gravity = Gravity.BOTTOM|Gravity.START|Gravity.END;
            window.setAttributes(layoutParams);
        }
        viewBinding = DialogStaticListBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());
        initData();