Merge branch 'WJC' into temp-wxr

wxr

2021-06-23 7addb1dc6d80cc48c0478aa7ac9820363d4eebf6

 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs

@@ -118,7 +118,7 @@
                Button btnRoomText = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Width = Application.GetRealWidth(280),
                    //Width = Application.GetRealWidth(280),
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextAlignment = TextAlignment.CenterLeft,