From 2029e64ec0491f7e511dc15bffaf821bfbabe2de Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 14:10:22 +0800
Subject: [PATCH] 上传一个很特别的新版本
---
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 4b02bba..8503e8e 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -56,16 +56,17 @@
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();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+ UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
@@ -121,7 +122,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
@@ -132,7 +133,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;
@@ -152,7 +154,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")
@@ -161,7 +163,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