Merge branch 'Dev-Branch' into Dev-Wxr-1.8.1

wxr

2023-06-07 9c4967cd8843ac7ed65ee64195bcf69c592c4a20

 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs

@@ -57,7 +57,7 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(backAction);
            new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView();

            contentView = new VerticalScrolViewLayout()
            {