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