Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs

@@ -1,18 +1,18 @@
using System;
using System.Collections.Generic;

namespace Shared.Phone.UserCenter
{
    /// <summary>
    /// 做成一个RowLayout型的FrameLayout
    /// </summary>
    public class FrameRowControl : FrameLayoutControl
using System;

using System.Collections.Generic;



namespace Shared.Phone.UserCenter

{

    /// <summary>

    /// 做成一个RowLayout型的FrameLayout

    /// </summary>

    public class FrameRowControl : FrameLayoutStatuControl

    {

        #region ■ 变量声明___________________________



        /// <summary>

        /// 此控件的识别主键(自定义设置的)

        /// </summary>
        /// </summary>

        public string MainKeys = string.Empty;

        /// <summary>

        /// 左偏移量,只针对内置控件有效(这是一个真实值,默认不偏移。正数为向右偏移,负数为向左偏移)

@@ -35,19 +35,19 @@
        /// </summary>

        private NormalViewControl btnBottomLine = null;



        #endregion
        #endregion



        #region ■ 初始化_____________________________



        /// <summary>

        /// 做成一个RowLayout型的FrameLayout

        /// </summary>
        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>
        public FrameRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
        {
        /// </summary>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(【列表控件的rowSpace/2】即可,不懂默认为0即可)</param>

        public FrameRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)

        {

            this.Height = ControlCommonResourse.ListViewRowHeight;

            this.Width = Application.CurrentWidth;
        }
            this.Width = Application.CurrentWidth;

        }



        #endregion



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

        /// <para>添加底线(如果左边有图标，则先添加图标，再添加底线)</para>

        /// <para>它的长度为：当前控件宽度-左右固定间距-左边图片宽度(如果有)-右边的偏移量</para>

        /// </summary>
        /// </summary>

        public virtual NormalViewControl AddBottomLine()

        {

            if (this.btnBottomLine != null)

@@ -90,7 +90,7 @@
        /// <param name="i_caption">内容</param>

        /// <param name="i_width">宽度</param>

        /// <param name="real">是否计算真实值</param>

        /// <returns></returns>
        /// <returns></returns>

        public NormalViewControl AddLeftCaption(string i_caption, int i_width, bool real = true)

        {

            if (real == true)

@@ -98,7 +98,7 @@
                i_width = Application.GetRealWidth(i_width);

            }

            var contr = this.AddLeftCaption(i_caption, i_width, this.Height, false);

            this.AddChidren(contr, ChidrenBindMode.BindEventOnly);

            this.AddChidren(contr, ChidrenBindMode.BindEvent);

            if (chidrenYaxis != 0)

            {

                contr.Y += chidrenYaxis;

@@ -114,7 +114,7 @@
        /// <param name="i_width">宽度</param>

        /// <param name="i_height">高度</param>

        /// <param name="real">是否计算真实值</param>

        /// <returns></returns>
        /// <returns></returns>

        public NormalViewControl AddLeftCaption(string i_caption, int i_width, int i_height, bool real = true)

        {

            int XX = ControlCommonResourse.XXLeft + LeftOffset;

@@ -140,7 +140,7 @@
        /// <param name="i_txtValue">初始内容</param>

        /// <param name="i_width">宽度</param>

        /// <param name="real">是否计算真实值</param>

        /// <returns></returns>
        /// <returns></returns>

        public TextInputControl AddLeftInput(string i_txtValue, int i_width, bool real = true)

        {

            if (real == true)

@@ -173,13 +173,18 @@
        /// 添加左边图标

        /// </summary>

        /// <param name="i_Iconsize">图标大小</param>

        /// <returns></returns>
        public IconViewControl AddLeftIcon(int i_Iconsize = 81)

        /// <param name="i_IconPath">图标地址</param>

        /// <returns></returns>

        public IconViewControl AddLeftIcon(int i_Iconsize = 81, string i_IconPath = null)

        {

            var btnIcon = new IconViewControl(i_Iconsize);

            btnIcon.X = ControlCommonResourse.XXLeft + LeftOffset;

            btnIcon.Gravity = Gravity.CenterVertical;

            this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);

            if (i_IconPath != null)

            {

                btnIcon.UnSelectedImagePath = i_IconPath;

            }

            this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);

            if (chidrenYaxis != 0)

            {

                btnIcon.Y += chidrenYaxis;

@@ -202,7 +207,7 @@
            btnRight.Gravity = Gravity.CenterVertical;

            btnRight.X =this.Width - btnRight.IconSize - ControlCommonResourse.XXLeft + RightOffset;

            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            this.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

            this.AddChidren(btnRight, ChidrenBindMode.BindEvent);



            if (chidrenYaxis != 0)

            {

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

        /// 添加最右边的空白图片控件

        /// </summary>

        /// <param name="i_width">控件空度(非真实值)</param>
        /// <param name="i_width">控件空度(非真实值)</param>

        /// <param name="i_height">控件高度(非真实值)</param>

        /// <returns></returns>

        public MostRightIconControl AddMostRightEmptyIcon(int i_width, int i_height)

@@ -227,13 +232,13 @@
            this.AddChidren(btnContr, ChidrenBindMode.NotBind);

            btnContr.InitControl();

            //复合控件需要特殊处理

            this.ChangedChidrenBindMode(btnContr, ChidrenBindMode.BindEventOnly);

            this.ChangedChidrenBindMode(btnContr, ChidrenBindMode.BindEvent);

            if (RightOffset != 0)

            {

                btnContr.X += RightOffset;

            }



            this.rightIconSize = Application.GetMinRealAverage(i_width);

            this.rightIconSize = this.GetPictrueRealSize(i_width);

            if (chidrenYaxis != 0)

            {

                btnContr.btnIcon.Y += chidrenYaxis;

@@ -278,7 +283,7 @@
                i_width = Application.GetRealWidth(i_width);

            }

            var btnContr = AddMostRightView(i_text, i_width, this.Height, false);

            this.AddChidren(btnContr, ChidrenBindMode.BindEventOnly);

            this.AddChidren(btnContr, ChidrenBindMode.BindEvent);

            if (chidrenYaxis != 0)

            {

                btnContr.Y += chidrenYaxis;

@@ -312,7 +317,7 @@
            return btnContr;

        }



        #endregion
        #endregion



        #region ■ 添加上部的显示文本_________________



@@ -322,7 +327,7 @@
        /// <param name="i_caption">内容</param>

        /// <param name="i_width">宽度</param>

        /// <param name="real">是否计算真实值</param>

        /// <returns></returns>
        /// <returns></returns>

        public NormalViewControl AddTopView(string i_caption, int i_width, bool real = true)

        {

            if (real == true)

@@ -331,13 +336,14 @@
            }

            var contr = this.AddLeftCaption(i_caption, i_width, Application.GetRealHeight(60), false);

            contr.TextSize = 15;

            contr.Y = Application.GetRealHeight(12) + this.chidrenYaxis;

            this.AddChidren(contr, ChidrenBindMode.BindEventOnly);

            //当指定实际坐标时,这里需要的偏移量为2倍

            contr.Y = Application.GetRealHeight(12) + this.chidrenYaxis * 2;

            this.AddChidren(contr, ChidrenBindMode.BindEvent);



            return contr;

        }



        #endregion
        #endregion



        #region ■ 添加下部的显示文本_________________



@@ -347,7 +353,7 @@
        /// <param name="i_caption">内容</param>

        /// <param name="i_width">宽度</param>

        /// <param name="real">是否计算真实值</param>

        /// <returns></returns>
        /// <returns></returns>

        public NormalViewControl AddBottomView(string i_caption, int i_width, bool real = true)

        {

            if (real == true)

@@ -355,14 +361,15 @@
                i_width = Application.GetRealWidth(i_width);

            }

            var contr = this.AddLeftCaption(i_caption, i_width, Application.GetRealHeight(50), false);

            contr.Y = Application.GetRealHeight(72) + this.chidrenYaxis;

            //当指定实际坐标时,这里需要的偏移量为2倍

            contr.Y = Application.GetRealHeight(72) + this.chidrenYaxis * 2;

            contr.TextSize = 12;

            contr.TextColor = UserCenterColor.Current.TextGrayColor1;

            this.AddChidren(contr, ChidrenBindMode.BindEventOnly);

            this.AddChidren(contr, ChidrenBindMode.BindEvent);



            return contr;

        }



        #endregion
    }
}
        #endregion

    }

}