请合并门锁最新代码【1、优化门锁常开模式推送和增加机械门锁开锁功能；2、优化面板调光目标】

xm

2020-05-20 4e78c9c795dff269ebea37f4e7572d8c8b7d4a69

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

@@ -17,12 +17,29 @@
        public UserDoorLockPage(Room room, CommonDevice doorLock)
        {
            //徐梅的门锁界面打开(网关全局接收时使用)
            ControlCommonResourse.IsDoorLockPageOpen = true;
            //ControlCommonResourse.IsDoorLockPageOpen = true; 
            this.doorLock = doorLock as ZigBee.Device.DoorLock;
            currentRoom = room;
            deviceUI = doorLock;
            BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor;
            ZbGateway.StatusList.Add(this);
            Application.RunOnMainThread(() =>
            {
                ControlCommonResourse.UpdateDoorLockStatusAction = (obj) =>
                {
                    UpdateNomallyOpenStatus();
                };

                UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, status) =>
                {
                    var key = doorLock.DeviceAddr + doorLock.DeviceEpoint;
                    if (DoorlockKey == key)
                    {
                        DoorLockCommonInfo.NormallyOpenModeValue(this.doorLock, status);
                        UpdateNomallyOpenStatus();
                    }
                };
            });
        }

        #region  变量申明
@@ -621,6 +638,35 @@
                }
            }

            //网关执行逻辑，常开模式失效上报
            //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)
@@ -687,18 +733,19 @@
                                tempRes = false;
                            }
                            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(3, doorLock);
                            //if (resTemp == 1)
                            //{
                            //    haveLogicNormallyOpenMode = true;
                            //}
                            //else if (resTemp == 0)
                            //{
                            //    haveLogicNormallyOpenMode = false;
                            //}
                            //});
                        }
                    }
                    else
@@ -1186,7 +1233,9 @@
        public override void RemoveFromParent()
        {
            //徐梅的门锁界面关闭(网关全局接收时使用)
            ControlCommonResourse.IsDoorLockPageOpen = false;
            //ControlCommonResourse.IsDoorLockPageOpen = false;
            ControlCommonResourse.UpdateDoorLockStatusAction = null;
            UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction = null;
            if (IsDrawerLockMode)
            {
                CommonPage.Instance.IsDrawerLockMode = false;