From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs
similarity index 70%
copy from ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs
copy to ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs
index b1c7237..e354820 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs
@@ -5,16 +5,16 @@
namespace Shared.Phone.UserCenter.Safety
{
/// <summary>
- /// 淇敼鐢ㄦ埛瀵嗙爜鐨勭敾闈�
+ /// 鍒涘缓鏂扮殑鑳佽揩瀵嗙爜
/// </summary>
- public class EdtiorUserPasswordForm : EditorCommonForm
+ public class CoercePswAddNewForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 鐢ㄦ埛璐﹀彿
/// </summary>
- private int pswNo = 0;
+ private int pswNo = 5;
/// <summary>
/// 绗竴涓瘑鐮�
/// </summary>
@@ -31,28 +31,30 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_pswNo">鐢ㄦ埛璐﹀彿</param>
- /// <param name="i_titleText">澶撮儴鏍囬淇℃伅</param>
- public void ShowForm(int i_pswNo, string i_titleText)
+ /// <param name="i_pswTip">瀵嗙爜澶囨敞</param>
+ public void ShowForm(string i_pswTip)
{
- this.pswNo = i_pswNo;
//璁剧疆澶撮儴淇℃伅
- base.SetTitleText(i_titleText);
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uCoercePassword));
//鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
+ this.InitMiddleFrame(i_pswTip);
}
/// <summary>
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
- private void InitMiddleFrame()
+ /// <param name="i_pswTip">瀵嗙爜澶囨敞</param>
+ private void InitMiddleFrame(string i_pswTip)
{
//娓呯┖bodyFrame
this.ClearBodyFrame();
- //璇疯緭鍏ユ柊瀹夐槻瀵嗙爜
- pswControl = new PswNumberInputControl(Language.StringByID(R.MyInternationalizationString.uPleaseInputNewSafetyPassword), 4);
+ //璇疯緭鍏ユ柊鑳佽揩瀵嗙爜
+ pswControl = new PswNumberInputControl(Language.StringByID(R.MyInternationalizationString.uPleaseInputNewCoercePassword), 4);
+ pswControl.NumberIconBackColor = UserCenterColor.Current.White;
+ pswControl.Gravity = Gravity.CenterHorizontal;
+ pswControl.Y = Application.GetRealHeight(102);
bodyFrameLayout.AddChidren(pswControl);
pswControl.InitControl();
@@ -64,20 +66,20 @@
string msg = this.CheckPassword(firstPsw, pssword);
if (msg != string.Empty)
{
- //璇烽噸澶嶈緭鍏ユ柊瀹夐槻瀵嗙爜
- pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewSafetyPassword));
+ //璇烽噸澶嶈緭鍏ユ柊鑳佽揩瀵嗙爜
+ pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewCoercePassword));
//璁剧疆閿欒淇℃伅
pswControl.SetErrorMsg(msg);
return;
}
//鎵ц淇敼鐢ㄦ埛瀵嗙爜
- this.ChangedAdminPassword(firstPsw, pssword);
+ this.ChangedAdminPassword(firstPsw, i_pswTip);
}
else
{
firstPsw = pssword;
- //璇烽噸澶嶈緭鍏ユ柊瀹夐槻瀵嗙爜
- pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewSafetyPassword));
+ //璇烽噸澶嶈緭鍏ユ柊鑳佽揩瀵嗙爜
+ pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewCoercePassword));
}
};
}
@@ -90,26 +92,30 @@
/// 鎵ц淇敼鐢ㄦ埛瀵嗙爜
/// </summary>
/// <param name="pswValue1">鏂板瘑鐮�</param>
- /// <param name="pswValue2">纭瀵嗙爜</param>
- private async void ChangedAdminPassword(string pswValue1, string pswValue2)
+ private async void ChangedAdminPassword(string pswValue1, string i_titleText)
{
//鎵ц淇敼
- bool result = await HdlSafeguardLogic.Current.ChangedUserPassword(this.pswNo, pswValue1);
+ bool result = await HdlSafeguardLogic.Current.ChangedUserPassword(this.pswNo, pswValue1, string.Empty);
if (result == false)
{
firstPsw = string.Empty;
- //璇疯緭鍏ユ柊瀹夐槻瀵嗙爜
- pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseInputNewSafetyPassword));
+ //璇疯緭鍏ユ柊鑳佽揩瀵嗙爜
+ pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseInputNewCoercePassword));
return;
}
- //鐢ㄦ埛瀵嗙爜宸叉洿鏂�
- string msg = Language.StringByID(R.MyInternationalizationString.uUserPasswordRefreshMsg);
+ //鑳佽揩瀵嗙爜璁剧疆鎴愬姛
+ string msg = Language.StringByID(R.MyInternationalizationString.uSetCoercePasswordSuccess);
this.ShowMassage(ShowMsgType.Tip, msg);
- //鐣岄潰鐩存帴鍏抽棴(鏆傛椂)
+ //鐣岄潰鐩存帴鍏抽棴
this.CloseForm();
+ //鍏抽棴缂栬緫鐣岄潰
+ this.CloseFormByFormName("CoercePswEditorForm");
+
+ var form = new CoercePswEditorForm();
+ form.AddForm(pswValue1, i_titleText);
}
#endregion
--
Gitblit v1.8.0