Merge branch 'NewFilePath'

wxr

2020-12-16 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs

@@ -156,7 +156,7 @@
            };
            bodyView.AddChidren(functionListView);

            foreach (var function in DB_ResidenceData.functionList.GetAllFunction())
            foreach (var function in FunctionList.List.GetDeviceFunctionList())
            {
                function.roomIds.Remove(null);
                if (function.roomIds.Count > 0 )
@@ -414,7 +414,7 @@
                Height = Application.GetRealWidth(1),
                BackgroundColor = CSS_Color.DividingLineColor,
            });
            foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
            foreach (var tempRoom in SpatialInfo.CurrentSpatial.RoomList)
            {

                Button btnRoom = new Button()