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

xm

2020-05-25 ef0c6b76b06590b38f6e87d1e4efb35b81374502

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

 ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs

old mode 100755
new mode 100644
@@ -935,16 +935,17 @@
                {

                    //开启自动备份

                    HdlAutoBackupLogic.ShowAutoBackupPromptedForm();

                }

                //显示引导界面

                }

                //显示引导界面
                ShowGuideForm(result);

            }

            //APP缓存加载完成

            UserCenterResourse.AccountOption.AppCanSignout = true;



            return true;

        }



        }

        /// <summary>

        /// 初始化虚拟住宅的个人中心的数据(切换住宅使用)

        /// </summary>


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

@@ -705,20 +705,6 @@
                        CommonPage.Loading.Start("");
                    });

                    //放在设备启动的地方
                    //HdlGatewayReceiveLogic
                    //1、启动获取门锁设备对象，
                    //2、再获取当前门锁对象的常开模式
                    var res = await DoorLockCommonInfo.GetNormallyOpenMode(doorLock);
                    if (DoorLockCommonInfo.DoorLockNormallyMode.ContainsKey(doorLock.DeviceAddr + doorLock.DeviceEpoint))
                    {
                        DoorLockCommonInfo.DoorLockNormallyMode[doorLock.DeviceAddr + doorLock.DeviceEpoint] = res;
                    }
                    else
                    {
                        DoorLockCommonInfo.DoorLockNormallyMode.Add(doorLock.DeviceAddr + doorLock.DeviceEpoint, res);
                    }

                    //是否支持常开
                    canOpenNormallyMode = DoorLockCommonInfo.CanNormallyOpen(doorLock);
                    if (canOpenNormallyMode)
@@ -825,43 +811,6 @@
                        CommonPage.Loading.Hide();
                    });
                }

                //定时检测时间变化
                var curDateNow = DateTime.Now;
                var curDateDelay = DateTime.MinValue;
                new System.Threading.Thread(async () =>
                {
                    while (true)
                    {
                        try
                        {
                            curDateNow = DateTime.Now;
                            if (curDateNow > curDateDelay)
                            {
                                //晚上9点提示用户门锁是否还开着
                                if (DoorLockCommonInfo.DoorLockNormallyMode[doorLock.DeviceAddr + doorLock.DeviceEpoint] == true)
                                {
                                    if (curDateNow.Hour == 21)
                                    {
                                        curDateDelay = curDateNow;
                                        curDateDelay = curDateDelay.AddHours(+1);
                                        var result = await Shared.Phone.Device.Logic.SkipView.Exist(3, (ZigBee.Device.DoorLock)doorLock);
                                        HdlThreadLogic.Current.RunMain(() =>
                                        {
                                            //弹出徐梅的那个窗口
                                            DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)doorLock, DoorLock.DoorLockCommonInfo.DoorLockMessType.AppOperate,
                                             result != 0 ? true : false, ControlCommonResourse.UpdateDoorLockStatusAction);
                                        });
                                    }
                                }
                            }
                        }
                        catch { }
                        System.Threading.Thread.Sleep(1000 * 60);
                    }

                })
                { IsBackground = true }.Start();
            });
        }