请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -87,6 +87,9 @@
            if (this.maxHeight != -1)

            {

                this.Height = this.maxHeight;

#if iOS

                this.ReLocation();

#endif

            }

        }



@@ -97,16 +100,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;

            }



@@ -118,6 +119,9 @@
                frameBackTemp = null;

                //缩小控件高度

                this.Height = realHeight;

#if iOS

                this.ReLocation();

#endif

            }

            else if (addSpace == true && bottomSpace > 0 && realHeight > this.maxHeight)

            {

@@ -144,6 +148,9 @@
                {

                    //还原为最大高度

                    this.Height = maxHeight;

#if iOS

                    this.ReLocation();

#endif

                }

                return;

            }