From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 42 +++++-------------------------------------
1 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
old mode 100644
new mode 100755
index 742b6f6..55df661
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -83,9 +83,6 @@
public async void Read()
{
-
-
-
CommonPage.Loading.Start();
if (!BoolExist())
{
@@ -101,28 +98,8 @@
{
continue;
}
- bool yes = false;
- for (int a = 0; a < logic.Accounts.Count; a++)
- {
- //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
- if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
- {
- //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
- //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
- yes = false;
- break;
- }
- if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid)
- {
- //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
- yes = true;
- break;
- }
- }
- if (yes)
- {
- Common.Logic.LockLogicList.Add(listlogic[j]);
- }
+ Common.Logic.LockLogicList.Add(logic);
+
}
}
}
@@ -317,26 +294,17 @@
/// <returns></returns>
private bool Exist(Common.Logic logic)
{
- bool yes = false;
for (int j = 0; j < logic.Accounts.Count; j++)
{
//Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
- if (logic.Accounts[j]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
+ if (logic.Accounts[j]["Option4"].ToString() == Send.CurrentDoorLock.DeviceAddr)
{
//鏌ユ壘鏄惁鏄偅涓棬閿侊紱
//濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
- yes = false;
- break;
+ return true;
}
- if (logic.Accounts[j]["Account"].ToString() == Config.Instance.Guid)
- {
- //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
- yes = true;
- break;
- }
-
}
- return yes;
+ return false;
}
}
}
--
Gitblit v1.8.0