合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -87,8 +87,11 @@
            {

                frameBackTemp?.RemoveFromParent();

                frameBackTemp = null;

                //还原为最大高度

                this.Height = maxHeight;

                if (maxHeight != -1)

                {

                    //还原为最大高度

                    this.Height = maxHeight;

                }

                return;

            }