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/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs
index 91f6b02..ab75e36 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs
@@ -5,7 +5,7 @@
namespace Shared.Phone.UserCenter
{
/// <summary>
- /// 瀵嗙爜杈撳叆鎺т欢(鑷埗鐨勬墜鍔ㄦ寜閿緭鍏ョ被鍨�,璇峰疄鐜般�怉ctionPswFinish銆戜簨浠�)
+ /// 鏁板瓧鎸夐敭瀵嗙爜杈撳叆鎺т欢(鑷埗鐨勬墜鍔ㄦ寜閿緭鍏ョ被鍨�,璇峰疄鐜般�怉ctionPswFinish銆戜簨浠�)
/// </summary>
public class PswNumberInputControl : FrameLayout
{
@@ -38,11 +38,23 @@
/// <summary>
/// 鏍囬鎺т欢
/// </summary>
- private NormalViewControl btnTitle = null;
+ public NormalViewControl btnTitle = null;
/// <summary>
/// 閿欒淇℃伅鎻愮ず鎺т欢
/// </summary>
- private NormalViewControl btnError = null;
+ public NormalViewControl btnError = null;
+ /// <summary>
+ /// 鏄剧ず瀵嗙爜榛戠偣鐨凢rame(鏈夊彲鑳介渶瑕佽皟鏁村畠鐨勪綅缃�)
+ /// </summary>
+ public FrameLayout framePswIcon = null;
+ /// <summary>
+ /// 鏁板瓧琛ㄧ洏鐨凢rame(鏈夊彲鑳介渶瑕佽皟鏁村畠鐨勪綅缃�)
+ /// </summary>
+ public FrameLayout frameNumberIcon = null;
+ /// <summary>
+ /// 鏁板瓧琛ㄧ洏鎸夐敭鐨勮儗鏅壊
+ /// </summary>
+ public uint NumberIconBackColor = 0xfff5f6fa;
/// <summary>
/// 鍒犻櫎鎺т欢
/// </summary>
@@ -69,7 +81,7 @@
//鍔犻棿璺�
this.Width = Application.GetMinRealAverage(NumberSize * 3 + NumberLeftRightSpace * 2 + 80);
this.Height = Application.GetMinRealAverage(NumberSize * 4 + NumberTopButtomSpace * 3) + Application.GetRealHeight(368);
- this.btnTitle = new NormalViewControl(Application.CurrentWidth, Application.GetRealWidth(63), false);
+ this.btnTitle = new NormalViewControl(Application.CurrentWidth, Application.GetRealWidth(75), false);
btnTitle.Text = i_title;
}
@@ -81,7 +93,7 @@
//鏍囬
btnTitle.Width = this.Width;
btnTitle.TextAlignment = TextAlignment.Center;
- btnTitle.TextSize = 16;
+ btnTitle.TextSize = 18;
this.AddChidren(btnTitle);
//鍒濆鍖栧瘑鐮佸浘鏍�
@@ -91,17 +103,16 @@
this.InitNumberTableControl();
//閿欒淇℃伅鎻愮ず
- this.btnError = new NormalViewControl(this.Width, Application.GetRealHeight(58), false);
- btnError.Y = Application.GetRealHeight(224);
+ this.btnError = new NormalViewControl(this.Width, Application.GetRealHeight(60), false);
+ btnError.Y = Application.GetRealHeight(222);
btnError.TextAlignment = TextAlignment.Center;
btnError.TextColor = 0xfff75858;
- btnError.TextSize = 12;
this.AddChidren(btnError);
//鍒犻櫎鎺т欢
- this.btnDelete = new NormalViewControl(200, 58, true);
+ this.btnDelete = new NormalViewControl(200, 60, true);
btnDelete.X = this.Width - Application.GetRealWidth(200) - Application.GetMinRealAverage(40);
- btnDelete.Y = this.Height - Application.GetRealHeight(58);
+ btnDelete.Y = this.Height - Application.GetRealHeight(60);
btnDelete.TextColor = UserCenterColor.Current.TextGrayColor3;
btnDelete.TextAlignment = TextAlignment.Center;
btnDelete.TextID = R.MyInternationalizationString.uDelete;
@@ -147,12 +158,12 @@
space = value;
}
- var frameBack = new FrameLayout();
- frameBack.Height = iconSize;
- frameBack.Width = iconSize * passwordLength + space * (passwordLength - 1);
- frameBack.Y = Application.GetRealHeight(149);
- frameBack.Gravity = Gravity.CenterHorizontal;
- this.AddChidren(frameBack);
+ this.framePswIcon = new FrameLayout();
+ framePswIcon.Height = iconSize;
+ framePswIcon.Width = iconSize * passwordLength + space * (passwordLength - 1);
+ framePswIcon.Y = Application.GetRealHeight(149);
+ framePswIcon.Gravity = Gravity.CenterHorizontal;
+ this.AddChidren(framePswIcon);
for (int i = 0; i < passwordLength; i++)
{
@@ -164,7 +175,7 @@
{
btnIcon.X = listPswIcon[listPswIcon.Count - 1].Right + space;
}
- frameBack.AddChidren(btnIcon);
+ framePswIcon.AddChidren(btnIcon);
listPswIcon.Add(btnIcon);
}
}
@@ -178,12 +189,12 @@
/// </summary>
private void InitNumberTableControl()
{
- var frameBack = new FrameLayout();
- frameBack.Y = Application.GetRealHeight(368);
- frameBack.Width = this.Width;
- frameBack.Gravity = Gravity.CenterHorizontal;
- frameBack.Height = Application.GetMinRealAverage(NumberSize * 4 + NumberTopButtomSpace * 3);
- this.AddChidren(frameBack);
+ this.frameNumberIcon = new FrameLayout();
+ frameNumberIcon.Y = Application.GetRealHeight(368);
+ frameNumberIcon.Width = this.Width;
+ frameNumberIcon.Gravity = Gravity.CenterHorizontal;
+ frameNumberIcon.Height = Application.GetMinRealAverage(NumberSize * 4 + NumberTopButtomSpace * 3);
+ this.AddChidren(frameNumberIcon);
//鍓嶄竴涓帶浠剁殑鍙冲潗鏍�
int btnTempRight = 0;
@@ -199,7 +210,7 @@
btnNum.X = btnTempRight + space;
}
- frameBack.AddChidren(btnNum);
+ frameNumberIcon.AddChidren(btnNum);
btnNum.Y = (i - 1) / 3 * (btnNum.Height + Application.GetMinRealAverage(NumberTopButtomSpace));
btnNum.ButtonClickEvent += (sender, e) =>
{
@@ -216,11 +227,11 @@
//0鐨勬暟瀛楃洏
var btnNum0 = this.InitNumberControl();
- btnNum0.X = Application.GetMinRealAverage(40) + frameBack.GetChildren(0).Height + space;
+ btnNum0.X = Application.GetMinRealAverage(40) + frameNumberIcon.GetChildren(0).Height + space;
btnNum0.Text = "0";
- frameBack.AddChidren(btnNum0);
- btnNum0.Y = 3 * (frameBack.GetChildren(0).Height + Application.GetMinRealAverage(NumberTopButtomSpace));
+ frameNumberIcon.AddChidren(btnNum0);
+ btnNum0.Y = 3 * (frameNumberIcon.GetChildren(0).Height + Application.GetMinRealAverage(NumberTopButtomSpace));
btnNum0.ButtonClickEvent += (sender, e) =>
{
//鐐瑰嚮鏁板瓧鎸夐敭
@@ -237,7 +248,7 @@
int iconSize = Application.GetMinRealAverage(NumberSize);
var btnNum = new NormalClickButton(iconSize, iconSize, false);
btnNum.X = Application.GetMinRealAverage(40);
- btnNum.BackgroundColor = 0xfff5f6fa;
+ btnNum.BackgroundColor = this.NumberIconBackColor;
btnNum.clickStatuColor = 0x7e656565;
btnNum.Radius = (uint)iconSize / 2;
btnNum.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -256,14 +267,13 @@
{
return;
}
+ if (btnError.Visible == true)
+ {
+ btnError.Visible = false;
+ }
//鐗规晥鏀瑰彉
listPswIcon[inputPassword.Length].BackgroundColor = 0xff333333;
inputPassword += strNum;
- if (inputPassword.Length == 1)
- {
- //灏嗘枃瀛椾粠鍙栨秷鍙樻洿涓哄垹闄�
- btnDelete.TextID = R.MyInternationalizationString.uDelete;
- }
//杈撳叆缁撴潫
if (FinishInputEvent != null && inputPassword.Length == passwordLength)
{
@@ -280,7 +290,8 @@
/// 閲嶇疆鎺т欢
/// </summary>
/// <param name="i_title">鏍囬淇℃伅</param>
- public void ResetControlInfo(string i_title)
+ /// <param name="clearError">鏄惁娓呴櫎閿欒淇℃伅</param>
+ public void ResetControlInfo(string i_title, bool clearError = true)
{
//鏍囬
btnTitle.Text = i_title;
@@ -291,8 +302,11 @@
{
listPswIcon[i].BackgroundColor = UserCenterColor.Current.Transparent;
}
- //閿欒淇℃伅
- btnError.Text = string.Empty;
+ if (clearError == true)
+ {
+ //閿欒淇℃伅
+ btnError.Text = string.Empty;
+ }
}
#endregion
@@ -317,7 +331,7 @@
#region 鈻� 鍙樻洿鍒犻櫎鎸夐挳浣嶇疆___________________
/// <summary>
- /// 鍙樻洿鍒犻櫎鎸夐挳浣嶇疆(鐖舵帶浠剁殑楂樺害浼氳嚜鍔ㄨ皟鏁�)
+ /// 鍙樻洿鍒犻櫎鎸夐挳浣嶇疆,瀹冩渶鍒濈殑榛樿浣嶇疆鏄湪鏈�搴曢儴(鐖舵帶浠剁殑楂樺害浼氳嚜鍔ㄨ皟鏁�)
/// </summary>
/// <param name="XX">X杞�(涓嶅彉鏇磋璁剧疆涓�-1)</param>
/// <param name="YY">Y杞�(涓嶅彉鏇磋璁剧疆涓�-1)</param>
--
Gitblit v1.8.0