From dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期五, 04 十二月 2020 16:06:47 +0800 Subject: [PATCH] Merge branch 'master' into WJC --- HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs index 70c7f7b..c3b4b05 100644 --- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs +++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs @@ -558,6 +558,7 @@ { //璺宠浆椤甸潰---- MainPage.GoUserPage(); + MainPage.InitializationData(); return; } }); @@ -584,12 +585,13 @@ FileUtils.RestoreRegionFiles(regionRootPath); DB_ResidenceData.residenceData.EixtAccount(); OnAppConfig.Instance.RefreshUserConfig(); - DB_ResidenceData.InitRoomFunction(); + SpatialInfo.CurrentSpatial.InitRoomFunction(); } Application.RunOnMainThread(() => { //璺宠浆椤甸潰---- MainPage.GoUserPage(); + MainPage.InitializationData(); }); } else @@ -662,13 +664,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.SaveUserInfo(); MainPage.Log("鐧诲綍鎴愬姛銆�"); result = true; //鑾峰彇鐢ㄦ埛淇℃伅 new Thread(() => { - pm.GetUserInfo(); + pm.GetUserHeadImage(revertData.userId); + pm.GetUserInfo(false); }) { IsBackground = true }.Start(); } -- Gitblit v1.8.0