Merge remote-tracking branch 'origin/WJC'

wxr

2020-12-01 a46cd0adb5af29e8a9cf47c219475acaedfcf839

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

@@ -224,7 +224,7 @@
                {
                    Gravity = Gravity.CenterHorizontal,
                    Width = Application.GetRealWidth(343),
                    Height = Application.GetRealHeight(184),
                    Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9
                    Radius = (uint)Application.GetRealWidth(12),
                    Tag = room.sid,
                };
@@ -233,7 +233,7 @@
                var roomViewbg = new ImageView()
                {
                    Width = Application.GetRealWidth(343),
                    Height = Application.GetRealHeight(184),
                    Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9
                    ImagePath = room.backgroundImage,
                    Radius = (uint)Application.GetRealWidth(12),
                };
@@ -353,14 +353,14 @@

                var btn = new Button()
                {
                    Height = Application.GetRealHeight(20),
                    Height = Application.GetRealWidth(20),
                };
                roomListView.AddChidren(btn);

                roomViewbgColor.MouseUpEventHandler += (sender, e) =>
                {
                    Action<Room > ReloadRoomName = (obj) => {
                        btnFloorAndRoomName.Text = obj.floorName + obj.name;
                    Action ReloadRoomName = () => {
                        btnFloorAndRoomName.Text = room.floorName + room.name;
                    };

                    var view = new RoomPage(room, ReloadRoomName);