上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

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

@@ -85,13 +85,13 @@
                        }
                        bool yes = false;
                        for (int a = 0; a < logic.Accounts.Count; a++)
                        {

                            if (logic.Accounts[a]["MacAddr"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Epoint"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())

                            {

                                //查找是否是那个门锁；

                                //如果不是该门锁联动事件不显示出来;

                                yes = false;

                                break;

                        {
                            if (logic.Accounts[a]["MacAddr"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Epoint"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
                            {
                                //查找是否是那个门锁；
                                //如果不是该门锁联动事件不显示出来;
                                yes = false;
                                break;
                            }
                            if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid)
                            {
@@ -246,13 +246,13 @@
                {
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
                    Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                    Language.StringByID(MyInternationalizationString.confrim));

                    alert.Show();

                    alert.ConfirmClickEvent += () =>

                    Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    alert.ConfirmClickEvent += () =>
                    {
                        Common.Logic.LockLogicList.Remove(logic);
                        Automationview();
                        Send.DelLogic(logic.LogicId);

                        Send.DelLogic(logic.LogicId);
                    };

                };