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/Login/AccountLoginByCode.cs | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs
old mode 100644
new mode 100755
index 86ea6d0..c3c9143
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs
@@ -303,7 +303,7 @@
if (CheckAccount(account) == false)
{
return;
- }
+ }
var reqLoginByCode = new SendDataToServer.LoginValidCodeOBJ()
{
Account = account,
@@ -311,7 +311,7 @@
Language = CommonPage.ZigBeeLanguage,
AreaCode = int.Parse(CommonPage.PhoneZoneStr)
};
- var requestRevetLoginCodeOBJ = await CommonFormResouce.LoginByCode(reqLoginByCode);
+ var requestRevetLoginCodeOBJ = await CommonFormResouce.LoginByCode(reqLoginByCode);
if (requestRevetLoginCodeOBJ == null)
{
CommonPage.Instance.FailureToServer();
@@ -330,17 +330,15 @@
{
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(requestRevetLoginCodeOBJ.ResponseData.ToString());
var revertData = responseDataObj;
- Config.ReFresh();
+ Config.ReFresh();
+ //鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
+ UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
Config.Instance.Password = string.Empty;
Config.Instance.Account = revertData.Account;
Config.Instance.Guid = revertData.Guid;
Config.Instance.MD5PWD = revertData.MD5PWD;
Config.Instance.LoginDateTime = DateTime.Now;
Config.Instance.LoginToken = revertData.Token;
- if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
- {
- Config.Instance.AccountList.Add(revertData.Account);
- }
//闇�瑕佹妸鐧诲綍鍚庤繑鍥炵殑md5瀵嗙爜 璧嬪�肩敓鎴怲oken 鍥犱负鐢ㄦ埛娌℃湁杈撳叆瀵嗙爜
Config.Instance.MD5PWD = revertData.MD5PWD;
Config.Instance.Save();
@@ -433,7 +431,7 @@
this.RemoveFromParent();
var login = new AccountLogin();
Shared.Common.CommonPage.Instance.AddChidren(login);
- login.Show();
+ login.ShowForm();
}
/// <summary>
@@ -512,14 +510,14 @@
else
{
new System.Threading.Thread(async () =>
- {
- var re = await isBindAuthAsync(authStr);
+ {
+ var re = await isBindAuthAsync(authStr);
if (re)
- {
- Application.RunOnMainThread(() =>
- {
- //鐩存帴鐧诲綍
- HomePage.Instance.ShowLoginLoadView();
+ {
+ Application.RunOnMainThread(() =>
+ {
+ //鐩存帴鐧诲綍
+ HomePage.Instance.ShowLoginLoadView();
});
var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
var homes = await House.GetHomeLists();
@@ -639,15 +637,13 @@
if (stateCodeStr == "SUCCESS")
{
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.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.Save();
return true;
}
--
Gitblit v1.8.0