代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs

@@ -97,16 +97,14 @@
        /// <param name="addSpace">当真实高度超过原有高度时,是否添加空白</param>

        public void AdjustRealHeight(int bottomSpace, bool addSpace = true)

        {

            //总之,先重置至最大

            this.RecoverHeight();



            int count = this.ChildrenCount;

            if (count <= 0)

            {

                frameBackTemp?.RemoveFromParent();

                frameBackTemp = null;

                if (maxHeight != -1)

                {

                    //还原为最大高度

                    this.Height = maxHeight;

                }

                return;

            }