wxr
2022-05-26 95b5c31db51e611000e2bd80eda6d9f465204145
场景记录房间选择
2个文件已修改
31 ■■■■■ 已修改文件
HDL_ON/Entity/DB_ResidenceData.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/DB_ResidenceData.cs
@@ -453,6 +453,10 @@
        #endregion
        /// <summary>
        /// 场景筛选时,选择的房间
        /// </summary>
        public string sceneChooseRoomId = "";
        /// <summary>
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
@@ -156,9 +156,33 @@
                {
                    unallocatedList.Add(function);
                }
            }
            if (string.IsNullOrEmpty(DB_ResidenceData.Instance.sceneChooseRoomId))
            {
                LoadFunctionListRow(null);
            }
            else
            {
                var selectedRoom = Room.CurrentSpatial.RoomList.Find((obj) => obj.uid == DB_ResidenceData.Instance.sceneChooseRoomId);
                var listAllFun = new List<Function>();
                var listFun = new List<Function>();
                listAllFun.AddRange(unallocatedList);
                listAllFun.AddRange(allocatedList);
                btnFloor.Text = selectedRoom.floorRoomName;
                foreach(var funtion in listAllFun)
                {
                    if (funtion.roomIds.Contains(selectedRoom.roomId))
                    {
                        listFun.Add(funtion);
                    }
                }
                LoadFunctionListRow(listFun);
            }
            LoadFunctionListRow(null);
            LoadEventList();
        }
@@ -278,6 +302,7 @@
                form.ShowDeviceFunctionView(btnFloor, listAllFun, (selectId, listFun) =>
                {
                    nowSelectId = selectId;
                    DB_ResidenceData.Instance.sceneChooseRoomId = selectId;
                    //重新刷新设备列表
                    this.LoadFunctionListRow(listFun);
                }, nowSelectId);