From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

---
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 79ba027..7c8bd89 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -262,7 +262,10 @@
                 var accounts = new Dictionary<string, string>();
                 accounts.Add("Type", "1");
                 accounts.Add("Account", Config.Instance.Guid);
-                accounts.Add("AccountName",accountName);
+                accounts.Add("AccountName",accountName);
+                ///mac+绔彛鏄负璇嗗埆鏄偅涓棬閿�;
+                accounts.Add("MacAddr", Send.CurrentDoorLock.DeviceAddr);
+                accounts.Add("Epoint", Send.CurrentDoorLock.DeviceEpoint.ToString());
                 accounts.Add("UserId", userId);
                 if (SelectedDeviceStatuscondition != "")
                 {

--
Gitblit v1.8.0