From 132ef8524e38d06da8cf74292a3ac1eff065bb1b Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期二, 23 三月 2021 16:38:01 +0800
Subject: [PATCH] 整好新风的UI，待真实设备测试
---
HDL_ON/Entity/FunctionList.cs | 120 ++++++++----------------------------------------------------
1 files changed, 16 insertions(+), 104 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index baaa0f8..fe72790 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -41,19 +41,8 @@
/// <returns></returns>
public List<Function> GetAcList()
{
- return Functions.FindAll((obj) => obj.spk == SPK.AcStandard || obj.spk == SPK.AcIr);
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <returns></returns>
- public List<Function> GetList()
- {
- List<Function> list = new List<Function>();
-
-
- return list;
+ var spkList = SPK.AcSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
/// <summary>
@@ -61,24 +50,16 @@
/// </summary>
public List<Function> GetLightList()
{
- return Functions.FindAll((obj) =>
- obj.spk == SPK.LightSwitch
- || obj.spk == SPK.LightDimming
- || obj.spk == SPK.LightRGB
- || obj.spk == SPK.LightRGBW
- || obj.spk == SPK.LightCCT);
+ var spkList = SPK.LightSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
/// <summary>
/// 绐楀笜鍒楄〃
/// </summary>
public List<Function> GetCurtainList()
{
- return Functions.FindAll((obj) =>
- obj.spk == SPK.CurtainRoller
- || obj.spk == SPK.CurtainShades
- || obj.spk == SPK.CurtainSwitch
- || obj.spk == SPK.CurtainTrietex
- );
+ var spkList = SPK.CurtainSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
/// <summary>
@@ -86,7 +67,8 @@
/// </summary>
public List<Function> GetFloorHeatingList()
{
- return Functions.FindAll((obj) => obj.spk == SPK.FloorHeatStandard);
+ var spkList = SPK.FhSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
#region 瀹剁數鍒楄〃 electricals
/// <summary>
@@ -94,74 +76,11 @@
/// </summary>
public List<Function> GetElectricals()
{
-
- return Functions.FindAll((obj) => obj.spk == SPK.ElectricFan || obj.spk == SPK.ElectricTuyaFan
- || obj.spk == SPK.ElectricSocket
- || obj.spk == SPK.IrLearn
- || obj.spk == SPK.IrTV
- || obj.spk == SPK.ElectricTV
- || obj.spk == SPK.ElectricTuyaAirCleaner
- || obj.spk == SPK.ElectricTuyaWeepRobot
- || obj.spk == SPK.ElectricTuyaWaterValve
- || obj.spk == SPK.ClothesHanger);
+ var spkList = SPK.ElectricalSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
- /// <summary>
- /// 閬ユ帶鍣ㄥ垪琛�
- /// </summary>
- /// <returns></returns>
- public List<Function> GetIrLearinList()
- {
- return Functions.FindAll((obj) => obj.spk == SPK.IrLearn);
- }
- /// <summary>
- /// 椋庢墖鍒楄〃
- /// </summary>
- public List<Function> GetFanList()
- {
- return Functions.FindAll((obj) => obj.spk == SPK.ElectricFan || obj.spk == SPK.ElectricTuyaFan);
- }
- /// <summary>
- /// 鐢佃鍒楄〃
- /// </summary>
- public List<Function> GetTVList()
- {
- return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV || obj.spk == SPK.IrTV);
- }
- /// <summary>
- /// 瀹剁數鎻掑骇鍒楄〃
- /// </summary>
- public List<Function> GetElectricSocketList()
- {
- return Functions.FindAll((obj) => obj.spk == SPK.ElectricSocket);
- }
- /// <summary>
- /// 绌烘皵鍑�鍖栧櫒鍒楄〃
- /// </summary>
- public List<Function> GetAirCleanerList()
- {
- return Functions.FindAll((obj) => obj.spk == SPK.ElectricTuyaAirCleaner);
- }
- /// <summary>
- /// 鎵湴鏈哄櫒浜哄垪琛�
- /// </summary>
- public List<Function> GetWeepRobotList()
- {
- return Functions.FindAll((obj) => obj.spk == SPK.ElectricTuyaWeepRobot);
- }
- /// <summary>
- /// 姘撮榾鍒楄〃
- /// </summary>
- public List<Function> GetWaterValveList()
- {
- return Functions.FindAll((obj) => obj.spk == SPK.ElectricTuyaWaterValve);
- }
- /// <summary>
- /// 鍑夐湼鍒楄〃
- /// </summary>
- public List<Function> GetClothesHangerList ()
- {
- return Functions.FindAll((obj) => obj.spk == SPK.ClothesHanger);
- }
+
+
/// <summary>
/// 绾㈠瀹濆垪琛�
/// </summary>
@@ -176,23 +95,16 @@
/// </summary>
public List<Function> GetEnvirSensorsList()
{
- return Functions.FindAll((obj) => obj.spk == SPK.SensorPm25
- || obj.spk == SPK.SensorCO2
- || obj.spk == SPK.SensorTVOC
- || obj.spk == SPK.SensorTemperature
- || obj.spk == SPK.SensorHumidity
- );
+ var spkList = SPK.EnvironSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
/// <summary>
/// 瀹夐槻璁惧鍒楄〃
/// </summary>
public List<Function> GetArmSensorList()
{
- return Functions.FindAll((obj) => obj.spk == SPK.SensorSmoke
- || obj.spk == SPK.SensorWater
- || obj.spk == SPK.SensorDoorWindow
- || obj.spk == SPK.SensorPir
- );
+ var spkList = SPK.ArmSensorSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
public List<Scene> scenes = new List<Scene>();
--
Gitblit v1.8.0