From 1e76fa5a69bc478b3eb5738546aeb51b8fd6f7c9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 18 十一月 2019 16:30:41 +0800
Subject: [PATCH] 2019.11.18

---
 ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
index c396c94..f21a869 100644
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
@@ -367,9 +367,8 @@
                         {
                             return;
                         }
-                        this.RemoveFromParent();
 
-                        UserPage.Instance.Fresh();
+                        HomePage.Instance.ShowLoginLoadView();
 
                         new System.Threading.Thread(async () =>
                         {
@@ -398,12 +397,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 +510,18 @@
                                 if (re)
                                 {
                                     //鐩存帴鐧诲綍
-                                    //this.RemoveFromParent();
-
-                                    //UserPage.Instance.Fresh();
+                                    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 +570,6 @@
                             var homes = await House.GetHomeLists();
                             //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
                             await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
-                            Shared.Common.Room.CanInitAllRoom = true;
                             Shared.Common.Room.InitAllRoom();
                             Application.RunOnMainThread(() =>
                             {

--
Gitblit v1.8.0