From 2c62031554742600f735baf74ea6a5776a1093a9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 22 五月 2024 11:47:40 +0800
Subject: [PATCH] Merge branch 'feature/hxb' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
index 3b17eeb..c0f7fed 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
@@ -67,38 +67,39 @@
@Override
protected void onStart() {
super.onStart();
- // 鑾峰彇绐楀彛瀵硅薄
- Window dialogWindow = this.getWindow();
- if (dialogWindow != null) {
- // 鑾峰彇瀵硅瘽妗嗗綋鍓嶇殑鍙傛暟鍊�
- WindowManager.LayoutParams p = dialogWindow.getAttributes();
- p.width = LinearLayout.LayoutParams.MATCH_PARENT;
- p.height = LinearLayout.LayoutParams.WRAP_CONTENT;
- p.dimAmount = 0.6f;
- dialogWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
- p.gravity = Gravity.BOTTOM;
- p.y = DensityUtils.dip2px(mContext, 70);
-// //杩欓噷璁剧疆鐨勫楂樹紭鍏堢骇楂樹簬XML涓殑甯冨眬璁剧疆
-// if (this.enumBoxType == BoxType.PhotoAlbumBox) {
-// p.gravity = Gravity.BOTTOM;
-// } else if (this.enumBoxType == BoxType.FlashingBox) {
-// p.dimAmount = 0f;
-// }
- // 璁剧疆鍒板睘鎬ч厤缃腑
- dialogWindow.setAttributes(p);
- }
+// // 鑾峰彇绐楀彛瀵硅薄
+// Window dialogWindow = this.getWindow();
+// if (dialogWindow != null) {
+// // 鑾峰彇瀵硅瘽妗嗗綋鍓嶇殑鍙傛暟鍊�
+// WindowManager.LayoutParams p = dialogWindow.getAttributes();
+// p.width = LinearLayout.LayoutParams.MATCH_PARENT;
+// p.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+//// p.dimAmount = 0.6f;
+// dialogWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+// p.gravity = Gravity.BOTTOM;
+// p.y = DensityUtils.dip2px(mContext, 352);
+//// //杩欓噷璁剧疆鐨勫楂樹紭鍏堢骇楂樹簬XML涓殑甯冨眬璁剧疆
+//// if (this.enumBoxType == BoxType.PhotoAlbumBox) {
+//// p.gravity = Gravity.BOTTOM;
+//// } else if (this.enumBoxType == BoxType.FlashingBox) {
+//// p.dimAmount = 0f;
+//// }
+// // 璁剧疆鍒板睘鎬ч厤缃腑
+// dialogWindow.setAttributes(p);
+// }
+// setDialogTouchOutsideCloseable(this);
}
@SuppressLint("ClickableViewAccessibility")
public void setDialogTouchOutsideCloseable(Dialog dialog) {
- viewBinding.getRoot().setOnClickListener(new View.OnClickListener() {
+ viewBinding.typeParentCl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- int top = viewBinding.typeParentCl.getTop();
- int left = viewBinding.typeParentCl.getLeft();
- int bottom = viewBinding.typeParentCl.getBottom();
- int right = viewBinding.typeParentCl.getRight();
+ int top = viewBinding.dialogParentCl.getTop();
+ int left = viewBinding.dialogParentCl.getLeft();
+ int bottom = viewBinding.dialogParentCl.getBottom();
+ int right = viewBinding.dialogParentCl.getRight();
int y = (int) v.getY();
int x = (int) v.getX();
if (top < y && y < bottom) {
--
Gitblit v1.8.0