From 41f9c8837b0551c68f8fd798c06951fa716b7ab8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 14:05:29 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI1-Login/RegisterPageBLL.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index e398c75..9dbc24a 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -583,7 +583,7 @@
//callbackAction?.Invoke(account);
Application.RunOnMainThread(() =>
{
- this.Close();
+ Close();
LoadEvent_AutoLogin(account, password);
});
}
@@ -610,6 +610,7 @@
Application.RunOnMainThread(() =>
{
waitPage.Hide();
+ waitPage.RemoveFromParent();
});
}
});
@@ -621,7 +622,7 @@
void LoadEvent_Server()
{
//鍒ゆ柇涔嬪墠鏄惁閫夋嫨杩�
- if (UserInfo.Current.GlobalRegion != null && !string.IsNullOrEmpty(UserInfo.Current.GlobalRegion.regionUrl))
+ if (OnAppConfig.Instance.GlobalRegion != null && !string.IsNullOrEmpty(OnAppConfig.Instance.GlobalRegion.regionUrl))
{
SetServerText();
@@ -683,7 +684,7 @@
isSelectServer = true;
ShowServerBottomLineState(false);
btnServerText.TextColor = CSS_Color.FirstLevelTitleColor;
- btnServerText.Text = UserInfo.Current.GlobalRegion.regionName;
+ btnServerText.Text = OnAppConfig.Instance.GlobalRegion.regionName;
}
--
Gitblit v1.8.0