Merge branch 'CJL' into ez-test

hxb

2021-03-05 84fa7c9665d9bed9aef79237be9c5eb57c49f13d

 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,