From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 94 +++-------------------------------------------
1 files changed, 7 insertions(+), 87 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 7072a40..d1f02f8 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -50,25 +50,24 @@
};
//鐩存帴鐧诲綍
- if (Config.Instance.IsLogin)
+ if (Config.Instance.CanAutoLogin)
{
//鏄剧ず鍚姩椤�
CommonPage.Loading.Start();
- UserCenter.HdlThreadLogic.Current.RunThread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鐧诲綍
- var loginSuccess = LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);
+ var loginSuccess = HdlAccountLogic.Current.AutoLoginByRefreshToken();
//鐧诲綍鎴愬姛,鎴栬�呮病鏈夌綉缁滈兘鍙互鐧诲綍
- if (loginSuccess == 1 || loginSuccess == 2)
+ if (loginSuccess == AccountStatu.Sucess || loginSuccess == AccountStatu.NotNetWork)
{
- var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb(true);
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- bool result = UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+ bool result = HdlUserCenterLogic.Current.InitUserCenterMenmoryAndThread(true);
//鍚姩ZigBee
ZigBee.Common.Application.Init();
- UserCenter.HdlThreadLogic.Current.RunMain(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Instance.RemoveViewByTag("Login");
CommonPage.Loading.Hide();
@@ -85,7 +84,7 @@
Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
Config.Instance.Save();
- UserCenter.HdlThreadLogic.Current.RunMain(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Loading.Hide();
CommonPage.Instance.RemoveViewByTag("Login");
@@ -104,85 +103,6 @@
Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
accountLogin.ShowForm();
}
- }
-
- /// <summary>
- /// 1:鐧诲綍鎴愬姛 0:瀵嗙爜閿欒 -1:鍏朵粬寮傚父 2:鏃犳硶鑱旂綉
- /// </summary>
- /// <returns>The by PWDA sync.</returns>
- /// <param name="account">Account.</param>
- /// <param name="password">Password.</param>
- /// <param name="source">Source.</param>
- /// <param name="company">Company.</param>
- public int LoginByPWDAsync(string account, string password, string source = "", int company = 0)
- {
- var isLoginSuccess = -1;
- var requestObj = new SendDataToServer.LoginObj
- {
- Account = account,
- Password = password
- };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- //鐧婚檰鎺ュ彛鐗规畩,闇�瑕佸揩涓�鐐硅闂�,璁剧疆3绉掕秴鏃�
- var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson), 3);
- if (revertObj == null)
- {
- return 2;
- }
- var stateCodeStr = revertObj.StateCode.ToUpper();
- //Error 涓嶈兘鐩存帴浠庢湇鍔″櫒鍙栵紝鍙兘鏍规嵁鐘舵�佺爜閫愪竴鍒ゆ柇
- if (stateCodeStr == "SUCCESS")
- {
- var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
- var revertData = responseDataObj;
- //鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
- Config.Instance.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;
- Config.Instance.LoginToken = revertData.Token;
- //涓婃姤璁惧ID
- CommonPage.Instance.PushRegID();
- isLoginSuccess = 1;
- }
- else if (stateCodeStr == "YOUDATANOISLOCALREGION")
- {
- //涓嶅湪鏈尯鍩燂紝闇�瑕侀噸瀹氬悜鍖哄煙鍚庡啀娆¤姹傜櫥褰�
- var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginLocalRegionRes>(revertObj.ResponseData.ToString());
- CommonPage.RequestHttpsHost = responseDataObj.RegionServer;
- //鍐嶆鐧诲綍
- return this.LoginByPWDAsync(account, password, source, company);
- }
- if (stateCodeStr == "NOTVERIFY")
- {
- //鏈縺娲�
- }
- else if (stateCodeStr == "NOTENABLE")
- {
- //璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
- }
- else if (stateCodeStr == "PARAMETEROREMPTY")
- {
- //鎻愪緵鐨勫弬鏁伴敊璇�
- }
- else if (stateCodeStr == "USERNAMEORPWDERROR")
- {
- //璐﹀彿鎴栧瘑鐮侀敊璇�
- isLoginSuccess = 0;
- }
- else if (stateCodeStr == "ACCOUNTNOEXISTS")
- {
- //璐﹀彿涓嶅瓨鍦�
- isLoginSuccess = 0;
- }
- else if (stateCodeStr == "BERESTRICT")
- {
- //姝よ处鍙锋棤鏉冪櫥褰�
- isLoginSuccess = 0;
- }
- return isLoginSuccess;
}
}
}
--
Gitblit v1.8.0