2020-05-18-2

陈嘉乐

2020-05-18 5da99fed2eb0d08b6338064da5f998891252c7b8

 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs

@@ -725,6 +725,7 @@
            actionsInfo.Add("PassData", "055704010113");//默认门锁常关

            Dictionary<string, string> accounts = new Dictionary<string, string>();
            accounts.Add("Type", "8");
            accounts.Add("Option4", common.DeviceAddr.ToString());//用于判断识别是哪个门锁;
            accounts.Add("Option2", common.DeviceEpoint.ToString());

@@ -840,22 +841,18 @@
        /// <returns></returns>
        public static bool ExistLogic(Common.Logic logic, ZigBee.Device.DoorLock doorLock)
        {
            bool yes = false;
            for (int j = 0; j < logic.Accounts.Count; j++)
            {
                //Option4是设备mac；Option2是设备端口；
                if (logic.Accounts[j]["Option4"].ToString() != doorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != doorLock.DeviceEpoint.ToString())
                if (logic.Accounts[j]["Option4"].ToString() == doorLock.DeviceAddr)
                {
                    //查找是否是那个门锁；
                    //如果不是该门锁联动事件不显示出来;
                    yes = false;
                    return true;
                }
                else
                {
                    yes = true;
                }

            }
            return yes;
            return false;
        }

    }