Merge branch 'WJC'

wxr

2020-12-07 64dbbfe1d6488635e160189a704afccffc7d34d0

 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs

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

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

                List<Room> roomList = new List<Room>();
                roomList.Add(new Room() { uid = "", roomName = Language.StringByID(StringId.All) });
                roomList.AddRange(DB_ResidenceData.Rooms);
                roomList.AddRange(DB_ResidenceData.residenceData.Rooms);
                foreach (var tempRoom in roomList)
                {
                    var roomName = tempRoom.roomName;