Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

 app/src/main/java/com/hdl/photovoltaic/ui/test/dialogs/DialogDeviceList.java

@@ -4,7 +4,12 @@
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.FrameLayout;

import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -13,6 +18,7 @@
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogDeviceListTestBinding;
import com.hdl.photovoltaic.ui.test.adapters.DeviceAdapter;
import com.hdl.photovoltaic.utils.UnitConversionUtils;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;

import java.util.List;
@@ -38,6 +44,16 @@
        super.onCreate(savedInstanceState);
        viewBinding = DialogDeviceListTestBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());
        Window window = getWindow();
        if (window != null) {
            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
            WindowManager.LayoutParams layoutParams = window.getAttributes();
            layoutParams.gravity = Gravity.TOP | Gravity.END;
            layoutParams.y = (int) UnitConversionUtils.dpToPx(mContext, 185 - 44);
            layoutParams.x = (int) UnitConversionUtils.dpToPx(mContext, 32);
//            layoutParams.width = (int) UnitConversionUtils.dpToPx(mContext, 100);
            window.setAttributes(layoutParams);
        }
        setDialogTouchOutsideCloseable(this);
        LinearLayoutManager linearLayout = new LinearLayoutManager(mContext);
        deviceAdapter = new DeviceAdapter(mList, mContext);