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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

@@ -53,7 +53,7 @@
        /// <para>添加底线(如果左边有图标，则先添加图标，再添加底线)</para>

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

        /// </summary>
        public NormalViewControl AddBottomLine()

        public virtual NormalViewControl AddBottomLine()

        {

            int lineWidth = this.Width - ControlCommonResourse.XXLeft * 2 - LeftOffset - RightOffset;

            int XX = ControlCommonResourse.XXLeft + LeftOffset;