From ca233e3c6154859a17948d892fbc6bbf723b60a8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 29 五月 2020 15:47:30 +0800
Subject: [PATCH] 发布的1.0.20052901

---
 ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 63c7c0b..ac89df4 100644
--- a/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -621,7 +621,7 @@
                             //鏇存柊闂ㄩ攣娑夊強鐨勫父寮�/甯稿叧鐨勭晫闈�
                             if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)
                             {
-                                UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(device.DeviceAddr + device.DeviceEpoint, true);
+                                UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(device.DeviceAddr, true);
                             }
                         });
                     }
@@ -845,16 +845,13 @@
                             {
                                 //鎻愮ず闂ㄩ攣宸茬粡澶辨晥
                                 new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NormallyClosed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+
+                                //鏇存柊闂ㄩ攣娑夊強鐨勫父寮�/甯稿叧鐨勭晫闈�
+                                if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)
+                                {
+                                    UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(deviceAddr, false);
+                                }
                             });
-
-                            //鏇存柊闂ㄩ攣鐨勬繁搴︽帶鍒堕〉
-                            ControlCommonResourse.UpdateDoorLockStatusAction?.Invoke(false);
-
-                            //閫昏緫鎵ц鐨勫け鏁堣鏇存柊鐘舵��
-                            if (DoorLock.DoorLockCommonInfo.LogicAction != null)
-                            {
-                                DoorLock.DoorLockCommonInfo.LogicAction(false);
-                            }
                         });
                     }
                 }

--
Gitblit v1.8.0