请合并代码，优化逻辑执行提示和撤销门锁定时功能。

xm

2020-05-25 ef0c6b76b06590b38f6e87d1e4efb35b81374502

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

@@ -734,18 +734,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(3, doorLock);
                                if (resTemp == 0)
                                {
                                    haveLogicNormallyOpenMode = false;
                                }
                                else
                                {
                                    haveLogicNormallyOpenMode = true;
                                }
                            });
                        }
                    }
                    else
@@ -1121,8 +1121,8 @@
                UserView.HomePage.Instance.PageIndex += 1;

                addLogicPage.Show();

                addLogicPage.action += (w) =>

                {

                    doorLock.IsDoorLockNormallyMode = w;

                {
                    DoorLockCommonInfo.NormallyOpenModeValue(doorLock, w);
                    UpdateNomallyOpenStatus();

                    //返回按键清空当前逻辑定义的LogicAction
                    UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;