Merge branch 'WJC' into newBranch1

wxr

2021-11-19 a170a2ecef6d5c87883ed552dbbc81cfb0358d13

 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()
            {