From 34b65350abbb8b740b9c3bc0b43254cbbe23fcb5 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 09:31:44 +0800
Subject: [PATCH] 合并代码,更改面板目标信息

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
old mode 100644
new mode 100755
index 37af7b7..2364376
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -73,7 +73,7 @@
             EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
             {
                 RemoveFromParent();
-
+                UserDoorLockPage.canShowDialog = true;
                 //鏆傛椂涓嶈�冭檻涓嬬骇鐣岄潰绛夋帹閫佸鑷村父寮�妯″紡澶辨晥鐨勯棶棰�
                 //var userDoorLockPage = new UserDoorLockPage(currentRoom, deviceUI);
                 //HomePage.Instance.AddChidren(userDoorLockPage);
@@ -252,7 +252,7 @@
                 }
             };
         }
-        #endregion 
+        #endregion
 
         #region  娣诲姞鍏ㄩ儴鑿滃崟 
         /// <summary>

--
Gitblit v1.8.0