From d3123778d722597ee43c23879ce131ebf340393f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:15:41 +0800
Subject: [PATCH] Merge branch 'CJL'
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 0998722..a2d2bb8 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 { }
@@ -635,6 +635,12 @@
}
else
{
+ BindingResidencePage page = new BindingResidencePage();
+ MainPage.BaseView.AddChidren(page);
+ page.LoadView();
+
+
+
//2020-11-13 寰呯‘璁�
//鑾峰彇浣忓畢澶辫触锛岄噸鏂版爣璁颁负鏈櫥褰曠姸鎬�
UserInfo.Current.LastTime = DateTime.MinValue;
@@ -695,6 +701,12 @@
// refreshToken = revertData.refreshToken,
// userName = revertData.name
//};
+ if (OnAppConfig.Instance.LastLoginUserId != revertData.userId)
+ {
+ OnAppConfig.Instance.LastLoginUserId = revertData.userId;
+ OnAppConfig.Instance.SaveConfig();
+ }
+ UserInfo.Current.ClearUserInfo();
UserInfo.Current.userType = revertData.userType;
UserInfo.Current.AccountString = account;
//UserInfo.Current.password = password;
@@ -703,18 +715,17 @@
UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
UserInfo.Current.RefreshToken = revertData.refreshToken;
UserInfo.Current.userName = revertData.name;
- UserInfo.Current.userMobileInfo = "";//閲嶇疆鐢ㄦ埛鎵嬫満
- UserInfo.Current.userEmailInfo = "";//閲嶇疆鐢ㄦ埛閭
- UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//
- UserInfo.Current.CurReginID = "";
+ //UserInfo.Current.userMobileInfo = "";//閲嶇疆鐢ㄦ埛鎵嬫満
+ //UserInfo.Current.userEmailInfo = "";//閲嶇疆鐢ㄦ埛閭
+ //UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//
+ //UserInfo.Current.CurrentRegion.RegionID = "";
UserInfo.Current.SaveUserInfo();
MainPage.Log("鐧诲綍鎴愬姛銆�");
result = true;
//鑾峰彇鐢ㄦ埛淇℃伅
new Thread(() =>
{
- pm.GetUserHeadImage(revertData.userId);
- pm.GetUserInfo(false);
+ pm.GetUserInfo();
})
{ IsBackground = true }.Start();
}
--
Gitblit v1.8.0