Merge branch 'CJL' into temp-wxr

wxr

2021-02-23 98d002e55304e5c8ff13b7cd195920975bef69f5

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