Merge branch 'master' into WJC

陈嘉乐

2020-12-04 dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e

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

@@ -135,12 +135,26 @@
        int rowCount = 1;
        Action backAction;

        public RoomEditPage(Room r, int tId,Action action)
        /// <summary>
        /// 删除房间事件
        /// 2020-12-02 解决删除房间后，界面不刷新删除房间问题
        /// </summary>
        Action deleteAction;

        /// <summary>
        /// 
        /// </summary>
        /// <param name="r"></param>
        /// <param name="tId"></param>
        /// <param name="action"></param>
        /// <param name="delAction">删除房间事件</param>
        public RoomEditPage(Room r, int tId, Action action, Action delAction)
        {
            bodyView = this;
            room = r;
            pageTitleId = tId;
            backAction = action;
            this.deleteAction = delAction;
        }

        public void LoadPage()
@@ -170,11 +184,14 @@
                Width = Application.GetRealWidth(343),
                Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9
                //UnSelectedImagePath = room.backgroundImage,
                ImagePath = room.backgroundImage,
                //ImagePath = room.backgroundImage,
                Radius = (uint)Application.GetRealWidth(12),
                //Radius = (uint)Application.GetRealWidth(6),
            };
            roomBgView.AddChidren(btnRoomBg);

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

            //房间信息编辑区域
            roomInfoView = new VerticalScrolViewLayout()
@@ -225,7 +242,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.TextFontSize,
                Text = room.name
                Text = room.roomName
            };
            roomNameRow.AddChidren(btnRoomName);