From 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 28 十月 2024 11:58:31 +0800
Subject: [PATCH] 谷歌版本问题修复
---
HDL_ON/UI/UI1-Login/RegisterPage.cs | 144 +++++++-----------------------------------------
1 files changed, 21 insertions(+), 123 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index a52fe5e..69c1291 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -233,12 +233,24 @@
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 = "";
+ }
+ getServerList();
+ }catch(Exception ex)
+ {
+ MainPage.Log("Error", "杩涘叆娉ㄥ唽鐣岄潰AppConfig寮傚父锛�" + ex.Message);
+ }
}
//public RegisterPage(Action action)
@@ -261,8 +273,7 @@
Application.HideSoftInput();
};
- new TopViewDiv(this, bodyView, Language.StringByID(StringId.Register)).LoadTopView(backAction);
- //new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.Register));
+ new TopViewDiv(this, bodyView, Language.StringByID(StringId.Register)) { maginY = 10 }.LoadTopView(backAction);
#region 娉ㄥ唽鏂瑰紡閫夋嫨
btnPhoneLogin = new Button()
@@ -290,7 +301,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 +336,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.PleaseSelectCountryOrRegion,
+ TextID = StringId.PlsSelectServer,
};
serverView.AddChidren(btnServerText);
@@ -373,8 +384,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;
@@ -746,10 +759,7 @@
Thread.Sleep(1500);
Application.RunOnMainThread(() =>
{
- ////鍒涘缓鐧诲綍绾跨▼
- //var loginThread = LoadThread_Login(account, password);
- //waitPage = new Loading();
- //new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
+ //鍒涘缓鐧诲綍绾跨▼
dialog.Close();
var isPhone = registerType == 0;
@@ -759,117 +769,5 @@
{ IsBackground = true }.Start();
}
- //#region 鐧诲綍绾跨▼閮ㄥ垎
- ///// <summary>
- ///// 鍔犺浇鐧诲綍绾跨▼
- ///// </summary>
- //Thread LoadThread_Login(string account,string password)
- //{
- // var loginThread = new Thread(() =>
- // {
- // try
- // {
- // //鐧诲綍
- // var loginResult = LoadMethod_Login(account,password);
- // if (loginResult)
- // {
- // //鑾峰彇浣忓畢淇℃伅
- // var getResidencesResult = LoadMethod_GetResidences();
- // if (getResidencesResult)
- // {
- // /*
- // * Wait : 鎺ㄩ�佹敞鍐�
- // */
-
- // Application.RunOnMainThread(() =>
- // {
- // waitPage.RemoveFromParent();
- // waitPage = null;
-
- // //璺宠浆椤甸潰----
- // MainPage.GoUserPage();
- // });
- // }
- // }
- // }
- // catch (Exception ex)
- // {
- // MainPage.Log($"LoginPage : {ex.Message}");
- // }
- // })
- // { IsBackground = true };
- // return loginThread;
- //}
-
- ///// <summary>
- ///// 璋冪敤鐧诲綍鎺ュ彛鐧诲綍
- ///// </summary>
- //bool LoadMethod_Login(string account, string password)
- //{
- // var result = false;
- // //璋冪敤鐧诲綍鎺ュ彛
- // var loginResult = pm.LoginByPassword(account, password);
- // if (loginResult.Code == StateCode.SUCCESS)
- // {
- // var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
- // // UserInfo.Current = new UserInfo
- // //{
- // // userType = revertData.userType,
- // // accountString = account,
- // // password = password,
- // // lastTime = DateTime.Now,
- // // ID = revertData.userId,
- // // loginTokenString = revertData.headerPrefix + revertData.accessToken,
- // // refreshToken = revertData.refreshToken,
- // // userName = revertData.name
- // //};
- // UserInfo.Current.userType = revertData.userType;
- // UserInfo.Current.AccountString = account;
- // //UserInfo.Current.password = password;
- // UserInfo.Current.LastTime = DateTime.Now;
- // UserInfo.Current.ID = revertData.userId;
- // UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
- // UserInfo.Current.RefreshToken = revertData.refreshToken;
- // UserInfo.Current.userName = revertData.name;
-
- // UserInfo.Current.SaveUserInfo();
- // MainPage.Log("鐧诲綍鎴愬姛銆�");
- // result = true;
- // }
- // else
- // {
- // //鐧诲綍澶辫触
- // IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
- // Application.RunOnMainThread(() =>
- // {
- // btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- // btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
- // });
- // }
- // return result;
- //}
-
- ///// <summary>
- ///// 鑾峰彇浣忓畢鍒楄〃
- ///// </summary>
- //bool LoadMethod_GetResidences()
- //{
- // var result = false;
- // var responsePack = pm.GetHomePager();
- // if (responsePack == StateCode.SUCCESS)
- // {
- // //2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
- // if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
- // {
- // result = true;
- // }
- // }
- // else
- // {
- // IMessageCommon.Current.ShowErrorInfoAlter(responsePack);
- // }
- // return result;
- //}
- //#endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0