From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs
similarity index 82%
rename from ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs
index b1c7237..7eead35 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs
@@ -5,9 +5,9 @@
namespace Shared.Phone.UserCenter.Safety
{
/// <summary>
- /// 淇敼鐢ㄦ埛瀵嗙爜鐨勭敾闈�
+ /// 鏂板缓鐢ㄦ埛瀵嗙爜鐨勭敾闈�
/// </summary>
- public class EdtiorUserPasswordForm : EditorCommonForm
+ public class PasswordAddNewForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -40,19 +40,23 @@
base.SetTitleText(i_titleText);
//鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
+ this.InitMiddleFrame(i_titleText);
}
/// <summary>
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
- private void InitMiddleFrame()
+ /// <param name="i_titleText">澶撮儴鏍囬淇℃伅</param>
+ private void InitMiddleFrame(string i_titleText)
{
//娓呯┖bodyFrame
this.ClearBodyFrame();
//璇疯緭鍏ユ柊瀹夐槻瀵嗙爜
pswControl = new PswNumberInputControl(Language.StringByID(R.MyInternationalizationString.uPleaseInputNewSafetyPassword), 4);
+ pswControl.NumberIconBackColor = UserCenterColor.Current.White;
+ pswControl.Gravity = Gravity.CenterHorizontal;
+ pswControl.Y = Application.GetRealHeight(102);
bodyFrameLayout.AddChidren(pswControl);
pswControl.InitControl();
@@ -71,7 +75,7 @@
return;
}
//鎵ц淇敼鐢ㄦ埛瀵嗙爜
- this.ChangedAdminPassword(firstPsw, pssword);
+ this.ChangedAdminPassword(firstPsw, i_titleText);
}
else
{
@@ -90,11 +94,10 @@
/// 鎵ц淇敼鐢ㄦ埛瀵嗙爜
/// </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;
@@ -104,12 +107,17 @@
return;
}
- //鐢ㄦ埛瀵嗙爜宸叉洿鏂�
- string msg = Language.StringByID(R.MyInternationalizationString.uUserPasswordRefreshMsg);
+ //瀹夐槻瀵嗙爜璁剧疆鎴愬姛
+ string msg = Language.StringByID(R.MyInternationalizationString.uSetSafetyPasswordSuccess);
this.ShowMassage(ShowMsgType.Tip, msg);
- //鐣岄潰鐩存帴鍏抽棴(鏆傛椂)
+ //鐣岄潰鐩存帴鍏抽棴
this.CloseForm();
+ //鍏抽棴缂栬緫鐣岄潰
+ this.CloseFormByFormName("PasswordUserEditorForm");
+
+ var form = new PasswordUserEditorForm();
+ form.AddForm(this.pswNo, pswValue1, i_titleText);
}
#endregion
--
Gitblit v1.8.0