From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC

---
 HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
index 8fce558..e936f17 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -116,7 +116,11 @@
         /// <summary>
         /// 鑾峰彇楠岃瘉鐮佹寜閽�
         /// </summary>
-        Button btnGetVerificationCode;
+        Button btnGetVerificationCode_Phone;
+        /// <summary>
+        /// 鑾峰彇楠岃瘉鐮佹寜閽�
+        /// </summary>
+        Button btnGetVerificationCode_Mail;
         /// <summary>
         /// 楠岃瘉鐮佸瓙鍖哄煙搴曢儴鍒嗗壊绾�
         /// </summary>
@@ -149,6 +153,16 @@
         /// 1:閭
         /// </summary>
         int registerType;
+        /// <summary>
+        /// 鎵嬫満鍖哄彿
+        /// </summary>
+        string phoneZoneCode = "86";
+
+        /// <summary>
+        /// 
+        /// </summary>
+        string registerPhone;
+        string registerEmail;
         #endregion
         public ForgetPasswordPage(Action<string> action)
         {
@@ -164,7 +178,8 @@
 
         public void ShowDialog()
         {
-            new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.ForgetPassword));
+            new TopViewDiv(this,bodyView, Language.StringByID(StringId.ForgetPassword)).LoadTopView();
+            //new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.ForgetPassword));
 
             #region 淇敼鏂瑰紡閫夋嫨
             btnPhoneLogin = new Button()
@@ -173,7 +188,7 @@
                 Y = Application.GetRealHeight(112),
                 Width = Application.GetRealWidth(120),
                 Height = Application.GetRealHeight(40),
-                TextID = StringId.LoginByPhone,
+                TextID = StringId.PhoneNumberAccount,
                 TextColor = CSS_Color.MainColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
@@ -186,7 +201,7 @@
                 Y = Application.GetRealHeight(112),
                 Width = Application.GetRealWidth(100),
                 Height = Application.GetRealHeight(40),
-                TextID = StringId.LoginByEmail,
+                TextID = StringId.EmailAccount,
                 TextColor = CSS_Color.PromptingColor1,
                 TextAlignment = TextAlignment.Center,
                 TextSize = CSS_FontSize.TextFontSize,
@@ -210,9 +225,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);
@@ -227,6 +255,7 @@
                 TextSize = CSS_FontSize.TextFontSize,
                 PlaceholderTextColor = CSS_Color.PromptingColor1,
                 PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
+                IsNumberKeyboardType = true
             };
             accountView.AddChidren(etAccount);
 
@@ -295,7 +324,7 @@
             };
             verificationCodeView.AddChidren(etVerificationCode);
 
-            btnGetVerificationCode = new Button()
+            btnGetVerificationCode_Phone = new Button()
             {
                 X = Application.GetRealWidth(219),
                 Width = Application.GetRealWidth(100),
@@ -305,7 +334,20 @@
                 TextAlignment = TextAlignment.CenterRight,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
             };
-            verificationCodeView.AddChidren(btnGetVerificationCode);
+            verificationCodeView.AddChidren(btnGetVerificationCode_Phone);
+
+            btnGetVerificationCode_Mail = new Button()
+            {
+                X = Application.GetRealWidth(219),
+                Width = Application.GetRealWidth(100),
+                TextID = StringId.GetVerificationCode,
+                SelectedTextColor = CSS_Color.MainColor,
+                TextColor = CSS_Color.PromptingColor1,
+                TextAlignment = TextAlignment.CenterRight,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                Visible = false
+            };
+            verificationCodeView.AddChidren(btnGetVerificationCode_Mail);
 
             btnVerificationCodeViewBottomLine = new Button()
             {
@@ -457,8 +499,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