优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节

xm

2020-09-11 f14dcfd967404e197e7ec995ca8d6f2b090d3b7d

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

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

        /// 桌布控件

        /// </summary>

        private FrameLayout m_frameTable = null;

        private NormalFrameLayout m_frameTable = null;

        /// <summary>

        /// 桌布控件(这个东西不能删，因为有些界面需要他的桌布)

        /// </summary>

        public FrameLayout frameTable

        public NormalFrameLayout frameTable

        {

            get

            {

@@ -65,10 +65,10 @@
            {

                return;

            }

            this.m_frameTable = new FrameLayout();

            this.m_frameTable = new NormalFrameLayout();

            this.m_frameTable.Width = this.Width;

            this.m_frameTable.Height = this.Height;

            this.AddChidren(this.m_frameTable);

            base.AddChidren(this.m_frameTable);

        }



        #endregion

@@ -76,25 +76,25 @@
        #region ■ 添加子控件_________________________



        /// <summary>

        /// 添加Frame子控件

        /// 添加Frame子控件(注意,它是往下加控件,只会改变坐标,桌布大小会增加)

        /// </summary>

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

        public void AddChidrenFrame(FrameLayout frame)

        public override void AddChidren(View view)

        {

            //初始化桌布控件

            this.InitFrameTable();



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

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

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

            if (value != -1)

            {

                frame.Y = value + rowSpace;

                view.Y = value + rowSpace;

            }

            this.m_frameTable.AddChidren(frame);

            this.frameTable.AddChidren(view);

            //调整桌布高度

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

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

            {

                this.m_frameTable.Height = frame.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;

@@ -185,7 +191,7 @@


            this.frameBackTemp = new FrameLayout();

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

            this.AddChidrenFrame(frameBackTemp);

            this.AddChidren(frameBackTemp);



            this.rowSpace = oldRowSpace;

        }