From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs
index ab75e36..e348862 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 鏁板瓧鎸夐敭瀵嗙爜杈撳叆鎺т欢(鑷埗鐨勬墜鍔ㄦ寜閿緭鍏ョ被鍨�,璇峰疄鐜般�怉ctionPswFinish銆戜簨浠�)
/// </summary>
- public class PswNumberInputControl : FrameLayout
+ public class PswNumberInputControl : FrameLayoutBase
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -79,10 +79,11 @@
{
this.passwordLength = i_passwordLength;
//鍔犻棿璺�
- this.Width = Application.GetMinRealAverage(NumberSize * 3 + NumberLeftRightSpace * 2 + 80);
- this.Height = Application.GetMinRealAverage(NumberSize * 4 + NumberTopButtomSpace * 3) + Application.GetRealHeight(368);
+ this.Width = this.GetPictrueRealSize(NumberSize * 3 + NumberLeftRightSpace * 2 + 80);
+ this.Height = this.GetPictrueRealSize(NumberSize * 4 + NumberTopButtomSpace * 3) + Application.GetRealHeight(368);
this.btnTitle = new NormalViewControl(Application.CurrentWidth, Application.GetRealWidth(75), false);
btnTitle.Text = i_title;
+ btnTitle.IsBold = true;
}
/// <summary>
@@ -111,7 +112,7 @@
//鍒犻櫎鎺т欢
this.btnDelete = new NormalViewControl(200, 60, true);
- btnDelete.X = this.Width - Application.GetRealWidth(200) - Application.GetMinRealAverage(40);
+ btnDelete.X = this.Width - Application.GetRealWidth(200) - this.GetPictrueRealSize(40);
btnDelete.Y = this.Height - Application.GetRealHeight(60);
btnDelete.TextColor = UserCenterColor.Current.TextGrayColor3;
btnDelete.TextAlignment = TextAlignment.Center;
@@ -143,9 +144,9 @@
private void InitPswIconControl()
{
//鍥炬爣澶у皬
- int iconSize = Application.GetMinRealAverage(36);
+ int iconSize = this.GetPictrueRealSize(36);
//鍥炬爣闂寸殑闂撮殧
- int space = Application.GetMinRealAverage(100);
+ int space = this.GetPictrueRealSize(100);
//璁＄畻瀵嗙爜涓暟鏄惁瓒婄晫
int value = Application.CurrentWidth - iconSize * passwordLength;
if (passwordLength > 1)
@@ -193,13 +194,13 @@
frameNumberIcon.Y = Application.GetRealHeight(368);
frameNumberIcon.Width = this.Width;
frameNumberIcon.Gravity = Gravity.CenterHorizontal;
- frameNumberIcon.Height = Application.GetMinRealAverage(NumberSize * 4 + NumberTopButtomSpace * 3);
+ frameNumberIcon.Height = this.GetPictrueRealSize(NumberSize * 4 + NumberTopButtomSpace * 3);
this.AddChidren(frameNumberIcon);
//鍓嶄竴涓帶浠剁殑鍙冲潗鏍�
int btnTempRight = 0;
//闂磋窛
- int space = Application.GetMinRealAverage(NumberLeftRightSpace);
+ int space = this.GetPictrueRealSize(NumberLeftRightSpace);
//1鍒�9鐨勬暟瀛楃洏
for (int i = 1; i <= 9; i++)
{
@@ -211,7 +212,7 @@
}
frameNumberIcon.AddChidren(btnNum);
- btnNum.Y = (i - 1) / 3 * (btnNum.Height + Application.GetMinRealAverage(NumberTopButtomSpace));
+ btnNum.Y = (i - 1) / 3 * (btnNum.Height + this.GetPictrueRealSize(NumberTopButtomSpace));
btnNum.ButtonClickEvent += (sender, e) =>
{
//鐐瑰嚮鏁板瓧鎸夐敭
@@ -227,11 +228,11 @@
//0鐨勬暟瀛楃洏
var btnNum0 = this.InitNumberControl();
- btnNum0.X = Application.GetMinRealAverage(40) + frameNumberIcon.GetChildren(0).Height + space;
+ btnNum0.X = this.GetPictrueRealSize(40) + frameNumberIcon.GetChildren(0).Height + space;
btnNum0.Text = "0";
frameNumberIcon.AddChidren(btnNum0);
- btnNum0.Y = 3 * (frameNumberIcon.GetChildren(0).Height + Application.GetMinRealAverage(NumberTopButtomSpace));
+ btnNum0.Y = 3 * (frameNumberIcon.GetChildren(0).Height + this.GetPictrueRealSize(NumberTopButtomSpace));
btnNum0.ButtonClickEvent += (sender, e) =>
{
//鐐瑰嚮鏁板瓧鎸夐敭
@@ -245,9 +246,9 @@
/// <returns></returns>
private NormalClickButton InitNumberControl()
{
- int iconSize = Application.GetMinRealAverage(NumberSize);
+ int iconSize = this.GetPictrueRealSize(NumberSize);
var btnNum = new NormalClickButton(iconSize, iconSize, false);
- btnNum.X = Application.GetMinRealAverage(40);
+ btnNum.X = this.GetPictrueRealSize(40);
btnNum.BackgroundColor = this.NumberIconBackColor;
btnNum.clickStatuColor = 0x7e656565;
btnNum.Radius = (uint)iconSize / 2;
@@ -290,8 +291,7 @@
/// 閲嶇疆鎺т欢
/// </summary>
/// <param name="i_title">鏍囬淇℃伅</param>
- /// <param name="clearError">鏄惁娓呴櫎閿欒淇℃伅</param>
- public void ResetControlInfo(string i_title, bool clearError = true)
+ public void ResetControlInfo(string i_title)
{
//鏍囬
btnTitle.Text = i_title;
@@ -302,11 +302,8 @@
{
listPswIcon[i].BackgroundColor = UserCenterColor.Current.Transparent;
}
- if (clearError == true)
- {
- //閿欒淇℃伅
- btnError.Text = string.Empty;
- }
+ //閿欒淇℃伅
+ btnError.Text = string.Empty;
}
#endregion
@@ -324,6 +321,14 @@
btnError.Visible = true;
}
btnError.Text = i_msg;
+
+ //璁板綍鐨勫瘑鐮�
+ inputPassword = string.Empty;
+ //瀵嗙爜鍥炬爣
+ for (int i = 0; i < listPswIcon.Count; i++)
+ {
+ listPswIcon[i].BackgroundColor = UserCenterColor.Current.Transparent;
+ }
}
#endregion
@@ -359,7 +364,7 @@
}
//鑷姩璋冩暣楂樺害
- int minHeight = Application.GetMinRealAverage(NumberSize * 4 + NumberTopButtomSpace * 3) + Application.GetRealHeight(368);
+ int minHeight = this.GetPictrueRealSize(NumberSize * 4 + NumberTopButtomSpace * 3) + Application.GetRealHeight(368);
int realHeight = this.btnDelete.Bottom;
if (realHeight < minHeight)
{
--
Gitblit v1.8.0