请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -5,7 +5,7 @@
namespace Shared.Phone.UserCenter

{

    /// <summary>

    /// 做成一个里面只装FrameLayout的列表型控件(它不会调整高度)

    /// 做成一个里面只装FrameLayout的列表型控件(它不会调整高度,有桌布)

    /// </summary>

    public class VerticalFrameControl : VerticalScrolViewLayout

    {

@@ -96,13 +96,14 @@
        /// <param name="buttomSpace">底部空白间距(真实值)</param>

        public void AdjustChidrenFrameHeight(FrameLayout frame, int buttomSpace)

        {

            var child = frame.GetChildren(frame.ChildrenCount - 1);

            if (child != null)

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

            int value = this.GetLocationMostLastViewBottom(frame);

            if (value != -1)

            {

                //调整桌布高度

                if (frame.Height < child.Bottom + buttomSpace)

                if (frame.Height < value + buttomSpace)

                {

                    frame.Height = child.Bottom + buttomSpace;

                    frame.Height = value + buttomSpace;

                }

            }

        }

@@ -112,15 +113,12 @@
        /// </summary>

        public void AdjustTableHeight()

        {

            var child = this.m_frameTable?.GetChildren(this.m_frameTable.ChildrenCount - 1);

            if (child != null)

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

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

            if (value != -1)

            {

                //调整桌布高度

                this.m_frameTable.Height = child.Bottom;

                //if (this.m_frameTable.Height < child.Bottom)

                //{

                //    this.m_frameTable.Height = child.Bottom;

                //}

                this.m_frameTable.Height = value;

            }

        }



@@ -137,9 +135,44 @@
                return;

            }

            //添加临时控件,直至可以滑动超过底部按钮

            int oldRowSpace = this.rowSpace;

            this.rowSpace = 0;

            var frameBackTemp = new FrameLayout();

            frameBackTemp.Height = ControlCommonResourse.BodyFrameHeight - btnTemp.Yaxis + Application.GetRealHeight(23);

            this.AddChidrenFrame(frameBackTemp);

            this.rowSpace = oldRowSpace;

        }



        /// <summary>

        /// 还原桌布高度

        /// </summary>

        public void RecoverTableHeight()

        {

            if (this.m_frameTable != null)

            {

                m_frameTable.Height = this.Height;

            }

        }



        /// <summary>

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

        /// </summary>

        /// <returns></returns>

        private int GetLocationMostLastViewBottom(FrameLayout frame)

        {

            int bottomHeight = -1;



            if (frame == null) { return bottomHeight; }

           
            for (int i = 0; i < frame.ChildrenCount; i++)

            {

                var child = frame.GetChildren(i);

                if (child.Bottom > bottomHeight)

                {

                    bottomHeight = child.Bottom;

                }

            }

            return bottomHeight;

        }



        #endregion