Merge branch 'WJC' into temp-wxr

wxr

2021-03-16 7584dea0241cefc276a4b5311331aee1dcda6c80

 HDL_ON/UI/UI2/FuntionControlView/ChooseFloorPage.cs

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

            contentView = new FrameLayout()
            {