20201112

wxr

2020-11-12 a715181089be0d31cd737a5367ffd02690b9d77f

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -258,9 +258,9 @@
                    TextSize = CSS_FontSize.SubheadingFontSize,
                };
                roomView.AddChidren(btnFloorAndRoomName);
#if stage2

                #region 环境数据
                                var environmentalView = new FrameLayout()
                var environmentalView = new FrameLayout()
                                {
                                    Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
                                    Height = Application.GetRealHeight(32),
@@ -338,7 +338,6 @@
                                environmentalView.AddChidren(btnPm25Values);
                                roomView.AddChidren(environmentalView);
                #endregion
#endif
                var btnAllClose = new Button()
                {
                    X = Application.GetRealWidth(282),
@@ -360,7 +359,11 @@

                roomViewbgColor.MouseUpEventHandler += (sender, e) =>
                {
                    var view = new RoomPage(room);
                    Action<Room > ReloadRoomName = (obj) => {
                        btnFloorAndRoomName.Text = obj.floorName + obj.name;
                    };

                    var view = new RoomPage(room, ReloadRoomName);
                    MainPage.BasePageView.AddChidren(view);
                    view.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -477,7 +480,7 @@

                if (functionCount == 0 && item != ShowFunction.Music)
                {
                    continue;
                    //continue;
                }
                functionCategoryCount++;

@@ -764,7 +767,8 @@

            if (functionCategoryCount > 4)
            {
                functionContentView.Height += Application.GetRealHeight((220 * (functionCategoryCount - 4) / 2) + 20);
                functionContentView.Height = Application.GetRealHeight((220 * functionCategoryCount / 2) + 20);
                s1View.Height = s2View.Height = functionContentView.Height;
            }

            #endregion