From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 5b29ee7..960d44d 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -63,7 +63,7 @@
//鐧诲綍鎴愬姛,鎴栬�呮病鏈夌綉缁滈兘鍙互鐧诲綍
if (loginSuccess == 1 || loginSuccess == 2)
{
- var homes = await House.GetHomeLists();
+ var homes = await UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
@@ -72,8 +72,24 @@
UserCenter.HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Instance.RemoveViewByTag("Login");
- UserPage.Instance.Fresh();
+ UserPage.Instance.ReFreshControl();
CommonPage.Loading.Hide();
+ });
+ }
+ else
+ {
+ //璁惧畾涓�涓椂闂�
+ Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
+ Config.Instance.Save();
+
+ UserCenter.HdlThreadLogic.Current.RunMain(() =>
+ {
+ CommonPage.Loading.Hide();
+ CommonPage.Instance.RemoveViewByTag("Login");
+ //鐧诲綍寮瑰嚭鐧诲綍鐣岄潰
+ var accountLogin = new Login.AccountLoginForm { };
+ Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
+ accountLogin.ShowForm();
});
}
});
@@ -81,7 +97,7 @@
else
{
//鏈櫥褰曞脊鍑虹櫥褰曠晫闈�
- var accountLogin = new Login.AccountLogin { };
+ var accountLogin = new Login.AccountLoginForm { };
Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
accountLogin.ShowForm();
}
@@ -128,7 +144,7 @@
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
var revertData = responseDataObj;
//鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
- UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
+ Config.Instance.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
Config.Instance.Account = revertData.Account;
Config.Instance.Password = password;
Config.Instance.MD5PWD = revertData.MD5PWD;
--
Gitblit v1.8.0