From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI1-Login/SelectServerDialog.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/SelectServerDialog.cs b/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
index 2b262db..f2c8271 100644
--- a/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
+++ b/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
@@ -62,7 +62,8 @@
bodyView.AddChidren(VerticalScrolViewMiddle);
var waitPage = new Loading();
- waitPage.Start("Please wait...");
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
System.Threading.Tasks.Task.Run(() =>
{
@@ -103,7 +104,11 @@
{
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
});
@@ -140,9 +145,9 @@
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
- UserInfo.Current.RequestHttpsHost = mGlobalRegion.regionUrl;
- UserInfo.Current.GlobalRegion = mGlobalRegion;
- UserInfo.Current.SaveUserInfo();
+ OnAppConfig.Instance.RequestHttpsHost = mGlobalRegion.regionUrl;
+ OnAppConfig.Instance.GlobalRegion = mGlobalRegion;
+ OnAppConfig.Instance.SaveConfig();
//鍏抽棴椤甸潰
this.Close();
selectAction?.Invoke();
@@ -152,7 +157,7 @@
urlBtn.Text = mGlobalRegion.regionName;
- if (mGlobalRegion.regionUrl == UserInfo.Current.RequestHttpsHost)
+ if (mGlobalRegion.regionUrl == OnAppConfig.Instance.RequestHttpsHost)
{
urlBtn.TextColor = CSS_Color.MainColor;
}
--
Gitblit v1.8.0