From a3dfbcd5218270f9a75e6e32807b08215270b657 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 11:48:23 +0800
Subject: [PATCH] Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google

---
 HDL_ON/UI/UI1-Login/RegisterPage.cs |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index a52fe5e..8bcf14a 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -233,12 +233,22 @@
             AddChidren(bodyView);
 
             //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
-            bodyView.MouseDownEventHandler += (sender, e) => {
+            bodyView.MouseDownEventHandler += (sender, e) =>
+            {
                 Application.HideSoftInput();
             };
 
             pm = new HttpServerRequest();
-
+            try
+            {
+                if (OnAppConfig.Instance.GlobalRegion != null)
+                {
+                    OnAppConfig.Instance.GlobalRegion.regionUrl = "";
+                }
+            }catch(Exception ex)
+            {
+                MainPage.Log("Error", "杩涘叆娉ㄥ唽鐣岄潰AppConfig寮傚父锛�" + ex.Message);
+            }
         }
 
         //public RegisterPage(Action action)
@@ -290,7 +300,7 @@
                 TextSize = CSS_FontSize.TextFontSize,
             };
             bodyView.AddChidren(btnEmailLogin);
-            if(Language.CurrentLanguage!= "Chinese")
+            if (Language.CurrentLanguage != "Chinese")
             {
                 btnPhoneLogin.Width = Application.GetRealWidth(180);
                 btnEmailLogin.Width = Application.GetRealWidth(180);
@@ -325,7 +335,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.PromptingColor1,
                 TextSize = CSS_FontSize.TextFontSize,
-                TextID = StringId.PleaseSelectCountryOrRegion,
+                TextID = StringId.PlsSelectServer,
             };
             serverView.AddChidren(btnServerText);
 
@@ -373,8 +383,10 @@
             };
 
             //璺宠浆鍥藉鍖哄彿閫夋嫨鐣岄潰
-            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
-                JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
+            EventHandler<MouseEventArgs> eHandler = (sender, e) =>
+            {
+                JLCountrycode.CountryCodeView.Current.Show((countryName, code) =>
+                {
                     if (!string.IsNullOrEmpty(code))
                     {
                         phoneZoneCode = code;

--
Gitblit v1.8.0