From 1bb8683aef25143048e572b65734de4772bfc712 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 10:48:17 +0800
Subject: [PATCH] Merge branch 'CJL-NEW'

---
 HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
index 35f59a2..54bad8f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
@@ -40,6 +40,12 @@
         /// 
         /// </summary>
         FrameLayout bodyView;
+
+        /// <summary>
+        /// 鏄惁鐐瑰嚮浜嗚繑鍥烇紝鐢ㄤ簬灞忚斀EditText澶卞幓鐒︾偣妫�娴嬩簨浠�
+        /// </summary>
+        bool isHitBack;
+
         #endregion
 
         public ResetPasswordPage()
@@ -50,7 +56,13 @@
         public void LoadPage()
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-            new TopViewDiv(bodyView, Language.StringByID(StringId.ModifyPassword)).LoadTopView();
+
+            Action backAction = () =>
+            {
+                isHitBack = true;
+            };
+
+            new TopViewDiv(bodyView, Language.StringByID(StringId.ModifyPassword)).LoadTopView(backAction);
 
             #region 鏂板瘑鐮�
             FrameLayout rowView = new FrameLayout()
@@ -257,6 +269,10 @@
                 }
                 else
                 {
+                    if (isHitBack) return;//鐐瑰嚮杩斿洖鍏抽棴椤甸潰涓嶆娴嬫彁绀�
+
+                    if (etPassword.Text.Length == 0) return;//娌¤緭鍏ヤ笉妫�娴嬫彁绀�
+
                     //鏍¢獙瀵嗙爜鏄惁绗﹀悎瑕佹眰
                     if (etPassword.Text.Trim().Length < 6 || etPassword.Text.Trim().Length > 13)
                     {
@@ -283,6 +299,10 @@
                 }
                 else
                 {
+                    if (isHitBack) return;//鐐瑰嚮杩斿洖鍏抽棴椤甸潰涓嶆娴嬫彁绀�
+
+                    if (etRepeatPassword.Text.Length == 0) return;//娌¤緭鍏ヤ笉妫�娴嬫彁绀�
+
                     //鏍¢獙涓ゆ杈撳叆鐨勫瘑鐮佹槸鍚︿竴鑷�
                     if (etPassword.Text.Trim() != etRepeatPassword.Text.Trim())
                     {
@@ -300,6 +320,13 @@
                 }
             };
 
+            Action<View, string> textChangeEventHandler = (view, textStr) =>
+            {
+                LoadMothed_EnableResetButton();
+            };
+            etPassword.TextChangeEventHandler += textChangeEventHandler;
+            etRepeatPassword.TextChangeEventHandler += textChangeEventHandler;
+
         }
 
         /// <summary>

--
Gitblit v1.8.0