From f718d23a262a5a8e1241fdeaeb4153399f95e79d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 21 四月 2020 09:19:05 +0800
Subject: [PATCH] 20200421

---
 HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs |   70 ++++++++++------------------------
 1 files changed, 21 insertions(+), 49 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
index 33ed547..91b03b9 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -9,6 +9,10 @@
     {
         #region 鎺т欢鍒楄〃
         /// <summary>
+        /// 绛夊緟鎻愮ず
+        /// </summary>
+        Loading waitPage;
+        /// <summary>
         /// 褰撳墠鐣岄潰
         /// </summary>
         FrameLayout bodyView;
@@ -16,10 +20,6 @@
         /// 閫夋嫨鎵嬫満鐧诲綍鎸夐挳
         /// </summary>
         Button btnPhoneLogin;
-        /// <summary>
-        /// 鐧诲綍绫诲瀷閫変腑鎻愮ず绾�
-        /// </summary>
-        Button btnChooseBottomLine;
         /// <summary>
         /// 閫夋嫨閭鐧诲綍鎸夐挳
         /// </summary>
@@ -124,7 +124,7 @@
         /// <summary>
         /// 淇敼鎸夐挳
         /// </summary>
-        Button btnRegister;
+        Button btnReset;
 
         #endregion
 
@@ -135,14 +135,6 @@
         /// 1:閭
         /// </summary>
         int accountType = 0;
-        /// <summary>
-        /// 鎵嬫満鍙风爜鏄惁鏈夋晥
-        /// </summary>
-        bool ValidMobileNumber = false;
-        /// <summary>
-        /// 瀵嗙爜鏄惁鏈夋晥
-        /// </summary>
-        bool ValidPassword = false;
         /// <summary>
         /// 鏈嶅姟鍣ㄨ姹傚璞�
         /// </summary>
@@ -158,8 +150,9 @@
         /// </summary>
         int registerType;
         #endregion
-        public ForgetPasswordPage()
+        public ForgetPasswordPage(Action<string> action)
         {
+            callbackAction = action;
             bodyView = new FrameLayout()
             {
                 BackgroundColor = CSS_Color.BackgroundColor,
@@ -171,7 +164,8 @@
 
         public void ShowDialog()
         {
-            new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(R.InternationalizationString.Register));
+            new TopViewDiv(this,bodyView, Language.StringByID(StringId.ForgetPassword)).LoadTopView();
+            //new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.ForgetPassword));
 
             #region 淇敼鏂瑰紡閫夋嫨
             btnPhoneLogin = new Button()
@@ -180,24 +174,12 @@
                 Y = Application.GetRealHeight(112),
                 Width = Application.GetRealWidth(120),
                 Height = Application.GetRealHeight(40),
-                TextID = R.InternationalizationString.LoginByPhone,
+                TextID = StringId.LoginByPhone,
                 TextColor = CSS_Color.MainColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
             };
             bodyView.AddChidren(btnPhoneLogin);
-
-            btnChooseBottomLine = new Button()
-            {
-                Width = Application.GetRealWidth(46),
-                Height = Application.GetRealHeight(4),
-                X = btnPhoneLogin.X + Application.GetRealWidth(27),
-                Y = btnPhoneLogin.Bottom,
-                Radius = (uint)Application.GetRealHeight(2),
-                BorderWidth = 0,
-                BackgroundColor = CSS_Color.MainColor,
-            };
-            bodyView.AddChidren(btnChooseBottomLine);
 
             btnEmailLogin = new Button()
             {
@@ -205,7 +187,7 @@
                 Y = Application.GetRealHeight(112),
                 Width = Application.GetRealWidth(100),
                 Height = Application.GetRealHeight(40),
-                TextID = R.InternationalizationString.LoginByEmail,
+                TextID = StringId.LoginByEmail,
                 TextColor = CSS_Color.PromptingColor1,
                 TextAlignment = TextAlignment.Center,
                 TextSize = CSS_FontSize.TextFontSize,
@@ -237,16 +219,6 @@
                 accountView.AddChidren(btnGlobalRoaming);
             }
 
-            //btnDividingLineVertical_AccountView = new Button()
-            //{
-            //    X = Application.GetRealWidth(65),
-            //    Gravity = Gravity.CenterVertical,
-            //    Width = 1,
-            //    Height = Application.GetRealHeight(20),
-            //    BackgroundColor = CSS_Color.DividingLineColor,
-            //};
-            //accountView.AddChidren(btnDividingLineVertical_AccountView);
-
             etAccount = new EditText()
             {
                 X = Application.GetRealWidth(49),
@@ -255,7 +227,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
                 PlaceholderTextColor = CSS_Color.PromptingColor1,
-                PlaceholderText = Language.StringByID(R.InternationalizationString.PlsEntryPhoneNumber),
+                PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
             };
             accountView.AddChidren(etAccount);
 
@@ -320,7 +292,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
                 PlaceholderTextColor = CSS_Color.PromptingColor1,
-                PlaceholderText = Language.StringByID(R.InternationalizationString.PlsEntryVerificationCode),
+                PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode),
             };
             verificationCodeView.AddChidren(etVerificationCode);
 
@@ -328,7 +300,7 @@
             {
                 X = Application.GetRealWidth(219),
                 Width = Application.GetRealWidth(100),
-                TextID = R.InternationalizationString.GetVerificationCode,
+                TextID = StringId.GetVerificationCode,
                 SelectedTextColor = CSS_Color.MainColor,
                 TextColor = CSS_Color.PromptingColor1,
                 TextAlignment = TextAlignment.CenterRight,
@@ -385,7 +357,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
                 PlaceholderTextColor = CSS_Color.PromptingColor1,
-                PlaceholderText = Language.StringByID(R.InternationalizationString.PlsRegisterPassword),
+                PlaceholderText = Language.StringByID(StringId.PlsRegisterPassword),
                 SecureTextEntry = true,
             };
             passwordView.AddChidren(etPassword);
@@ -417,7 +389,7 @@
             repeatPasswordView = new FrameLayout()
             {
                 X = Application.GetRealWidth(28),
-                Y = Application.GetRealHeight(279),
+                Y = Application.GetRealHeight(335),
                 Width = Application.GetRealWidth(335),
                 Height = Application.GetRealHeight(44),
             };
@@ -451,7 +423,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
                 PlaceholderTextColor = CSS_Color.PromptingColor1,
-                PlaceholderText = Language.StringByID(R.InternationalizationString.PlsRegisterRepeatPassword),
+                PlaceholderText = Language.StringByID(StringId.PlsRegisterRepeatPassword),
                 SecureTextEntry = true,
             };
             repeatPasswordView.AddChidren(etRepeatPassword);
@@ -481,7 +453,7 @@
 
             #endregion
 
-            btnRegister = new Button()
+            btnReset = new Button()
             {
                 Gravity = Gravity.CenterHorizontal,
                 Y = Application.GetRealHeight(421),
@@ -490,14 +462,14 @@
                 Radius = (uint)Application.GetRealHeight(22),
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 BackgroundColor = CSS_Color.PromptingColor1,
-                TextID = R.InternationalizationString.Register,
+                TextID = StringId.ConfirmReset,
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 TextColor = CSS_Color.MainBackgroundColor,
                 TextAlignment = TextAlignment.Center,
             };
-            bodyView.AddChidren(btnRegister);
+            bodyView.AddChidren(btnReset);
 
-            //LoadEventList();
+            LoadEventList();
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0