Revert "Merge branch 'tzy' into NewFilePath"

wxr

2020-12-17 1a13c963a5fb8cad92bf03667e411f46d6a6a843

 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()
                {
@@ -108,7 +108,7 @@
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = room.floor + "  " + room.name,
                    Text = room.floorName + room.roomName,
                };
                roomView.AddChidren(btnRoomText);

@@ -120,7 +120,7 @@
                    Height = Application.GetMinRealAverage(28),
                    UnSelectedImagePath = "Public/ChooseIcon.png",
                    SelectedImagePath = "Public/ChooseOnIcon.png",
                    IsSelected = function.roomIdList.Contains(room.sid),
                    IsSelected = function.roomIds.Contains(room.roomId),
                    Tag = "ChooseIcon"
                };
                roomView.AddChidren(btnChoose);
@@ -129,7 +129,7 @@
                    LoadEvent_RoomSelected(room, btnChoose.IsSelected);
                };

                if (!function.roomIdList.Contains(room.sid) && btnChooseAll.IsSelected)
                if (!function.roomIds.Contains(room.roomId) && btnChooseAll.IsSelected)
                {
                    btnChooseAll.IsSelected = false;
                }