From 7dd4be37cdedaf81ad40990d8cb8dce164d83f4d Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 19 五月 2020 10:31:16 +0800 Subject: [PATCH] 34444444 --- ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 24 +++++------------------- 1 files changed, 5 insertions(+), 19 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs index 8790293..6e7edf2 100755 --- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs @@ -98,22 +98,20 @@ { continue; } - 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()) + // if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr) // { // //鏌ユ壘鏄惁鏄偅涓棬閿侊紱 // //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵; // yes = false; - // } // else // { // yes = true; - // } // //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid) // //{ @@ -320,29 +318,17 @@ /// <returns></returns> private bool Exist(Common.Logic logic) { - bool yes = false; for (int j = 0; j < logic.Accounts.Count; j++) { //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙o紱 - 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; + return true; } - else - { - yes = true; - } - //if (logic.Accounts[j]["Account"].ToString() == Config.Instance.Guid) - //{ - // //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛� - // yes = true; - // break; - //} - } - return yes; + return false; } } } -- Gitblit v1.8.0