wxr
2024-09-24 691dbe24f5724f153e07947c7b75bdfea5f0b6d5
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;
        }