From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2

---
 HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs |   63 +++++++++++++++++++++++++++----
 1 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
index 24f16d6..9dfb338 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -145,36 +145,62 @@
         HttpServerRequest pm;
         /// <summary>
         /// 鍥炶皟浜嬩欢
+        /// 璐﹀彿锛屽瘑鐮侊紝鏄惁鎵嬫満
+        /// account锛宲assword锛宨sPhone
         /// </summary>
-        Action<string> callbackAction;
+        Action<string, string, bool> AutoLoginAction;
         /// <summary>
         /// 淇敼绫诲瀷
         /// 0:鎵嬫満
         /// 1:閭
         /// </summary>
         int registerType;
+        /// <summary>
+        /// 鎵嬫満鍖哄彿
+        /// </summary>
+        string phoneZoneCode = "86";
 
         /// <summary>
         /// 
         /// </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 淇敼鏂瑰紡閫夋嫨
@@ -203,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 璐﹀彿濉啓
@@ -221,9 +254,22 @@
                 X = Application.GetRealWidth(9),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
-                Text = "+86",
+                Text = "+" + phoneZoneCode,
                 TextSize = CSS_FontSize.TextFontSize,
             };
+
+            //璺宠浆鍥藉鍖哄彿閫夋嫨鐣岄潰
+            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
+                JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
+                    if (!string.IsNullOrEmpty(code))
+                    {
+                        phoneZoneCode = code;
+                        btnGlobalRoaming.Text = "+" + phoneZoneCode;
+                    }
+                });
+            };
+            btnGlobalRoaming.MouseUpEventHandler += eHandler;
+
             if (accountType == 0)
             {
                 accountView.AddChidren(btnGlobalRoaming);
@@ -238,6 +284,7 @@
                 TextSize = CSS_FontSize.TextFontSize,
                 PlaceholderTextColor = CSS_Color.PromptingColor1,
                 PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
+                IsNumberKeyboardType = true
             };
             accountView.AddChidren(etAccount);
 
@@ -481,8 +528,8 @@
                 Gravity = Gravity.CenterHorizontal,
                 Y = Application.GetRealHeight(421),
                 Width = Application.GetRealWidth(220),
-                Height = Application.GetRealHeight(44),
-                Radius = (uint)Application.GetRealHeight(22),
+                Height = Application.GetRealWidth(44),
+                Radius = (uint)Application.GetRealWidth(22),
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 BackgroundColor = CSS_Color.PromptingColor1,
                 TextID = StringId.ConfirmReset,

--
Gitblit v1.8.0