20201202

wei

2020-12-02 30b5770f56f99c1f92e933ad31cf7d2af58b033c

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

@@ -71,7 +71,7 @@
        {
            bodyView = this;
            roomsShowed = new List<Room>();
            roomsShowed.AddRange(DB_ResidenceData.rooms);
            roomsShowed.AddRange(DB_ResidenceData.Rooms);
        }

        public void LoadPage()
@@ -226,7 +226,7 @@
                    Width = Application.GetRealWidth(343),
                    Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9
                    Radius = (uint)Application.GetRealWidth(12),
                    Tag = room.sid,
                    Tag = room.uid,
                };
                roomListView.AddChidren(roomView);

@@ -252,7 +252,7 @@
                    Y = Application.GetRealHeight(12 - 2),
                    Width = Application.GetRealWidth(266),
                    Height = Application.GetRealHeight(22 + 2 + 2),
                    Text = room.floorName + room.name,
                    Text = room.floorName + room.roomName,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.SubheadingFontSize,
@@ -360,7 +360,7 @@
                roomViewbgColor.MouseUpEventHandler += (sender, e) =>
                {
                    Action ReloadRoomName = () => {
                        btnFloorAndRoomName.Text = room.floorName + room.name;
                        btnFloorAndRoomName.Text = room.floorName + room.roomName;
                    };

                    var view = new RoomPage(room, ReloadRoomName);
@@ -810,10 +810,10 @@
                };
                dispalyView.AddChidren(contentView);

                if (DB_ResidenceData.residenceData.floors.Count < 2)
                if (Floor.InsFloor.Floors.Count < 2)
                {
                }
                else if (DB_ResidenceData.residenceData.floors.Count < 3)
                else if (Floor.InsFloor.Floors.Count < 3)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -828,7 +828,7 @@
                    contentView.Height = Application.GetRealHeight(45 * 3);
                    dispalyView.AddChidren(contentView);
                }
                else if (DB_ResidenceData.residenceData.floors.Count < 4)
                else if (Floor.InsFloor.Floors.Count < 4)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -863,9 +863,9 @@

                List<string> chooseList = new List<string>();
                chooseList.Add(Language.StringByID(StringId.All));
                foreach (var f in DB_ResidenceData.residenceData.floors)
                foreach (var f in Floor.InsFloor.Floors)
                {
                    chooseList.Add(f.name);
                    chooseList.Add(f.roomName);
                }

                foreach (var floor in chooseList)
@@ -903,11 +903,11 @@
                        roomsShowed.Clear();
                        if (floor == Language.StringByID(StringId.All))
                        {
                            roomsShowed.AddRange(DB_ResidenceData.rooms);
                            roomsShowed.AddRange(DB_ResidenceData.Rooms);
                        }
                        else
                        {
                            foreach (var room in DB_ResidenceData.rooms)
                            foreach (var room in DB_ResidenceData.Rooms)
                            {
                                if (room.floorName == floor)
                                {