Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -192,7 +192,7 @@
            var btnRight = new IconViewControl(58);

            btnRight.Gravity = Gravity.CenterVertical;

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

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

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

            this.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);



            if (chidrenYaxis != 0)

@@ -304,5 +304,56 @@
        }



        #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
    }
}