From 1f6f024bddf48dea1c17c54ade1535a10ef7b39b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 17:16:37 +0800
Subject: [PATCH] 2020-03-23-2
---
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
old mode 100644
new mode 100755
index 6f323b5..2607704
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -8,7 +8,6 @@
/// </summary>
public class HomePage : PageLayout
{
-
static HomePage homePage;
/// <summary>
/// Gets the instance.
@@ -30,7 +29,6 @@
/// </summary>
public void InitPage()
{
-
if (0 < ChildrenCount)
{
return;
@@ -64,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(() =>
{
@@ -95,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(() =>
{
@@ -120,7 +117,7 @@
else
{
//鏈櫥褰曞脊鍑虹櫥褰曠晫闈�
- var accountLogin = new Device.Account.AccountLogin { };
+ var accountLogin = new Login.AccountLogin { };
Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
accountLogin.Show();
}
@@ -177,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