From 528c105b3aea0e6e00477365f16f57c1e3d7eb1c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 15:31:28 +0800
Subject: [PATCH] 2019-10-24-3

---
 ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs
index 9ee4b75..b1c7237 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs
@@ -22,7 +22,7 @@
         /// <summary>
         /// 瀵嗙爜杈撳叆鎺т欢
         /// </summary>
-        private PsswordInputControl pswControl = null;
+        private PswNumberInputControl pswControl = null;
 
         #endregion
 
@@ -52,11 +52,11 @@
             this.ClearBodyFrame();
 
             //璇疯緭鍏ユ柊瀹夐槻瀵嗙爜
-            pswControl = new PsswordInputControl(Language.StringByID(R.MyInternationalizationString.uPleaseInputNewSafetyPassword), 4);
+            pswControl = new PswNumberInputControl(Language.StringByID(R.MyInternationalizationString.uPleaseInputNewSafetyPassword), 4);
             bodyFrameLayout.AddChidren(pswControl);
             pswControl.InitControl();
 
-            pswControl.ActionPswFinish += (pssword) =>
+            pswControl.FinishInputEvent += (pssword) =>
             {
                 if (firstPsw != string.Empty)
                 {
@@ -79,12 +79,6 @@
                     //璇烽噸澶嶈緭鍏ユ柊瀹夐槻瀵嗙爜
                     pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewSafetyPassword));
                 }
-            };
-
-            //鍙栨秷
-            pswControl.ActionCancel += () =>
-            {
-                this.CloseForm();
             };
         }
 
@@ -143,7 +137,7 @@
             if (pswValue1 != pswValue2)
             {
                 //涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�
-                return Language.StringByID(R.MyInternationalizationString.SecondPswNotEqual);
+                return Language.StringByID(R.MyInternationalizationString.SecondPswNotEqual1);
             }
             return string.Empty;
         }

--
Gitblit v1.8.0