From 3aa86eda8f416bec308d065689d39c847d2d9cc7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 30 一月 2024 19:48:26 +0800
Subject: [PATCH] 2024年01月30日19:44:13

---
 app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java |   87 ++++++++++++++++++++++---------------------
 1 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
index db80f22..291350a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
@@ -1,5 +1,6 @@
 package com.hdl.photovoltaic.widget;
 
+import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
@@ -48,29 +49,13 @@
         this.mContext = context;
     }
 
-    @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.gravity = Gravity.TOP;
-            // 璁剧疆鍒板睘鎬ч厤缃腑
-            dialogWindow.setAttributes(p);
-        }
-    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         viewBinding = DialogListBinding.inflate(getLayoutInflater());
         setContentView(viewBinding.getRoot());
-        this.setCanceledOnTouchOutside(true);
-//        setDialogTouchOutsideCloseable(this);
+        setDialogTouchOutsideCloseable(this);
         initData();
         LinearLayoutManager linearLayout = new LinearLayoutManager(mContext);
         listDialogAdapter = new ListDialogAdapter(this.list, mContext);
@@ -154,40 +139,56 @@
     }
 
 
+    @SuppressLint("ClickableViewAccessibility")
     public void setDialogTouchOutsideCloseable(Dialog dialog) {
-        viewBinding.getRoot().setOnTouchListener(new View.OnTouchListener() {
+//        viewBinding.getRoot().setOnTouchListener(new View.OnTouchListener() {
+//
+//            @Override
+//            public boolean onTouch(View v, MotionEvent event) {
+//                int top = viewBinding.dialogParent.getTop();
+//                int left = viewBinding.dialogParent.getLeft();
+//                int bottom = viewBinding.dialogParent.getBottom();
+//                int right = viewBinding.dialogParent.getRight();
+//                int y = (int) event.getY();
+//                int x = (int) event.getX();
+//                if (event.getAction() == MotionEvent.ACTION_UP) {
+//                    if (top < y && y < bottom) {
+//
+//                    } else {
+//                        dismiss();
+//                    }
+//
+//                    if (left < x && x < right) {
+//
+//                    } else {
+//                        dismiss();
+//                    }
+//
+//
+//                }
+//                return true;
+//            }
+//        });
+        viewBinding.getRoot().setOnClickListener(new View.OnClickListener() {
             @Override
-            public boolean onTouch(View v, MotionEvent event) {
+            public void onClick(View v) {
                 int top = viewBinding.dialogParent.getTop();
                 int left = viewBinding.dialogParent.getLeft();
                 int bottom = viewBinding.dialogParent.getBottom();
                 int right = viewBinding.dialogParent.getRight();
-                int y = (int) event.getY();
-                int x = (int) event.getX();
-                if (event.getAction() == MotionEvent.ACTION_UP) {
-                    if (top < y && y < bottom) {
-
-                    } else {
-                        dismiss();
-                    }
-
-                    if (left < x && x < right) {
-
-                    } else {
-                        dismiss();
-                    }
-
-
+                int y = (int) v.getY();
+                int x = (int) v.getX();
+                if (top < y && y < bottom) {
+                } else {
+                    dismiss();
                 }
-                return true;
+                if (left < x && x < right) {
+
+                } else {
+                    dismiss();
+                }
+
             }
         });
-//        Window window = dialog.getWindow();
-//        WindowManager.LayoutParams params = window.getAttributes();
-//        params.width = ViewGroup.LayoutParams.MATCH_PARENT;
-//        params.height = ViewGroup.LayoutParams.MATCH_PARENT;
-//        window.setAttributes(params);
-//        //绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
-//        setCanceledOnTouchOutside(true);
     }
 }

--
Gitblit v1.8.0