上传

黄学彪

2020-05-07 309f878169da2f0482dd40b81a84b606ed29cedf

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

@@ -1040,14 +1040,29 @@
            action = () =>
            {
                //系统密码支持操作门锁后，调用温居城的界面【常开自动化】
                var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(currentRoom, doorLock);

                Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                functionSetting.Show();
                // functionSetting.aaaAction = () =>
                //{
                //    UpdateNomallyOpenStatus();
                //};
                if (doorLock == null)

                {

                    ///防止抛异常
                    return;

                }

                ///备注：WJC的

                Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;

                ///进来刷新一次设备列表；

                Common.Logic.LogicDviceList.Clear();

                if (Common.Logic.LogicDviceList.Count == 0)

                {

                    Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());

                }

                var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();

                UserView.HomePage.Instance.AddChidren(addLogicPage);

                UserView.HomePage.Instance.PageIndex += 1;

                addLogicPage.Show();

                addLogicPage.action += (w) =>

                {

                    doorLock.IsDoorLockNormallyMode = w;

                    ///留给徐梅用的

                    UpdateNomallyOpenStatus();

                };
            };
            HdlCheckLogic.Current.CheckSecondarySecurity(action);
            #endregion