合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs

@@ -67,14 +67,14 @@
            //最大显示5个

            int rowCount = this.RowCount > 5 ? 5 : this.RowCount;

            //桌布

            var frameTable = new FrameLayoutControl(false);

            var frameTable = new FrameLayout();

            frameTable.X = Application.GetRealWidth(662 - (RowWidth - 395));

            frameTable.Y = Application.GetRealHeight(158 + 15 + 1);

            frameTable.Width = Application.GetRealWidth(RowWidth);

            frameTable.Height = Application.GetRealHeight(RowHeight * rowCount);

            frameTable.BackgroundColor = UserCenterColor.Current.White;

            frameTable.BorderColor = UserCenterColor.Current.Transparent;

            frameTable.RadiusEx = 6;

            frameTable.Radius = 6;

            this.AddChidren(frameTable);



            if (titleText != null)

@@ -89,10 +89,14 @@
            //列表控件

            this.listView = new VerticalListControl();

            listView.Height = frameTable.Height;

            if (rowCount == 5 && titleText != null)

            if (rowCount == 5)

            {

                //连带标题,只能显示5行

                listView.Height = frameTable.Height - Application.GetRealHeight(RowHeight);

            }

            if (titleText != null)

            {

                //拥有标题

                listView.Y = Application.GetRealHeight(RowHeight);

            }

            listView.Radius = frameTable.Radius;