代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -214,6 +214,7 @@
        public MostRightIconControl AddMostRightEmptyIcon(int i_width, int i_height)

        {

            var btnContr = new MostRightIconControl(i_width, i_height);

            btnContr.UseClickStatu = false;

            this.AddChidren(btnContr, ChidrenBindMode.NotBind);

            btnContr.InitControl();

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

@@ -267,12 +268,7 @@
            {

                i_width = Application.GetRealWidth(i_width);

            }

            var btnContr = new NormalViewControl(i_width, false);

            btnContr.X = this.Width - ControlCommonResourse.XXLeft - i_width - rightIconSize + RightOffset;

            btnContr.Height = this.Height;

            btnContr.TextAlignment = TextAlignment.CenterRight;

            btnContr.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnContr.Text = i_text;

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

            this.AddChidren(btnContr, ChidrenBindMode.BindEventOnly);

            if (chidrenYaxis != 0)

            {

@@ -282,6 +278,82 @@
            return btnContr;

        }



        /// <summary>

        /// 添加最右的显示文本,此方法不会主动添加到父控件中(如果右边有图标的话,先添加图标后,再添加这个文本)

        /// </summary>

        /// <param name="i_caption">内容</param>

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

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

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

        /// <returns></returns>

        public NormalViewControl AddMostRightView(string i_text, int i_width, int i_height, bool real = true)

        {

            if (real == true)

            {

                i_width = Application.GetRealWidth(i_width);

                i_height = Application.GetRealHeight(i_height);

            }

            var btnContr = new NormalViewControl(i_width, i_height, false);

            btnContr.X = this.Width - ControlCommonResourse.XXLeft - i_width - rightIconSize + RightOffset;

            btnContr.Height = i_height;

            btnContr.TextAlignment = TextAlignment.CenterRight;

            btnContr.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnContr.Text = i_text;



            return btnContr;

        }



        #endregion


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



        /// <summary>

        /// 添加上部的显示文本(如果有图标，则先添加图标，再添加文本)

        /// </summary>

        /// <param name="i_caption">内容</param>

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

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

        /// <returns></returns>
        public NormalViewControl AddTopView(string i_caption, int i_width, bool real = true)

        {

            if (real == true)

            {

                i_width = Application.GetRealWidth(i_width);

            }

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



            return contr;

        }



        #endregion


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



        /// <summary>

        /// 添加下部的显示文本(如果有图标，则先添加图标，再添加文本)

        /// </summary>

        /// <param name="i_caption">内容</param>

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

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

        /// <returns></returns>
        public NormalViewControl AddBottomView(string i_caption, int i_width, bool real = true)

        {

            if (real == true)

            {

                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;

            contr.TextSize = 12;

            contr.TextColor = UserCenterColor.Current.TextGrayColor1;

            this.AddChidren(contr, ChidrenBindMode.BindEventOnly);



            return contr;

        }



        #endregion
    }
}