From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/Phone/UserView/HomePage.cs |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 11eef73..6a34fb4 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -49,10 +49,9 @@
                 }
             };
 
-            //*******寰呮敼*****
-            UserPage.Instance.Fresh();
             if (Config.Instance.IsLogin)
             {
+                ShowLoginLoadView();
                 CommonPage.Loading.Start();
                 Action action = async () =>
                 {
@@ -70,11 +69,11 @@
                             //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
                             await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
 
-                            Room.CanInitAllRoom = true;
                             Room.InitAllRoom();
 
                             Application.RunOnMainThread(() =>
                             {
+                                CommonPage.Instance.RemoveViewByTag("Login");
                                 UserPage.Instance.Fresh(); 
                                 CommonPage.Loading.Hide();
                             });
@@ -103,11 +102,11 @@
                             //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
                             await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
 
-                            Room.CanInitAllRoom = true;
                             Room.InitAllRoom();
 
                             Application.RunOnMainThread(() =>
                             {
+                                CommonPage.Instance.RemoveViewByTag("Login");
                                 UserPage.Instance.Fresh();
                                 CommonPage.Loading.Hide();
                             });
@@ -127,6 +126,14 @@
             }
         }
 
+
+        public void ShowLoginLoadView()
+        {
+            var loginLoad = new LoginLoading { };
+            CommonPage.Instance.AddChidren(loginLoad);
+            loginLoad.Show();
+        }
+
         /// <summary>
         /// Logins the by PWDA sync.
         /// </summary>

--
Gitblit v1.8.0