20201210

wei

2020-12-11 680d96f157e4609af3e7af6f8d01ee0bf3f55063

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs

@@ -657,10 +657,10 @@
                };
                dispalyView.AddChidren(contentView);

                if (DB_ResidenceData.residenceData.Rooms.Count < 2)
                if (SpatialInfo.CurrentSpatial.RoomList.Count < 2)
                {
                }
                else if (DB_ResidenceData.residenceData.Rooms.Count < 3)
                else if (SpatialInfo.CurrentSpatial.RoomList.Count < 3)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -675,7 +675,7 @@
                    contentView.Height = Application.GetRealHeight(45 * 3);
                    dispalyView.AddChidren(contentView);
                }
                else if (DB_ResidenceData.residenceData.Rooms.Count < 4)
                else if (SpatialInfo.CurrentSpatial.RoomList.Count < 4)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -710,7 +710,7 @@

                var showListRoom = new List<Room>();
                showListRoom.Add(new Room() { roomName = Language.StringByID(StringId.All) });
                showListRoom.AddRange(DB_ResidenceData.residenceData.Rooms);
                showListRoom.AddRange(SpatialInfo.CurrentSpatial.RoomList);

                foreach (var roomTemp in showListRoom) 
                {