上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs

@@ -25,14 +25,9 @@
            ZbGateway.StatusList.Add(this);
            Application.RunOnMainThread(() =>
            {
                ControlCommonResourse.UpdateDoorLockStatusAction = (obj) =>
                {
                    UpdateNomallyOpenStatus();
                };

                UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, status) =>
                {
                    var key = doorLock.DeviceAddr + doorLock.DeviceEpoint;
                    var key = doorLock.DeviceAddr;
                    if (DoorlockKey == key)
                    {
                        DoorLockCommonInfo.NormallyOpenModeValue(this.doorLock, status);
@@ -638,35 +633,6 @@
                }
            }

            //网关执行逻辑，常开模式失效上报
            //if (typeTag == "DoorLockAlarmsSendAlarmInform" && tempDevice != null)
            //{
            //    var doorL = (ZigBee.Device.DoorLock)tempDevice;

            //    if (doorL.DeviceAddr + doorL.DeviceEpoint == doorLock.DeviceAddr + doorLock.DeviceEpoint)
            //    {
            //        //非主人不弹这个窗口
            //        if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            //        {
            //            return;
            //        }
            //        if (doorLock.IsDoorLockNormallyMode)
            //        {
            //            if (canOpenNormallyMode)
            //            {
            //                Application.RunOnMainThread(() =>
            //                {
            //                    Action<bool> action = (obj) =>
            //                    {
            //                        UpdateNomallyOpenStatus();
            //                    };
            //                    DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.ServicePush, haveLogicNormallyOpenMode, action);
            //                });
            //            }
            //        }
            //    }
            //}

            if (typeTag == "DeviceStatusReport" && tempDevice != null)
            {
                if (tempDevice != null)
@@ -734,18 +700,18 @@
                            }
                            DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);

                            //Application.RunOnMainThread(async () =>
                            //{
                            //var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3, doorLock);
                            //if (resTemp == 1)
                            //{
                            //    haveLogicNormallyOpenMode = true;
                            //}
                            //else if (resTemp == 0)
                            //{
                            //    haveLogicNormallyOpenMode = false;
                            //}
                            //});
                            Application.RunOnMainThread(async () =>
                            {
                                var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2, doorLock);
                                if (resTemp == 0)
                                {
                                    haveLogicNormallyOpenMode = false;
                                }
                                else
                                {
                                    haveLogicNormallyOpenMode = true;
                                }
                            });
                        }
                    }
                    else
@@ -1102,7 +1068,7 @@

            action = () =>
            {
                //系统密码支持操作门锁后，调用温居城的界面【常开自动化】
                //WJC的代码：系统密码支持操作门锁后，调用温居城的界面【常开自动化】
                if (doorLock == null)

                {

                    ///防止抛异常
@@ -1120,13 +1086,25 @@
                UserView.HomePage.Instance.AddChidren(addLogicPage);

                UserView.HomePage.Instance.PageIndex += 1;

                addLogicPage.Show();

                addLogicPage.action += (w) =>

                {

                    doorLock.IsDoorLockNormallyMode = w;

                    UpdateNomallyOpenStatus();

                    //返回按键清空当前逻辑定义的LogicAction
                    UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
                };
                addLogicPage.action += async (w) =>

                 {

                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, w);

                     UpdateNomallyOpenStatus();

                     //返回按键清空当前逻辑定义的LogicAction
                     UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
                     //是否存在常开模式
                     var resTemp = Shared.Common.Logic.SoneLogicList;
                     if (resTemp.Count == 0)
                     {
                         haveLogicNormallyOpenMode = false;
                     }
                     else
                     {
                         haveLogicNormallyOpenMode = true;
                     }

                     UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction -= addLogicPage.updateCurrentDoorlockActionTemp;
                 };
            };
            HdlCheckLogic.Current.CheckSecondarySecurity(action);

@@ -1232,9 +1210,6 @@
        /// </summary>
        public override void RemoveFromParent()
        {
            //徐梅的门锁界面关闭(网关全局接收时使用)
            //ControlCommonResourse.IsDoorLockPageOpen = false;
            ControlCommonResourse.UpdateDoorLockStatusAction = null;
            UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction = null;
            if (IsDrawerLockMode)
            {