Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-12 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11

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