From f16fd06aa226e9f97a27858624d4ea7cf8975d25 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 五月 2024 17:24:38 +0800
Subject: [PATCH] 增加了萤石摄像头
---
HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
index 495e602..e3e0903 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>
@@ -189,7 +186,7 @@
string key = ene.name;
if (list.ContainsKey(key))
{
- list.Add(ene.name + DateTime.Now.ToLongTimeString(), tt.ToString());
+ list.Add(ene.name + DateTime.Now.Ticks, tt.ToString());
}
else
{
--
Gitblit v1.8.0