From 98c998ca98ee014266f65a517d672df0cd97f244 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 25 三月 2020 17:51:18 +0800
Subject: [PATCH] 2020-03-25-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
old mode 100755
new mode 100644
index 76e071f..fe3f767
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -364,7 +364,8 @@
lockConditionsInfo.Add("Range", "0");
var accounts = new Dictionary<string, string>();
accounts.Add("Type", "1");
- accounts.Add("Account", membershipIfon.UserName + modeName);
+ accounts.Add("Account", Config.Instance.Guid);
+ accounts.Add("AccountName", membershipIfon.UserName + modeName);
accounts.Add("UserId", attriButeData2);
if (SelectedLockStatus != "")
{
@@ -386,10 +387,6 @@
}
}
}
- if (!addCondition)
- {
- Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
- }
for (int i = 0; i < Common.Logic.CurrentLogic.Accounts.Count; i++)
{
@@ -402,8 +399,12 @@
}
}
}
+ if (!addCondition)
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
+ Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
+ }
if (!addAccount)
- {
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
Common.Logic.CurrentLogic.Accounts.Add(accounts);
}
}
--
Gitblit v1.8.0