From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index cfe69a0..04441be 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -53,27 +53,47 @@
if (Config.Instance.IsLogin)
{
//鏄剧ず鍚姩椤�
- this.ShowLoginLoadView();
CommonPage.Loading.Start();
- UserCenter.HdlThreadLogic.Current.RunThread(async () =>
+ UserCenter.HdlThreadLogic.Current.RunThread(() =>
{
//鐧诲綍
- var loginSuccess = await LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);
+ var loginSuccess = LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);
+
//鐧诲綍鎴愬姛,鎴栬�呮病鏈夌綉缁滈兘鍙互鐧诲綍
if (loginSuccess == 1 || loginSuccess == 2)
{
- var homes = await House.GetHomeLists();
+ var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb(true);
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+ bool result = UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
UserCenter.HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Instance.RemoveViewByTag("Login");
- UserPage.Instance.Fresh();
CommonPage.Loading.Hide();
+ if (result == true)
+ {
+ //false:寮�鍚簡璋冭瘯鍔熻兘
+ UserPage.Instance.ReFreshControl();
+ }
+ });
+ }
+ 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();
});
}
});
@@ -87,16 +107,6 @@
}
}
- /// <summary>
- /// 鏄剧ず鍚姩椤�
- /// </summary>
- public void ShowLoginLoadView()
- {
- var loginLoad = new LoginLoading { };
- CommonPage.Instance.AddChidren(loginLoad);
- loginLoad.Show();
- }
-
/// <summary>
/// 1:鐧诲綍鎴愬姛 0:瀵嗙爜閿欒 -1:鍏朵粬寮傚父 2:鏃犳硶鑱旂綉
/// </summary>
@@ -105,7 +115,7 @@
/// <param name="password">Password.</param>
/// <param name="source">Source.</param>
/// <param name="company">Company.</param>
- public async System.Threading.Tasks.Task<int> LoginByPWDAsync(string account, string password, string source = "", int company = 0)
+ public int LoginByPWDAsync(string account, string password, string source = "", int company = 0)
{
var isLoginSuccess = -1;
var requestObj = new SendDataToServer.LoginObj
@@ -116,7 +126,8 @@
Company = company
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ //鐧婚檰鎺ュ彛鐗规畩,闇�瑕佸揩涓�鐐硅闂�,璁剧疆3绉掕秴鏃�
+ var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson), 3);
if (revertObj == null)
{
return 2;
@@ -128,7 +139,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;
@@ -136,7 +147,7 @@
Config.Instance.LoginDateTime = DateTime.Now;
Config.Instance.LoginToken = revertData.Token;
//涓婃姤璁惧ID
- await CommonPage.Instance.PushRegID();
+ CommonPage.Instance.PushRegID();
isLoginSuccess = 1;
}
else if (stateCodeStr == "YOUDATANOISLOCALREGION")
@@ -145,7 +156,7 @@
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginLocalRegionRes>(revertObj.ResponseData.ToString());
CommonPage.RequestHttpsHost = responseDataObj.RegionServer;
//鍐嶆鐧诲綍
- return await this.LoginByPWDAsync(account, password, source, company);
+ return this.LoginByPWDAsync(account, password, source, company);
}
if (stateCodeStr == "NOTVERIFY")
{
--
Gitblit v1.8.0