From 95a7e380db583108d9716c56fe6d298ca08f8f23 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 九月 2021 10:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jpush_tst' into wxr7
---
HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
index a728cbc..aca8e0a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
@@ -83,7 +83,10 @@
public EnergyMainPage()
{
bodyView = this;
- energyList = FunctionList.List.GetEnergyList();
+ 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);
}
/// <summary>
--
Gitblit v1.8.0