Merge branch 'master' into WJC

陈嘉乐

2020-12-04 dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e

 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();
            }