From 437c7a6d88d11e500fc19a3dd198aec28412f06b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 20 十一月 2020 17:48:23 +0800
Subject: [PATCH] 2020-11-20 1.修改UserInfo调用方法。2.增加保存用户注册域名信息。
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 64 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 8f85501..5803f90 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -28,6 +28,25 @@
}
/// <summary>
+ /// 妫�娴嬪綋鍓嶉厤缃煙鍚嶆槸鍚︿竴鑷达紝涓嶄竴鑷村垯鏇挎崲
+ /// </summary>
+ /// <param name="result"></param>
+ void CheckAndSetUserRequestHost(ResponsePackNew result)
+ {
+ try
+ {
+ var mGlobalRegionListObj = Newtonsoft.Json.JsonConvert.DeserializeObject<GlobalRegionListRes>(result.Data.ToString());
+ if (UserInfo.Current.RequestHttpsHost != mGlobalRegionListObj.regionUrl)
+ {
+ UserInfo.Current.RequestHttpsHost = mGlobalRegionListObj.regionUrl;
+ UserInfo.Current.GlobalRegion = mGlobalRegionListObj;
+ UserInfo.Current.SaveUserInfo();
+ }
+ }
+ catch { }
+ }
+
+ /// <summary>
/// 鐐瑰嚮鎸夐挳鑾峰彇楠岃瘉鐮�
/// </summary>
void GetVerificationCode()
@@ -78,6 +97,9 @@
}
else
{
+ //妫�娴嬪綋鍓嶉厤缃煙鍚嶆槸鍚︿竴鑷达紝涓嶄竴鑷村垯鏇挎崲
+ CheckAndSetUserRequestHost(result);
+ //
Application.RunOnMainThread(() =>
{
btnGetVerificationCode.IsSelected = false;
@@ -593,7 +615,7 @@
else
{
//璁剧疆鐢ㄦ埛鎵�娉ㄥ唽鍦板尯鐨勫煙鍚嶏紝鐢ㄦ埛鐩稿叧鎿嶄綔閮界敤杩欎釜鍩熷悕
-
+ CheckAndSetUserRequestHost(result);
}
}
@@ -635,7 +657,7 @@
OnAppConfig.Instance.RefreshUserConfig();
DB_ResidenceData.InitRoomFunction();
}
- if (MainPage.LoginUser.userEmailInfo == "464027401@qq.com")
+ if ( UserInfo.Current.userEmailInfo == "464027401@qq.com")
{
DB_ResidenceData.residenceData.floors.Add(new Floor() { name = "1F", sid = "09888" });
var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "09888", backgroundImage = "Classification/Room/Roombg.png" };
@@ -910,8 +932,8 @@
{
//2020-11-13 寰呯‘璁�
//鑾峰彇浣忓畢澶辫触锛岄噸鏂版爣璁颁负鏈櫥褰曠姸鎬�
- MainPage.LoginUser.lastTime = DateTime.MinValue;
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.lastTime = DateTime.MinValue;
+ UserInfo.Current.SaveUserInfo();
//鐧诲綍澶辫触锛岃鍏堟坊鍔犱綇瀹咃紒
Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList));
}
@@ -957,18 +979,26 @@
if (loginResult.Code == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
- MainPage.LoginUser = new UserInfo
- {
- userType = revertData.userType,
- accountString = account,
- password = password,
- lastTime = DateTime.Now,
- ID = revertData.userId,
- loginTokenString = revertData.headerPrefix + revertData.accessToken,
- refreshToken = revertData.refreshToken,
- userName = revertData.name
- };
- MainPage.LoginUser.SaveUserInfo();
+ // UserInfo.Current = new UserInfo
+ //{
+ // userType = revertData.userType,
+ // accountString = account,
+ // password = password,
+ // lastTime = DateTime.Now,
+ // ID = revertData.userId,
+ // loginTokenString = revertData.headerPrefix + revertData.accessToken,
+ // refreshToken = revertData.refreshToken,
+ // userName = revertData.name
+ //};
+ UserInfo.Current.userType = revertData.userType;
+ UserInfo.Current.accountString = account;
+ //UserInfo.Current.password = password;
+ UserInfo.Current.lastTime = DateTime.Now;
+ UserInfo.Current.ID = revertData.userId;
+ UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
+ UserInfo.Current.refreshToken = revertData.refreshToken;
+ UserInfo.Current.userName = revertData.name;
+ UserInfo.Current.SaveUserInfo();
MainPage.Log("鐧诲綍鎴愬姛銆�");
result = true;
//鑾峰彇鐢ㄦ埛淇℃伅
@@ -1043,7 +1073,7 @@
if (responsePack == StateCode.SUCCESS)
{
//2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
- if (MainPage.LoginUser.regionList != null && MainPage.LoginUser.regionList.Count > 0){
+ if ( UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0){
result = true;
}
//result = true;
--
Gitblit v1.8.0