Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -44,21 +44,21 @@
    private String mStateValue = GridType.All;

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

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());
        Window window = getWindow();
        if (window != null) {
            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
            window.setGravity(Gravity.BOTTOM);
        }
        viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());

//        setCanceledOnTouchOutside(false);
        //初始化界面控件
        initView();
        //初始化界面数据