From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs
index cf840fd..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,8 +79,8 @@
{
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;
@@ -112,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;
@@ -144,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)
@@ -194,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++)
{
@@ -212,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) =>
{
//鐐瑰嚮鏁板瓧鎸夐敭
@@ -228,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) =>
{
//鐐瑰嚮鏁板瓧鎸夐敭
@@ -246,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;
@@ -364,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