From 9ed4d6675aa1f0abe20e3f84e92f5ac2da8ab4f4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 12 十二月 2020 20:02:00 +0800
Subject: [PATCH] 20201212-4
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index e2b2aa8..c6f4a94 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -36,11 +36,11 @@
try
{
var mGlobalRegionListObj = Newtonsoft.Json.JsonConvert.DeserializeObject<GlobalRegionListRes>(result.Data.ToString());
- if (UserInfo.Current.RequestHttpsHost != mGlobalRegionListObj.regionUrl)
+ if (OnAppConfig.Instance.RequestHttpsHost != mGlobalRegionListObj.regionUrl)
{
- UserInfo.Current.RequestHttpsHost = mGlobalRegionListObj.regionUrl;
- UserInfo.Current.GlobalRegion = mGlobalRegionListObj;
- UserInfo.Current.SaveUserInfo();
+ OnAppConfig.Instance.RequestHttpsHost = mGlobalRegionListObj.regionUrl;
+ OnAppConfig.Instance.GlobalRegion = mGlobalRegionListObj;
+ OnAppConfig.Instance.SaveConfig();
}
}
catch { }
@@ -617,16 +617,16 @@
* 鏌ョ湅鏈湴鏄惁瀛樺湪鏁版嵁
* 瀛樺湪鍒欏鍑�
*/
- var isExis = FileUtils.IsExisFolder(DB_ResidenceData.residenceData.CurReginID);
- if (isExis)
- {
- FileUtils.DeleteAllFile();
- string regionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID);
- FileUtils.RestoreRegionFiles(regionRootPath);
- DB_ResidenceData.residenceData.EixtAccount();
- OnAppConfig.Instance.RefreshUserConfig();
- SpatialInfo.CurrentSpatial.InitRoomFunction();
- }
+ //var isExis = FileUtils.IsExisFolder(DB_ResidenceData.residenceData.CurReginID);
+ //if (isExis)
+ //{
+ // FileUtils.DeleteAllFile();
+ // string regionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID);
+ // FileUtils.RestoreRegionFiles(regionRootPath);
+ // DB_ResidenceData.residenceData.EixtAccount();
+ // OnAppConfig.Instance.RefreshUserConfig();
+ // SpatialInfo.CurrentSpatial.InitRoomFunction();
+ //}
Application.RunOnMainThread(() =>
{
//璺宠浆椤甸潰----
@@ -695,6 +695,9 @@
// refreshToken = revertData.refreshToken,
// userName = revertData.name
//};
+ OnAppConfig.Instance.LastLoginUserId = revertData.userId;
+ OnAppConfig.Instance.SaveConfig();
+ UserInfo.Current.ClearUserInfo();
UserInfo.Current.userType = revertData.userType;
UserInfo.Current.AccountString = account;
//UserInfo.Current.password = password;
@@ -705,7 +708,8 @@
UserInfo.Current.userName = revertData.name;
UserInfo.Current.userMobileInfo = "";//閲嶇疆鐢ㄦ埛鎵嬫満
UserInfo.Current.userEmailInfo = "";//閲嶇疆鐢ㄦ埛閭
- UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
+ UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//
+ UserInfo.Current.CurReginID = "";
UserInfo.Current.SaveUserInfo();
MainPage.Log("鐧诲綍鎴愬姛銆�");
result = true;
--
Gitblit v1.8.0