Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 HDL_ON/Entity/Room.cs

@@ -285,7 +285,7 @@
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log($"功能数据初始化失败：{ex.Message}");
                        MainPage.Log("Error",$"功能数据初始化失败：{ex.StackTrace}");
                    }
                }
                return rooms;
@@ -508,6 +508,7 @@
                {
                    if (g.roomIds.Contains(roomId) && roomId != null)
                    {
                        g.deviceId = g.userDeviceGroupControlId;
                        functions.Add(g);
                    }
                }