20201223-6

wei

2020-12-23 263401d40b2d9d2c1b36a24f33d45c5cb7192518

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

old mode 100644
new mode 100755
@@ -56,14 +56,27 @@
        /// 被修改数据的功能列表，在需要保存的时候再保存数据
        /// </summary>
        List<Function> changeList = new List<Function>();
        /// <summary>
        /// 新增的房间绑定功能事件，用户确定生成房间之后，再将功能绑定到房间
        /// </summary>
        Action<List<Function>> newRoomAddFunction;
        #endregion

        /// <summary>
        /// 编辑现有房间的构造函数
        /// </summary>
        /// <param name="r"></param>
        public RoomEditFunctionPage(Room r)
        {
            bodyView = this;
            room = r;
        }

        public RoomEditFunctionPage(Room r, Action<List<Function>> action)
        {
            bodyView = this;
            room = r;
            newRoomAddFunction = action;
        }
        /// <summary>
        /// 加载界面
        /// </summary>
@@ -71,7 +84,6 @@
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.AddFunction)).LoadTopView();
            //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.AddFunction));

            #region 显示的功能类型切换区域
            showdFunctionTypeRow = new FrameLayout()
@@ -144,7 +156,7 @@
            };
            bodyView.AddChidren(functionListView);

            foreach (var function in DB_ResidenceData.functionList.GetAllFunction())
            foreach (var function in FunctionList.List.GetDeviceFunctionList())
            {
                function.roomIds.Remove(null);
                if (function.roomIds.Count > 0 )
@@ -402,7 +414,7 @@
                Height = Application.GetRealWidth(1),
                BackgroundColor = CSS_Color.DividingLineColor,
            });
            foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
            foreach (var tempRoom in SpatialInfo.CurrentSpatial.RoomList)
            {

                Button btnRoom = new Button()