From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1
---
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 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..bbb9565
--- 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,9 +117,9 @@
else
{
//鏈櫥褰曞脊鍑虹櫥褰曠晫闈�
- var accountLogin = new Device.Account.AccountLogin { };
+ var accountLogin = new Login.AccountLogin { };
Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
- accountLogin.Show();
+ accountLogin.ShowForm();
}
}
@@ -171,16 +168,15 @@
}
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
- var revertData = responseDataObj;
+ var revertData = responseDataObj;
+ //鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
+ UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
Config.Instance.Account = revertData.Account;
Config.Instance.Password = password;
Config.Instance.MD5PWD = revertData.MD5PWD;
Config.Instance.Guid = revertData.Guid;
Config.Instance.LoginDateTime = DateTime.Now;
- if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
- {
- Config.Instance.AccountList.Add(revertData.Account);
- }
+ Config.Instance.LoginToken = revertData.Token;
isLoginSuccess = 1;
var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
System.Console.WriteLine($"鍚庡彴鐧诲綍鎴愬姛--{Config.Instance.LoginDateTime}");
--
Gitblit v1.8.0