From 30c21abd3047624cc413f5eaacbbbb88bae46f6a Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期一, 30 九月 2024 11:21:24 +0800 Subject: [PATCH] Update HomePage.cs --- HDL_ON/Entity/Room.cs | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs index 1fdebfd..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; } -- Gitblit v1.8.0