Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -65,7 +65,7 @@
        #region ■ 添加子控件_________________________



        /// <summary>

        /// 添加Frame子控件

        /// 添加Frame子控件(此方法是改变Y轴)

        /// </summary>

        /// <param name="view"></param>

        public void AddChidrenFrame(FrameLayout frame)

@@ -83,6 +83,58 @@
            if (this.m_frameTable.Height < frame.Bottom)

            {

                this.m_frameTable.Height = frame.Bottom;

            }

        }



        /// <summary>

        /// 添加Frame子控件(此方法是改变高度)

        /// </summary>

        /// <param name="view"></param>

        public void AddChidrenFrame2(FrameLayout frame)

        {

            //初始化桌布控件

            this.InitFrameTable();



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

            if (child != null)

            {

                frame.Y = child.Bottom;

            }

            this.m_frameTable.AddChidren(frame);

            if (rowSpace > 0)

            {

                frame.Height += rowSpace;

            }

            //调整桌布高度

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

            {

                this.m_frameTable.Height = frame.Bottom;

            }

        }



        /// <summary>

        /// 添加Frame子控件(此方法是改变高度)

        /// </summary>

        /// <param name="row"></param>

        public void AddChidrenRow(RowLayout row)

        {

            //初始化桌布控件

            this.InitFrameTable();



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

            if (child != null)

            {

                row.Y = child.Bottom;

            }

            this.m_frameTable.AddChidren(row);

            if (rowSpace > 0)

            {

                row.Height += rowSpace;

            }

            //调整桌布高度

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

            {

                this.m_frameTable.Height = row.Bottom;

            }

        }



@@ -111,13 +163,14 @@
        /// <summary>

        /// 调整桌布高度

        /// </summary>

        public void AdjustTableHeight()

        /// <param name="buttomSpace">底部空白间距(真实值)</param>

        public void AdjustTableHeight(int buttomSpace = 0)

        {

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

            if (child != null)

            {

                //调整桌布高度

                this.m_frameTable.Height = child.Bottom;

                this.m_frameTable.Height = child.Bottom + buttomSpace;

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

                //{

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