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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -23,6 +23,8 @@
            get { return m_CanClick; }

            set

            {

                if (m_CanClick == value) { return; }



                m_CanClick = value;

                //能够点击,则显示没有点击过的状态

                if (m_CanClick == true) { this.SetNotClickStatu(); }

@@ -307,21 +309,6 @@
            {

                base.RemoveFromParent();

            }

        }



        /// <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>