From 5b79523a11f79631b04d062e0c0009f98b75bde7 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期五, 12 七月 2024 15:23:41 +0800 Subject: [PATCH] Update HDL_APP_Project.sln --- HDL_ON/Entity/Room.cs | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs index 609e788..2516c3e 100644 --- a/HDL_ON/Entity/Room.cs +++ b/HDL_ON/Entity/Room.cs @@ -504,6 +504,14 @@ functions.Add(f); } } + foreach(var g in FunctionList.List.groupControls) + { + if (g.roomIds.Contains(roomId) && roomId != null) + { + g.deviceId = g.userDeviceGroupControlId; + functions.Add(g); + } + } } return functions; } @@ -568,5 +576,6 @@ scenes.Remove(scenes.Find((obj) => obj.sid == scene.sid)); } } - + + } \ No newline at end of file -- Gitblit v1.8.0