From af954b34ffad38c3b11bd82caa54d5fb0c36e6ec Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 13 十二月 2023 16:19:12 +0800
Subject: [PATCH] 2023年12月13日16:18:38
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 10 +++++++++-
1 files changed, 9 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..c8891fe 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -30,6 +30,7 @@
List<Function> functionList;
int titleId;
+ public Action DelAction;
public FunctionPage()
{
bodyView = this;
@@ -185,7 +186,9 @@
}
else if (titleId == StringId.Electric)
{
+
functionList.AddRange(FunctionList.List.GetElectricals());
+
}
else if (titleId == StringId.EnvironmentalScience)
{
@@ -206,6 +209,10 @@
else if (titleId == StringId.SecurityMonitoring)
{
functionList.AddRange(FunctionList.List.GetIpCamImouList());
+ }
+ else if(titleId == StringId.EnergyMonitoring)
+ {
+ functionList.AddRange(FunctionList.List.GetEnergyList());
}
functionList = functionList.OrderByDescending(o => o.controlCounter).ToList();
@@ -271,7 +278,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)
{
@@ -316,6 +323,7 @@
functionListView.RemoveAll();
showList.Remove(function);//鍏堢Щ闄�
ShowFunctionRow(showList,isAppend);
+ this.DelAction?.Invoke();
};
var functionDiv = new FunctionControlZone(function, deviceDelAction)
--
Gitblit v1.8.0