From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java
index 4afe44c..f398dc6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java
@@ -4,11 +4,17 @@
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
+import android.view.Gravity;
+import android.view.MotionEvent;
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.utils.UnitConversionUtils;
import com.jaeger.library.StatusBarUtil;
public class BaseDialog extends Dialog {
@@ -18,8 +24,21 @@
public BaseDialog(@NonNull Context context, int themeResId) {
super(context, themeResId);
this.mContext = context;
- setStatusBarTextColor();
- setNotificationBarBackgroundColor(CustomColor.white);
+// setStatusBarTextColor();
+// setNotificationBarBackgroundColor(CustomColor.white);
+ // 璁剧疆Dialog鐨刉indow灞炴��
+ 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;
+// layoutParams.y = (int) UnitConversionUtils.dpToPx(context, 125-44);
+// window.setAttributes(layoutParams);
+ }
+ setCanceledOnTouchOutside(true);
+
+
+
}
@@ -55,4 +74,6 @@
}
+
+
}
--
Gitblit v1.8.0