Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs

@@ -40,7 +40,14 @@

        public override void RemoveFromParent()
        {
            backAction?.Invoke();
            new System.Threading.Thread(() =>
            {
                Application.RunOnMainThread(() =>
                {
                    backAction?.Invoke();
                });
            })
            { IsBackground = true }.Start();
            base.RemoveFromParent();
        }

@@ -50,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()
            {