From 404cdc88627f942df7944af04ee05b9d527752d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 九月 2019 13:22:40 +0800
Subject: [PATCH] 合并了徐梅的按键面板绑定
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorCoercePasswordForm.cs | 214 +++++++++++++++++++++++++++--------------------------
1 files changed, 110 insertions(+), 104 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorCoercePasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorCoercePasswordForm.cs
index 09180b3..62159a3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorCoercePasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorCoercePasswordForm.cs
@@ -7,12 +7,12 @@
/// <summary>
/// 淇敼鑳佽揩瀵嗙爜
/// </summary>
- public class EdtiorCoercePasswordForm : UserCenterCommonForm
+ public class EdtiorCoercePasswordForm : EditorCommonForm
{
/// <summary>
/// 淇℃伅鎻愮ず鎺т欢
/// </summary>
- private ViewNormalControl txtMsg = null;
+ private NormalViewControl txtMsg = null;
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
@@ -32,117 +32,123 @@
}
//鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
+ //this.InitMiddleFrame();
}
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private void InitMiddleFrame()
- {
- //璇疯緭鍏ヨ儊杩瘑鐮�
- var btnTitle = new TitleViewControl();
- btnTitle.TextColor = UserCenterColor.Current.TextGrayColor;
- btnTitle.Y = Application.GetRealHeight(40);
- btnTitle.TextID = R.MyInternationalizationString.uPleaseInputCoercePassword;
- bodyFrameLayout.AddChidren(btnTitle);
+ ///// <summary>
+ ///// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ ///// </summary>
+ //private void InitMiddleFrame()
+ //{
+ // //娓呯┖bodyFrame
+ // this.ClearBodyFrame();
- //鏂板瘑鐮�
- string placeholderText = Language.StringByID(R.MyInternationalizationString.uNewPassword);
- var rowNewPsw = new RowPasswordControl();
- rowNewPsw.Y = btnTitle.Bottom;
- bodyFrameLayout.AddChidren(rowNewPsw);
- rowNewPsw.Init(placeholderText);
+ // //璇疯緭鍏ヨ儊杩瘑鐮�
+ // var btnTitle = new TitleViewControl();
+ // btnTitle.TextColor = UserCenterColor.Current.TextGrayColor;
+ // btnTitle.Y = Application.GetRealHeight(40);
+ // btnTitle.TextID = R.MyInternationalizationString.uPleaseInputCoercePassword;
+ // bodyFrameLayout.AddChidren(btnTitle);
- //纭鏂板瘑鐮�
- placeholderText = Language.StringByID(R.MyInternationalizationString.uConfirmNewPassword);
- var rowConfirmPsw = new RowPasswordControl();
- rowConfirmPsw.Y = rowNewPsw.Bottom;
- bodyFrameLayout.AddChidren(rowConfirmPsw);
- rowConfirmPsw.Init(placeholderText);
+ // //鏂板瘑鐮�
+ // string placeholderText = Language.StringByID(R.MyInternationalizationString.uNewPassword);
+ // var rowNewPsw = new RowPasswordControl();
+ // rowNewPsw.Y = btnTitle.Bottom;
+ // bodyFrameLayout.AddChidren(rowNewPsw);
+ // rowNewPsw.Init(placeholderText);
- //鎻愮ず淇℃伅
- this.txtMsg = new ViewNormalControl(800, true);
- txtMsg.X = ControlCommonResourse.XXLeft;
- txtMsg.Y = rowConfirmPsw.Bottom + Application.GetRealHeight(5);
- txtMsg.TextColor = UserCenterColor.Current.Red;
- bodyFrameLayout.AddChidren(txtMsg);
+ // //纭鏂板瘑鐮�
+ // placeholderText = Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewPassword);
+ // var rowConfirmPsw = new RowPasswordControl();
+ // rowConfirmPsw.Y = rowNewPsw.Bottom;
+ // bodyFrameLayout.AddChidren(rowConfirmPsw);
+ // rowConfirmPsw.Init(placeholderText);
- //瀹屾垚
- var btnfinish = new TopLayoutFinshView();
- topFrameLayout.AddChidren(btnfinish);
- btnfinish.MouseUpEventHandler += (sender, e) =>
- {
- //鎵ц淇敼鑳佽揩瀵嗙爜
- this.ChangedCoercePassword(rowNewPsw.Text, rowConfirmPsw.Text);
- };
- }
+ // //鎻愮ず淇℃伅
+ // this.txtMsg = new NormalViewControl(800, true);
+ // txtMsg.X = ControlCommonResourse.XXLeft;
+ // txtMsg.Y = rowConfirmPsw.Bottom + Application.GetRealHeight(5);
+ // txtMsg.TextColor = UserCenterColor.Current.Red;
+ // bodyFrameLayout.AddChidren(txtMsg);
- /// <summary>
- /// 鎵ц淇敼鑳佽揩瀵嗙爜
- /// </summary>
- /// <param name="pswValue1">鏂板瘑鐮�</param>
- /// <param name="pswValue2">纭瀵嗙爜</param>
- private async void ChangedCoercePassword(string pswValue1, string pswValue2)
- {
- //妫�娴嬪瘑鐮�
- string msg = this.CheckPassword(pswValue1, pswValue2);
- if (msg != string.Empty)
- {
- Application.RunOnMainThread(() =>
- {
- txtMsg.Text = msg;
- });
- return;
- }
- //鎵ц淇敼
- bool result = await Common.LocalSafeguard.Current.ChangedUserPassword(5, pswValue1);
- if (result == false)
- {
- return;
- }
+ // //瀹屾垚
+ // var btnfinish = new TopLayoutFinshView();
+ // topFrameLayout.AddChidren(btnfinish);
+ // btnfinish.MouseUpEventHandler += (sender, e) =>
+ // {
+ // //鎵ц淇敼鑳佽揩瀵嗙爜
+ // this.ChangedCoercePassword(rowNewPsw.Text, rowConfirmPsw.Text);
+ // };
+ //}
- //鑳佽揩瀵嗙爜宸叉洿鏂�
- string Refmsg = Language.StringByID(R.MyInternationalizationString.uCoercePasswordRefreshMsg);
- Application.RunOnMainThread(() =>
- {
- //鍒锋柊涓荤晫闈�
- this.LoadFormMethodByName("CoercePasswordMainForm", "InitMiddleFrame");
+ ///// <summary>
+ ///// 鎵ц淇敼鑳佽揩瀵嗙爜
+ ///// </summary>
+ ///// <param name="pswValue1">鏂板瘑鐮�</param>
+ ///// <param name="pswValue2">纭瀵嗙爜</param>
+ //private async void ChangedCoercePassword(string pswValue1, string pswValue2)
+ //{
+ // //妫�娴嬪瘑鐮�
+ // string msg = this.CheckPassword(pswValue1, pswValue2);
+ // if (msg != string.Empty)
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (txtMsg != null)
+ // {
+ // txtMsg.Text = msg;
+ // }
+ // });
+ // return;
+ // }
+ // //鎵ц淇敼
+ // bool result = await Common.LocalSafeguard.Current.ChangedUserPassword(5, pswValue1);
+ // if (result == false)
+ // {
+ // return;
+ // }
- var form = new PasswordRefreshMsgForm();
- this.AddFromAndRemoveNowForm(form, Refmsg);
- });
- }
+ // //鑳佽揩瀵嗙爜宸叉洿鏂�
+ // string Refmsg = Language.StringByID(R.MyInternationalizationString.uCoercePasswordRefreshMsg);
+ // Application.RunOnMainThread(() =>
+ // {
+ // //鍒锋柊涓荤晫闈�
+ // this.LoadFormMethodByName("CoercePasswordMainForm", "InitMiddleFrame");
- /// <summary>
- /// 瀵嗙爜妫�鏌ワ紝杩斿洖閿欒淇℃伅锛屾棤閿欒淇℃伅(绌哄瓧绗︿覆)鍒欒〃绀烘垚鍔�
- /// </summary>
- /// <param name="pswValue1"></param>
- /// <param name="pswValue2"></param>
- /// <returns></returns>
- private string CheckPassword(string pswValue1, string pswValue2)
- {
- if (pswValue1 == string.Empty)
- {
- //璇疯緭鍏ユ柊瀵嗙爜
- return Language.StringByID(R.MyInternationalizationString.uPleaseInputNewPassword);
- }
- if (pswValue2 == string.Empty)
- {
- //璇疯緭鍏ョ‘璁ゅ瘑鐮�
- return Language.StringByID(R.MyInternationalizationString.PleaseInputConfirmPsw);
- }
- if (pswValue1.Length < UserCenterResourse.PasswordLength)
- {
- //瀵嗙爜闀垮害涓嶄綆浜巤0}浣嶆暟
- return string.Format(Language.StringByID(R.MyInternationalizationString.PswLengthMsg), UserCenterResourse.PasswordLength);
- }
- if (pswValue1 != pswValue2)
- {
- //涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�
- return Language.StringByID(R.MyInternationalizationString.SecondPswNotEqual);
- }
- return string.Empty;
- }
+ // var form = new PasswordRefreshMsgForm();
+ // this.AddFromAndRemoveNowForm(form, Refmsg);
+ // });
+ //}
+
+ ///// <summary>
+ ///// 瀵嗙爜妫�鏌ワ紝杩斿洖閿欒淇℃伅锛屾棤閿欒淇℃伅(绌哄瓧绗︿覆)鍒欒〃绀烘垚鍔�
+ ///// </summary>
+ ///// <param name="pswValue1"></param>
+ ///// <param name="pswValue2"></param>
+ ///// <returns></returns>
+ //private string CheckPassword(string pswValue1, string pswValue2)
+ //{
+ // if (pswValue1 == string.Empty)
+ // {
+ // //璇疯緭鍏ユ柊瀵嗙爜
+ // return Language.StringByID(R.MyInternationalizationString.uPleaseInputNewPassword);
+ // }
+ // if (pswValue2 == string.Empty)
+ // {
+ // //璇疯緭鍏ョ‘璁ゅ瘑鐮�
+ // return Language.StringByID(R.MyInternationalizationString.PleaseInputConfirmPsw);
+ // }
+ // if (pswValue1.Length < UserCenterResourse.PasswordLength)
+ // {
+ // //瀵嗙爜闀垮害涓嶄綆浜巤0}浣嶆暟
+ // return string.Format(Language.StringByID(R.MyInternationalizationString.PswLengthMsg), UserCenterResourse.PasswordLength);
+ // }
+ // if (pswValue1 != pswValue2)
+ // {
+ // //涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�
+ // return Language.StringByID(R.MyInternationalizationString.SecondPswNotEqual);
+ // }
+ // return string.Empty;
+ //}
}
}
--
Gitblit v1.8.0