From 18b93d511dc764b469d7c4a7e755f7274f89cdb4 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 27 四月 2020 17:55:14 +0800 Subject: [PATCH] 2020-4-27-1 --- ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs index f00d28f..44de1b0 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs @@ -12,6 +12,10 @@ #region 鈻� 鍙橀噺澹版槑___________________________ /// <summary> + /// 瀵嗙爜鏀瑰彉浜嬩欢 + /// </summary> + public Action<string> PasswordChangedEvent = null; + /// <summary> /// 鐢ㄦ埛璐﹀彿 /// </summary> private int pswNo = 5; @@ -109,11 +113,18 @@ //鐣岄潰鐩存帴鍏抽棴 this.CloseForm(); - //鍏抽棴缂栬緫鐣岄潰 - this.CloseFormByFormName("CoercePswEditorForm"); - var form = new CoercePswEditorForm(); - form.AddForm(pswValue1, i_titleText); + if (UserCenterResourse.DicActionForm.ContainsKey("CoercePswEditorForm") == false) + { + var form = new CoercePswEditorForm(); + form.AddForm(pswValue1, i_titleText); + } + else + { + //鍥炶皟鍑芥暟 + this.PasswordChangedEvent?.Invoke(pswValue1); + this.PasswordChangedEvent = null; + } } #endregion -- Gitblit v1.8.0