合并了新代码

黄学彪

2020-08-11 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb

 ZigbeeApp/Shared/Phone/UserView/HomePage.cs

@@ -53,7 +53,6 @@
            if (Config.Instance.IsLogin)
            {
                //显示启动页
                this.ShowLoginLoadView();
                CommonPage.Loading.Start();

                UserCenter.HdlThreadLogic.Current.RunThread(() =>
@@ -66,15 +65,19 @@
                    {

                        var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb(true);

                        //刷新个人中心的内存及线程

                        UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                        bool result = UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                        //启动ZigBee

                        ZigBee.Common.Application.Init();



                        UserCenter.HdlThreadLogic.Current.RunMain(() =>

                        {

                            CommonPage.Instance.RemoveViewByTag("Login");

                            UserPage.Instance.ReFreshControl();

                            CommonPage.Loading.Hide();

                            if (result == true)

                            {

                                //false:开启了调试功能

                                UserPage.Instance.ReFreshControl();

                            }

                        });

                    }

                    else

@@ -102,16 +105,6 @@
                Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
                accountLogin.ShowForm();
            }
        }

        /// <summary>

        /// 显示启动页

        /// </summary>
        public void ShowLoginLoadView()
        {
            var loginLoad = new LoginLoading { };
            CommonPage.Instance.AddChidren(loginLoad);
            loginLoad.Show();
        }

        /// <summary>