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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -85,16 +85,16 @@
            this.InitFrameTable();



            //获取坐标底部最下面的那个控件的底部坐标

            int value = this.GetLocationMostLastViewBottom(this.m_frameTable);

            int value = this.GetLocationMostLastViewBottom(this.frameTable);

            if (value != -1)

            {

                view.Y = value + rowSpace;

            }

            this.m_frameTable.AddChidren(view);

            this.frameTable.AddChidren(view);

            //调整桌布高度

            if (this.m_frameTable.Height < view.Bottom)

            if (this.frameTable.Height < view.Bottom)

            {

                this.m_frameTable.Height = view.Bottom;

                this.frameTable.Height = view.Bottom;

            }

        }



@@ -125,10 +125,16 @@
        /// 调整子FrameLayout的真实高度

        /// </summary>

        /// <param name="frame"></param>

        public void AdjustChidrenFrameRealHeight(FrameLayout frame)

        /// <param name="minHeight">最小高度</param>

        public void AdjustChidrenFrameRealHeight(FrameLayout frame, int minHeight = -1)

        {

            //获取坐标底部最下面的那个控件的底部坐标

            int value = this.GetLocationMostLastViewBottom(frame);

            if (minHeight != -1 && value < minHeight)

            {

                //没有超过最小高度

                return;

            }

            if (value != -1)

            {

                //调整桌布高度

@@ -148,11 +154,11 @@
            }



            //获取坐标底部最下面的那个控件的底部坐标

            int value = this.GetLocationMostLastViewBottom(this.m_frameTable);

            int value = this.GetLocationMostLastViewBottom(this.frameTable);

            if (value != -1)

            {

                //调整桌布高度

                this.m_frameTable.Height = value;

                this.frameTable.Height = value;

            }

            else

            {

@@ -174,7 +180,7 @@
            this.AdjustTableHeight();



            var btnTemp = new BottomClickButton();

            if (btnTemp.Yaxis >= this.m_frameTable.Height + correctionsValue)

            if (btnTemp.Yaxis >= this.frameTable.Height + correctionsValue)

            {

                //没有超过

                return;