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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

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

@@ -23,6 +23,21 @@
        /// 一个没什么用的东西

        /// </summary>

        private FrameLayout frameBackTemp = null;

        /// <summary>

        /// 自定义的获取子控件个数

        /// </summary>

        public new int ChildrenCount

        {

            get

            {

                int count = base.ChildrenCount;

                if (frameBackTemp != null)

                {

                    count--;

                }

                return count < 0 ? 0 : count;

            }

        }



        #endregion



@@ -87,8 +102,11 @@
            {

                frameBackTemp?.RemoveFromParent();

                frameBackTemp = null;

                //还原为最大高度

                this.Height = maxHeight;

                if (maxHeight != -1)

                {

                    //还原为最大高度

                    this.Height = maxHeight;

                }

                return;

            }