From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/Entity/FunctionList.cs | 98 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 95 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 6dda2d1..398fb08 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -24,7 +24,11 @@
var filePathList = FileUtlis.Files.ReadFiles();
foreach (var filePath in filePathList)
{
- _FunctionList.IniFunctionList(filePath);
+ try
+ {
+ _FunctionList.IniFunctionList(filePath);
+ }
+ catch { }
}
#endregion
}
@@ -35,6 +39,26 @@
/// 鍔熻兘鍒楄〃
/// </summary>
public List<Function> Functions = new List<Function>();
+
+ /// <summary>
+ /// 缁垮缓绉戞妧绯荤粺
+ /// 鎬绘帶鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetAcstParentList()
+ {
+ return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);
+ }
+
+ /// <summary>
+ /// 缁垮缓绉戞妧绯荤粺
+ /// 瀛愭帶鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetAcstSubList()
+ {
+ return Functions.FindAll((obj) => obj.spk == SPK.AcstSub);
+ }
/// <summary>
/// 绌鸿皟鍒楄〃
@@ -72,6 +96,12 @@
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+ public List<Function> GetDoorLockList()
+ {
+ var spkList = SPK.GetDoorLockSPKList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
/// <summary>
/// 鏂伴鍒楄〃
/// </summary>
@@ -92,6 +122,22 @@
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+ List<InverterInfo> _inverterList = new List<InverterInfo>();
+ /// <summary>
+ /// 鍏変紡鍒楄〃
+ /// </summary>
+ public List<Function> InverterList()
+ {
+ //get
+ //{
+ // return _inverterList;
+ //}
+ //set
+ //{
+ // _inverterList = value;
+ //}
+ return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
+ }
#region 瀹剁數鍒楄〃 electricals
/// <summary>
/// 瀹剁數鍒楄〃
@@ -139,6 +185,23 @@
var spkList = SPK.ArmSensorSpkList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+ /// <summary>
+ /// 瀹夐槻涓績鏀寔鐨勪紶鎰熷櫒鍒楄〃
+ /// </summary>
+ public List<Function> GetArmCenterList()
+ {
+ var spkList = new List<string>()
+ {
+ SPK.SensorPir,
+ SPK.SensorDoorWindow,
+ SPK.SensorSmoke,
+ SPK.SensorWater,
+ SPK.SensorGas,
+ };
+
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
/// <summary>
/// 鍙瀵硅鍒楄〃,褰撲负null鎴杝ize涓�0鍒欎笉鏄剧ず鍙瀵硅icon
@@ -175,6 +238,19 @@
/// </summary>
public List<SecurityAlarm> securities = new List<SecurityAlarm>();
+ public List<SecurityAlarm> GetOrdinarySecurities()
+ {
+ var ordinarySecurities = new List<SecurityAlarm>();
+ foreach (var mode in securities)
+ {
+ if (mode.type == "all_day" || mode.type == "mute")
+ {
+ continue;
+ }
+ ordinarySecurities.Add(mode);
+ }
+ return ordinarySecurities;
+ }
/// <summary>
/// 鍔犺浇鍔熻兘鍒楄〃
@@ -423,12 +499,26 @@
if(DriverLayer.Control.Ins.GatewayOnline_Local)
{
+
+ //List<Function> functions = GetDeviceFunctionList(SPK.BrandType.Hdl);
+ //var sss = functions.OrderBy((obj) => obj.collect);
+
+ List<Function> readList = new List<Function>();
foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
{
+ readList.Add(function);
MainPage.Log($"璇诲彇鍔熻兘鐘舵�侊細{function.name} : {function.sid} ");
- Control.Ins.SendReadCommand(function);
+ if (readList.Count > 9)
+ {
+ Control.Ins.SendReadCommand(readList);
+ readList.Clear();
+ }
}
- if(DB_ResidenceData.Instance.GatewayType == 1)
+ if (readList.Count > 0)
+ {
+ Control.Ins.SendReadCommand(readList);
+ }
+ if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> pairs = new Dictionary<string, string>();
string sendId = Control.Ins.msg_id.ToString();
@@ -445,6 +535,8 @@
var page = new List<string>();
int count = 0;
+ //List<Function> functions = GetDeviceFunctionList(SPK.BrandType.Hdl);
+ //var sss = functions.OrderBy((obj) => obj.collect);
foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
{
page.Add(function.deviceId);
--
Gitblit v1.8.0