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/RegisterPage.cs | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs index eb9b2f2..e6225f9 100644 --- a/HDL_ON/UI/UI1-Login/RegisterPage.cs +++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs @@ -166,12 +166,12 @@ #endregion #region 灞�閮ㄥ彉閲忓垪琛� - /// <summary> - /// 璐﹀彿绫诲瀷 - /// 0:鎵嬫満 - /// 1:閭 - /// </summary> - int accountType = 0; + ///// <summary> + ///// 璐﹀彿绫诲瀷 + ///// 0:鎵嬫満 + ///// 1:閭 + ///// </summary> + //int accountType = 0; /// <summary> /// 鎵嬫満鍙风爜鏄惁鏈夋晥 /// </summary> @@ -193,7 +193,7 @@ /// 0:鎵嬫満 /// 1:閭 /// </summary> - int registerType; + int registerType = 0; /// <summary> /// 鎵嬫満鍖哄彿 /// </summary> @@ -205,6 +205,10 @@ string registerPhone; string registerEmail; + /// <summary> + /// 鏄惁鐐瑰嚮浜嗚繑鍥烇紝鐢ㄤ簬灞忚斀EditText澶卞幓鐒︾偣妫�娴嬩簨浠� + /// </summary> + bool isHitBack; #endregion /// <summary> @@ -228,6 +232,11 @@ }; AddChidren(bodyView); + //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢 + bodyView.MouseDownEventHandler += (sender, e) => { + Application.HideSoftInput(); + }; + pm = new HttpServerRequest(); } @@ -244,7 +253,14 @@ public void ShowDialog() { - new TopViewDiv(this, bodyView, Language.StringByID(StringId.Register)).LoadTopView(); + Action backAction = () => + { + isHitBack = true; + //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢 + Application.HideSoftInput(); + }; + + new TopViewDiv(this, bodyView, Language.StringByID(StringId.Register)).LoadTopView(backAction); //new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.Register)); #region 娉ㄥ唽鏂瑰紡閫夋嫨 @@ -273,6 +289,11 @@ TextSize = CSS_FontSize.TextFontSize, }; bodyView.AddChidren(btnEmailLogin); + if(Language.CurrentLanguage!= "Chinese") + { + btnPhoneLogin.Width = Application.GetRealWidth(180); + btnEmailLogin.Width = Application.GetRealWidth(180); + } #endregion #region 鏈嶅姟鍣ㄩ�夋嫨 @@ -362,7 +383,7 @@ }; btnGlobalRoaming.MouseUpEventHandler += eHandler; - if (accountType == 0) + if (registerType == 0) { accountView.AddChidren(btnGlobalRoaming); } @@ -406,7 +427,7 @@ Height = Application.GetMinRealAverage(20), UnSelectedImagePath = "LoginIcon/AccountIcon.png", }; - if (accountType == 1) + if (registerType == 1) { accountView.AddChidren(btnAccountIcon); } @@ -586,6 +607,7 @@ TextSize = CSS_FontSize.TextFontSize, PlaceholderTextColor = CSS_Color.PromptingColor1, PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode), + IsNumberKeyboardType = true }; verificationCodeView.AddChidren(etVerificationCode); -- Gitblit v1.8.0