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/ForgetPasswordPage.cs |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
index e936f17..b63cf28 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -145,8 +145,10 @@
         HttpServerRequest pm;
         /// <summary>
         /// 鍥炶皟浜嬩欢
+        /// 璐﹀彿锛屽瘑鐮侊紝鏄惁鎵嬫満
+        /// account锛宲assword锛宨sPhone
         /// </summary>
-        Action<string> callbackAction;
+        Action<string, string, bool> AutoLoginAction;
         /// <summary>
         /// 淇敼绫诲瀷
         /// 0:鎵嬫満
@@ -163,22 +165,42 @@
         /// </summary>
         string registerPhone;
         string registerEmail;
+        /// <summary>
+        /// 鏄惁鐐瑰嚮浜嗚繑鍥烇紝鐢ㄤ簬灞忚斀EditText澶卞幓鐒︾偣妫�娴嬩簨浠�
+        /// </summary>
+        bool isHitBack;
         #endregion
-        public ForgetPasswordPage(Action<string> action)
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="autoLoginAction">鑷姩鐧诲綍鍥炶皟浜嬩欢</param>
+        public ForgetPasswordPage(Action<string, string, bool> autoLoginAction)
         {
-            callbackAction = action;
+            AutoLoginAction = autoLoginAction;
             bodyView = new FrameLayout()
             {
-                BackgroundColor = CSS_Color.BackgroundColor,
+                BackgroundColor = CSS_Color.MainBackgroundColor,
             };
             AddChidren(bodyView);
+            //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+            bodyView.MouseDownEventHandler += (sender, e) => {
+                Application.HideSoftInput();
+            };
 
             pm = new HttpServerRequest();
         }
 
         public void ShowDialog()
         {
-            new TopViewDiv(this,bodyView, Language.StringByID(StringId.ForgetPassword)).LoadTopView();
+            Action backAction = () =>
+            {
+                isHitBack = true;
+                //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+                Application.HideSoftInput();
+               
+            };
+            new TopViewDiv(this, bodyView, Language.StringByID(StringId.ModifyPassword)).LoadTopView(backAction);
             //new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.ForgetPassword));
 
             #region 淇敼鏂瑰紡閫夋嫨
@@ -207,6 +229,13 @@
                 TextSize = CSS_FontSize.TextFontSize,
             };
             bodyView.AddChidren(btnEmailLogin);
+
+            bodyView.AddChidren(btnEmailLogin);
+            if (Language.CurrentLanguage != "Chinese")
+            {
+                btnPhoneLogin.Width = Application.GetRealWidth(180);
+                btnEmailLogin.Width = Application.GetRealWidth(180);
+            }
             #endregion
 
             #region 璐﹀彿濉啓
@@ -321,6 +350,7 @@
                 TextSize = CSS_FontSize.TextFontSize,
                 PlaceholderTextColor = CSS_Color.PromptingColor1,
                 PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode),
+                IsNumberKeyboardType = true
             };
             verificationCodeView.AddChidren(etVerificationCode);
 

--
Gitblit v1.8.0