请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

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

            {

                this.Height = this.maxHeight;

#if iOS

                this.ReLocation();

#endif

            }

        }



@@ -107,6 +110,9 @@
                {

                    //还原为最大高度

                    this.Height = maxHeight;

#if iOS

                    this.ReLocation();

#endif

                }

                return;

            }

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

                //缩小控件高度

                this.Height = realHeight;

#if iOS

                this.ReLocation();

#endif

            }

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

            {

@@ -145,6 +154,9 @@
                {

                    //还原为最大高度

                    this.Height = maxHeight;

#if iOS

                    this.ReLocation();

#endif

                }

                return;

            }