2019-11-04-1

WJC

2019-11-04 e5f993f52e09eb46878baced83bb8492f147d41c

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs

@@ -341,8 +341,28 @@
                {
                    if (conditionsIndex == -1)
                    {
                        bool add = false;
                        for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
                        {
                            if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "1")
                            {
                                if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == Send.CurrentDoorLock.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == Send.CurrentDoorLock.DeviceEpoint.ToString()))
                                {
                                    if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == lockConditionsInfo["AttriButeId"] && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == lockConditionsInfo["AttriButeData2"])
                                    {
                                        add = true;
                                        break;
                                    }
                                }
                            }
                        }
                        
                        if (!add)
                        {
                        Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
                    }

                    }
                    else
                    {
                        Common.Logic.CurrentLogic.Conditions.RemoveAt(conditionsIndex);