From c47c3ec2488961b3a006aaebcb03dba582f8b19b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 12 三月 2020 17:08:42 +0800
Subject: [PATCH] 2020-03-12-1

---
 ZigbeeApp/Shared/Phone/UserView/HomePage.cs |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 1be601f..2607704 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -62,13 +62,13 @@
                         new System.Threading.Thread(async () =>
                         {
                             //鐧诲綍鎴愬姛
-                            var homes = await House.GetHomeLists();
+                            var homes = await House.GetHomeLists();
+                            //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                             //鍚姩ZigBee
                             ZigBee.Common.Application.Init();
-                            //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
-                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
 
-                            Room.InitAllRoom();
+                            UserCenter.HdlRoomLogic.Current.InitAllRoom();
 
                             Application.RunOnMainThread(() =>
                             {
@@ -93,14 +93,13 @@
                         new System.Threading.Thread(async () =>
                         {
                             //鐧诲綍鎴愬姛
-                            var homes = await House.GetHomeLists();
+                            var homes = await House.GetHomeLists();
+                            //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                             //鍚姩ZigBee
                             ZigBee.Common.Application.Init();
 
-                            //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
-                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
-
-                            Room.InitAllRoom();
+                            UserCenter.HdlRoomLogic.Current.InitAllRoom();
 
                             Application.RunOnMainThread(() =>
                             {
@@ -118,7 +117,7 @@
             else
             {
                 //鏈櫥褰曞脊鍑虹櫥褰曠晫闈�
-                var accountLogin = new Device.Account.AccountLogin { };
+                var accountLogin = new Login.AccountLogin { };
                 Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
                 accountLogin.Show();
             }
@@ -175,6 +174,7 @@
                     Config.Instance.MD5PWD = revertData.MD5PWD;
                     Config.Instance.Guid = revertData.Guid;
                     Config.Instance.LoginDateTime = DateTime.Now;
+                    Config.Instance.LoginToken = revertData.Token;
                     if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
                     {
                         Config.Instance.AccountList.Add(revertData.Account);

--
Gitblit v1.8.0