From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs
index e354820..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;
@@ -66,8 +70,6 @@
string msg = this.CheckPassword(firstPsw, pssword);
if (msg != string.Empty)
{
- //璇烽噸澶嶈緭鍏ユ柊鑳佽揩瀵嗙爜
- pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewCoercePassword));
//璁剧疆閿欒淇℃伅
pswControl.SetErrorMsg(msg);
return;
@@ -111,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