From 691dbe24f5724f153e07947c7b75bdfea5f0b6d5 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期二, 24 九月 2024 16:15:15 +0800 Subject: [PATCH] 离线控制模式 --- HDL_ON/Entity/Room.cs | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs index 609e788..28a8ab6 100644 --- a/HDL_ON/Entity/Room.cs +++ b/HDL_ON/Entity/Room.cs @@ -285,7 +285,7 @@ } catch (Exception ex) { - MainPage.Log($"鍔熻兘鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}"); + MainPage.Log("Error",$"鍔熻兘鏁版嵁鍒濆鍖栧け璐ワ細{ex.StackTrace}"); } } return rooms; @@ -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