From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01

---
 ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs
index 50a2a5a..6fb528b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs
@@ -12,6 +12,10 @@
         #region 鈻� 鍙橀噺澹版槑___________________________
 
         /// <summary>
+        /// 瀵嗙爜鏀瑰彉浜嬩欢
+        /// </summary>
+        public Action<string> PasswordChangedEvent = null;
+        /// <summary>
         /// 鐢ㄦ埛璐﹀彿
         /// </summary>
         private int pswNo = 0;
@@ -111,11 +115,19 @@
 
             //鐣岄潰鐩存帴鍏抽棴
             this.CloseForm();
-            //鍏抽棴缂栬緫鐣岄潰
-            this.CloseFormByFormName("PasswordUserEditorForm");
 
-            var form = new PasswordUserEditorForm();
-            form.AddForm(this.pswNo, pswValue1, i_titleText);
+            if (UserCenterResourse.DicActionForm.ContainsKey("PasswordUserEditorForm") == false)
+            {
+                var form = new PasswordUserEditorForm();
+                form.AddForm(this.pswNo, pswValue1, i_titleText);
+            }
+            else
+            {
+                //鍥炶皟鍑芥暟
+                this.PasswordChangedEvent?.Invoke(pswValue1);
+                this.PasswordChangedEvent = null;
+
+            }
         }
 
         #endregion

--
Gitblit v1.8.0