合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

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

@@ -18,7 +18,18 @@
        /// <summary>

        /// 桌布控件

        /// </summary>

        private FrameLayout frameTable = null;

        private FrameLayout m_frameTable = null;

        /// <summary>

        /// 桌布控件

        /// </summary>

        public FrameLayout frameTable

        {

            get

            {

                if (m_frameTable == null) { this.InitFrameTable(); }

                return m_frameTable;

            }

        }



        #endregion



@@ -38,14 +49,14 @@
        /// </summary>

        private void InitFrameTable()

        {

            if (this.frameTable != null)

            if (this.m_frameTable != null)

            {

                return;

            }

            this.frameTable = new FrameLayout();

            this.frameTable.Width = this.Width;

            this.frameTable.Height = this.Height;

            this.AddChidren(this.frameTable);

            this.m_frameTable = new FrameLayout();

            this.m_frameTable.Width = this.Width;

            this.m_frameTable.Height = this.Height;

            this.AddChidren(this.m_frameTable);

        }



        #endregion

@@ -61,16 +72,16 @@
            //初始化桌布控件

            this.InitFrameTable();



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

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

            if (child != null)

            {

                frame.Y = child.Bottom + rowSpace;

            }

            this.frameTable.AddChidren(frame);

            this.m_frameTable.AddChidren(frame);

            //调整桌布高度

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

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

            {

                this.frameTable.Height = frame.Bottom;

                this.m_frameTable.Height = frame.Bottom;

            }

        }



@@ -101,14 +112,15 @@
        /// </summary>

        public void AdjustTableHeight()

        {

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

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

            if (child != null)

            {

                //调整桌布高度

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

                {

                    this.frameTable.Height = child.Bottom;

                }

                this.m_frameTable.Height = child.Bottom;

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

                //{

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

                //}

            }

        }



@@ -119,7 +131,7 @@
        public void AdjustRealHeightByBottomButton(int correctionsValue = 0)

        {

            var btnTemp = new BottomClickButton();

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

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

            {

                //没有超过

                return;