From d5b9ff8bf8cc36f5b13c46b66682f5988d3a6f36 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期五, 15 五月 2020 11:36:11 +0800 Subject: [PATCH] 2020-05-15-1 --- ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 53 ++++++++++++++++++++++++++--------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs index a2e99ab..5832fec 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs @@ -98,33 +98,32 @@ { continue; } - bool yes = false; - for (int a = 0; a < logic.Accounts.Count; a++) - { - //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙o紱 - if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString()) - { - //鏌ユ壘鏄惁鏄偅涓棬閿侊紱 - //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵; - yes = false; - - } - else - { - yes = true; - - } - //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); + //bool yes = false; + //for (int a = 0; a < logic.Accounts.Count; a++) + //{ + // //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙o紱 + // if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString()) + // { + // //鏌ユ壘鏄惁鏄偅涓棬閿侊紱 + // //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵; + // yes = false; + // } + // else + // { + // yes = true; + // } + // //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid) + // //{ + // // //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛� + // // yes = true; + // // break; + // //} + //} + //if (yes) + //{ + // Common.Logic.LockLogicList.Add(listlogic[j]); + //} } } } -- Gitblit v1.8.0