From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 29 八月 2023 09:22:38 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc --- HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs index 495e602..0d4740a 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs @@ -83,10 +83,7 @@ public EnergyMainPage() { bodyView = this; - energyList = FunctionList.List.GetEnergyList(); - var breaker = FunctionList.List.Functions.FindAll((obj) => obj.spk == SPK.AirSwitch); - var energyBreker = breaker.FindAll((obj) => obj.GetAttribute("power") != null); - energyList.AddRange(energyBreker); + energyList = FunctionList.List.GetEnergyList().FindAll((obj)=>obj.spk == SPK.AirSwitch || obj.spk == SPK.ElectricEnergy); } /// <summary> -- Gitblit v1.8.0