Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

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

@@ -52,6 +52,10 @@
        string showedFunctionRoomId = "0";
        List<Function> unallocatedList = new List<Function>();
        List<Function> allocatedList = new List<Function>();
        /// <summary>
        /// 被修改数据的功能列表，在需要保存的时候再保存数据
        /// </summary>
        List<Function> changeList = new List<Function>();
        #endregion

        public RoomEditFunctionPage(Room r)
@@ -161,8 +165,8 @@
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(582),
                Width = Application.GetRealWidth(220),
                Height = Application.GetRealHeight(44),
                Radius = (uint)Application.GetRealHeight(22),
                Height = Application.GetRealWidth(44),
                Radius = (uint)Application.GetRealWidth(22),
                BackgroundColor = CSS_Color.MainColor,
                TextColor = CSS_Color.MainBackgroundColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
@@ -174,7 +178,6 @@

            LoadEventList();
        }


        /// <summary>
        /// 显示功能Row
@@ -306,7 +309,7 @@
                    var btnFunctionFloorName = new Button()
                    {
                        X = btnFunctionIcon.Right + Application.GetRealWidth(12),
                        Y = Application.GetRealHeight(50),
                        Y = Application.GetRealHeight(30),
                        Width = Application.GetRealWidth(200),
                        Height = Application.GetRealHeight(20),
                        Text = function.GetRoomListName(),