From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01

---
 HDL_ON/UI/UI1-Login/SelectServerDialog.cs |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/SelectServerDialog.cs b/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
index 33b620f..f2c8271 100644
--- a/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
+++ b/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
@@ -32,9 +32,9 @@
         }
 
 
-      /// <summary>
-      /// 
-      /// </summary>
+        /// <summary>
+        /// 
+        /// </summary>
         public void LoadPage()
         {
             bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -62,9 +62,11 @@
             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(() => {
+            System.Threading.Tasks.Task.Run(() =>
+            {
                 try
                 {
                     var dataList = new List<GlobalRegionListRes>();
@@ -72,7 +74,8 @@
                     var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GlobalRegionList, requestJson, HttpUtil.GlobalRequestHttpsHost);
                     if (revertObj.Code == StateCode.SUCCESS)
                     {
-                        Application.RunOnMainThread(() => {
+                        Application.RunOnMainThread(() =>
+                        {
                             var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GlobalRegionListRes>>(revertObj.Data.ToString());
                             if (responseDataObj != null)
                             {
@@ -95,12 +98,17 @@
                 }
                 catch
                 {
-                   
+
                 }
                 finally
                 {
-                    Application.RunOnMainThread(() => {
-                        waitPage.Hide();
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
                     });
                 }
             });
@@ -120,7 +128,8 @@
             };
             VerticalScrolViewMiddle.AddChidren(rowView);
 
-            var urlBtn = new Button() {
+            var urlBtn = new Button()
+            {
                 X = Application.GetRealWidth(16),
                 Height = rowView.Height,
                 Width = Application.GetRealWidth(200),
@@ -134,10 +143,11 @@
             //rowView.AddChidren(lineView);
             //lineView.Y = rowView.Height - lineView.Height;
 
-            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
-                UserInfo.Current.RequestHttpsHost = mGlobalRegion.regionUrl;
-                UserInfo.Current.GlobalRegion = mGlobalRegion;
-                UserInfo.Current.SaveUserInfo();
+            EventHandler<MouseEventArgs> eHandler = (sender, e) =>
+            {
+                OnAppConfig.Instance.RequestHttpsHost = mGlobalRegion.regionUrl;
+                OnAppConfig.Instance.GlobalRegion = mGlobalRegion;
+                OnAppConfig.Instance.SaveConfig();
                 //鍏抽棴椤甸潰
                 this.Close();
                 selectAction?.Invoke();
@@ -147,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