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/widget/ConfirmationCancelDialog.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
index 2928c1b..5d64da3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
@@ -39,7 +39,7 @@
 
 //        setCancelable(true);//绯荤粺鍚庨��鍙互鍙栨秷
         //绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
-//        setCanceledOnTouchOutside(false);
+        setCanceledOnTouchOutside(false);
         //鍒濆鍖栫晫闈㈡帶浠�
         initView();
         //鍒濆鍖栫晫闈㈡暟鎹�

--
Gitblit v1.8.0