From ac8660d2dd439e8074c1760cbe6cc9465a452193 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 24 八月 2023 17:50:17 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' into wjc --- HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs index 9a9f97e..d5bea34 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs @@ -207,6 +207,10 @@ { functionList.AddRange(FunctionList.List.GetIpCamImouList()); } + else if(titleId == StringId.EnergyMonitoring) + { + functionList.AddRange(FunctionList.List.GetEnergyList()); + } functionList = functionList.OrderByDescending(o => o.controlCounter).ToList(); ShowFunctionRow(functionList); @@ -271,7 +275,7 @@ { continue; } - if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming) + if (function.spk == SPK.LightCCT || function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming) { var functionDiv = new FunctionControlZone(function,null) { -- Gitblit v1.8.0