From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs
index f00d28f..44de1b0 100755
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs
+++ b/ZigbeeApp20200414/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