Merge branch 'master' into WJC

陈嘉乐

2020-12-04 dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs

@@ -38,7 +38,7 @@
            };
            bodyView.AddChidren(roomsListView);

            foreach(var room in DB_ResidenceData.rooms)
            foreach(var room in DB_ResidenceData.residenceData.Rooms)
            {
                LoadRoomRow(room);
            }
@@ -52,7 +52,7 @@
        {
            var roomRow = new FrameLayout()
            {
                Tag = room.name + "row",
                Tag = room.roomName + "row",
                Height = Application.GetRealHeight(100),
            };
            roomsListView.AddChidren(roomRow);
@@ -62,11 +62,14 @@
                Y = Application.GetRealHeight(10),
                Height = Application.GetRealHeight(90),
                Width = Application.GetRealWidth(343),
                ImagePath = room.backgroundImage,
                //ImagePath = room.backgroundImage,
                Radius = (uint)Application.GetRealWidth(12),
                Gravity = Gravity.CenterHorizontal,
            };
            roomRow.AddChidren(btnBg);

            //2020-12-03 修改图片加载方法
            ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, btnBg);

            var btnRoomName = new Button()
            {
@@ -77,12 +80,12 @@
                TextAlignment = TextAlignment.TopLeft,
                TextColor = CSS_Color.MainBackgroundColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                Text = room.floorName + room.name,
                Text = room.floorName + room.roomName,
            };
            roomRow.AddChidren(btnRoomName);

            EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
                LoadEvent_SkipEditRoomPage(room, btnRoomName, btnBg);
                LoadEvent_SkipEditRoomPage(room, btnRoomName, btnBg, roomRow);
            };
            btnBg.MouseUpEventHandler = eventHandler;
            roomRow.MouseUpEventHandler = eventHandler;