Merge branch 'Dev-Branch' into wjc

mac

2023-12-13 1de41bc038dcf623834b63422da350693429570b

 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs

@@ -60,12 +60,14 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming));
            topView.maginY = 10;
            topView.LoadTopView();

            contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(667 - 64-10),
            };
            bodyView.AddChidren(contentView);