From 758f5141e2bf536c04b7b4c1e2327a87d3b9d419 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 四月 2023 09:50:53 +0800
Subject: [PATCH] 2023年04月11日17:30:59

---
 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 74b7a31..dee3d46 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -39,7 +39,7 @@
         {
 
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-            if (titleId == StringId.Lights && !DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
+            if (titleId == StringId.Lights && !DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
             {
                 Action action = () =>
                 {
@@ -142,6 +142,9 @@
             if (titleId == StringId.Lights)
             {
                 functionList.AddRange(FunctionList.List.GetLightList());
+                functionList.AddRange(FunctionList.List.groupControls);
+
+
                 var lightScene = FunctionList.List.scenes.FindAll((obj) => obj.sceneType == SceneType.LightScene);
 
                 foreach (var scene in lightScene)

--
Gitblit v1.8.0