Merge branch 'WJC'

wxr

2020-12-07 64dbbfe1d6488635e160189a704afccffc7d34d0

 HDL_ON/UI/UI1-Login/LoginPageBLL.cs

@@ -558,6 +558,7 @@
                            {
                                //跳转页面----
                                MainPage.GoUserPage();
                                MainPage.InitializationData();
                                return;
                            }
                        });
@@ -584,20 +585,21 @@
                                FileUtils.RestoreRegionFiles(regionRootPath);
                                DB_ResidenceData.residenceData.EixtAccount();
                                OnAppConfig.Instance.RefreshUserConfig();
                                DB_ResidenceData.InitRoomFunction();
                                SpatialInfo.CurrentSpatial.InitRoomFunction();
                            }
                            Application.RunOnMainThread(() =>
                            {
                                //跳转页面----
                                MainPage.GoUserPage();
                                MainPage.InitializationData();
                            });
                        }
                        else
                        {
                            //2020-11-13 待确认
                            //获取住宅失败，重新标记为未登录状态
                             UserInfo.Current.LastTime = DateTime.MinValue;
                             UserInfo.Current.SaveUserInfo();
                            UserInfo.Current.LastTime = DateTime.MinValue;
                            UserInfo.Current.SaveUserInfo();
                            //登录失败，请先添加住宅！
                            Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList));
                        }
@@ -671,7 +673,8 @@
                //获取用户信息
                new Thread(() =>
                {
                    pm.GetUserInfo();
                    pm.GetUserHeadImage(revertData.userId);
                    pm.GetUserInfo(false);
                })
                { IsBackground = true }.Start();
            }