Merge branch 'CJL' into NewFilePath

wxr

2020-12-15 dbf79099f47d5f06223edfd5b8dc06c51b1830aa

 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs

@@ -82,7 +82,7 @@
            };
            allRoomView.AddChidren(btnChooseAll);

            foreach(var room in DB_ResidenceData.residenceData.Rooms)
            foreach(var room in SpatialInfo.CurrentSpatial.RoomList)
            {
                var roomView = new FrameLayout()
                {