上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs

@@ -7,7 +7,7 @@
    /// <summary>

    /// 数字按键密码输入控件(自制的手动按键输入类型,请实现【ActionPswFinish】事件)

    /// </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)

            {