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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs

@@ -284,21 +284,6 @@
        #region ■ 一般方法___________________________



        /// <summary>

        /// Y轴重置(真实数值,没有父容器无效)

        /// </summary>

        /// <param name="alignment">上下对齐方式</param>

        /// <param name="Space">上下两部分的间距</param>

        public void ReSetYaxis(UViewAlignment alignment, int Space = 0)

        {

            if (this.Parent == null)

            {

                return;

            }

            //Y轴重置

            this.Y = HdlControlLogic.Current.GetControlChidrenYaxis(this.Parent.Height, this.Height, alignment, Space);

        }



        /// <summary>

        /// 计算图片的真实高宽度

        /// </summary>

        /// <param name="i_size"></param>