2019.11.29

gxc

2019-11-29 ac334861efbf06933e95c62ced0484410f34bece

 ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs

@@ -83,6 +83,7 @@
        /// </summary>
        public AccountLogin()
        {
            CommonPage.Instance.IsDrawerLockMode = true;
            BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
            Tag = "Login";
        }
@@ -324,7 +325,7 @@
            }
            else
            {
                Login(phoneRow.AccountET.Text.Trim(), pwdRow.PasswrodET.Text.Trim());
                Login(emailRow.AccountET.Text.Trim(), pwdRow.PasswrodET.Text.Trim());
            }

        }
@@ -367,9 +368,8 @@
                        {
                            return;
                        }
                        this.RemoveFromParent();

                        UserPage.Instance.Fresh();
                        HomePage.Instance.ShowLoginLoadView();

                        new System.Threading.Thread(async () =>
                        {
@@ -398,12 +398,13 @@
                            var homes = await House.GetHomeLists();
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            Shared.Common.Room.CanInitAllRoom = true;
                            Shared.Common.Room.InitAllRoom();
                            Application.RunOnMainThread(() =>
                            {
                                UserPage.Instance.Fresh();
                                CommonPage.Loading.Hide();
                                this.RemoveFromParent();
                                CommonPage.Instance.RemoveViewByTag("Login");
                                UserPage.Instance.Fresh();
                            });
                        })
                        { IsBackground = true }.Start();
@@ -510,20 +511,21 @@
                                if (re)
                                {
                                    //直接登录
                                    //this.RemoveFromParent();

                                    //UserPage.Instance.Fresh();
                                    Application.RunOnMainThread(() =>
                                    {
                                        HomePage.Instance.ShowLoginLoadView();
                                    });
                                    //启动ZigBee
                                    ZigBee.Common.Application.Init();
                                    var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
                                    var homes = await House.GetHomeLists();
                                    //刷新个人中心的内存及线程
                                    await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                                    Shared.Common.Room.CanInitAllRoom = true;
                                    Shared.Common.Room.InitAllRoom();
                                    Application.RunOnMainThread(() =>
                                    {
                                        this.RemoveFromParent();
                                        CommonPage.Instance.RemoveViewByTag("Login");
                                        UserPage.Instance.Fresh();
                                    });
                                }
@@ -572,7 +574,6 @@
                            var homes = await House.GetHomeLists();
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            Shared.Common.Room.CanInitAllRoom = true;
                            Shared.Common.Room.InitAllRoom();
                            Application.RunOnMainThread(() =>
                            {