From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/test/dialogs/DialogDeviceList.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/dialogs/DialogDeviceList.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/dialogs/DialogDeviceList.java
index f9b72cd..1d40ac1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/dialogs/DialogDeviceList.java
+++ b/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);
--
Gitblit v1.8.0