From e3f3f62315a5789cd812b96954b67bffda4a0f5a Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 四月 2021 16:33:55 +0800
Subject: [PATCH] 金辉项目，萤石摄像头更新
---
HDL_ON/Entity/FunctionList.cs | 150 +++++++++++++++----------------------------------
1 files changed, 46 insertions(+), 104 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index baaa0f8..a53457b 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,82 +67,41 @@
/// </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));
}
+
+ /// <summary>
+ /// 鏂伴鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetAirFreshList()
+ {
+ var spkList = SPK.AirFreshSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
+ /// <summary>
+ /// 鑳芥簮鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetEnergyList()
+ {
+ var spkList = SPK.EnergySpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
#region 瀹剁數鍒楄〃 electricals
/// <summary>
/// 瀹剁數鍒楄〃
/// </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,25 +116,26 @@
/// </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));
}
+ /// <summary>
+ /// 鍙瀵硅鍒楄〃
+ /// </summary>
+ public UI.UI2.FuntionControlView.Video.VideoMethod.VideoClouds videoIntercom;
+
+ /// <summary>
+ /// 鍦烘櫙鍒楄〃
+ /// </summary>
public List<Scene> scenes = new List<Scene>();
/// <summary>
@@ -215,6 +156,7 @@
var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
if (tempFunction == null)
{
+ MainPage.Log("null");
FileUtlis.Files.DeleteFile(filePath);
return;
}
--
Gitblit v1.8.0