From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整，新风，音乐
---
HDL_ON/Entity/Function/Sensor.cs | 163 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 136 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index 5a86351..c36ed6e 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
using Shared;
namespace HDL_ON.Entity
@@ -30,6 +31,12 @@
break;
case SPK.SensorHumidity:
nameId = StringId.Humidity;
+ break;
+ case SPK.SensorHcho:
+ nameId = StringId.Formaldehyde;
+ break;
+ case SPK.SensorLight:
+ nameId = StringId.guangzhao;
break;
}
return nameId;
@@ -62,10 +69,14 @@
case SPK.SensorHumidity:
attr = function.GetAttribute(FunctionAttributeKey.Humidity);
break;
+ case SPK.SensorPm10:
+ attr = function.GetAttribute(FunctionAttributeKey.Pm10);
+ break;
+
}
}
double value = 0.0;
- double.TryParse( attr.state,out value);
+ double.TryParse(attr.state, out value);
return Convert.ToDouble(value);
}
@@ -79,17 +90,15 @@
function.SetAttrState(FunctionAttributeKey.Value, value);
}
+
/// <summary>
/// 姣忎釜绛夌骇瀵瑰尯闂村��
/// </summary>
public List<string> GetIntervalValue(Function function)
{
- var _intervalValue = new List<string>();
-
-
+ List<string> _intervalValue = new List<string>();
if (function.attrKeyConfigs.Count > 0)
{
-
foreach (var attrKey in function.attrKeyConfigs)
{
if (function.spk.Replace(".", "").Contains(attrKey.key.Replace(".", "")))
@@ -98,16 +107,20 @@
{
_intervalValue.Add(info.start + " ~ " + info.end);
}
+ return _intervalValue;
}
}
- return _intervalValue;
}
-
- string spk = function.spk;
- switch (spk)
+ switch (function.spk)
{
case SPK.SensorPm25:
+ _intervalValue.Add("0 ~ 50");
+ _intervalValue.Add("51 ~ 100");
+ _intervalValue.Add("101 ~ 150");
+ _intervalValue.Add("151 ~");
+ break;
+ case SPK.SensorPm10:
_intervalValue.Add("0 ~ 35");
_intervalValue.Add("36 ~ 75");
_intervalValue.Add("76 ~ 115");
@@ -149,18 +162,18 @@
return _intervalValue;
}
- public string Unit(Function function)
+ public string Unit(Function function)
{
string unit = "";
if (function.attrKeyConfigs.Count > 0)
{
-
foreach (var attrKey in function.attrKeyConfigs)
{
if (function.spk.Replace(".", "").Contains(attrKey.key.Replace(".", "")))
{
- return attrKey.unit;
+ if (!string.IsNullOrEmpty(attrKey.unit))
+ return attrKey.unit;
}
}
}
@@ -168,13 +181,13 @@
switch (function.spk)
{
case SPK.SensorPm25:
- unit = "ug/m虏";
+ unit = "ug/m鲁";
break;
case SPK.SensorTemperature:
- unit = "掳C";
+ unit = "掳C";
break;
case SPK.SensorTVOC:
- unit = "PPB";
+ unit = "mg/m鲁";
break;
case SPK.SensorCO2:
unit = "PPM";
@@ -198,22 +211,20 @@
var _levelColorList = new List<uint>();
if (function.attrKeyConfigs.Count > 0)
{
-
foreach (var attrKey in function.attrKeyConfigs)
{
if (function.spk.Replace(".", "").Contains(attrKey.key.Replace(".", "")))
{
foreach (var info in attrKey.configs)
{
- _levelColorList.Add(info.color);
+ _levelColorList.Add(Convert.ToUInt32(info.color, 16));
}
+ return _levelColorList;
}
}
- return _levelColorList;
}
- string spk = function.spk;
- switch (spk)
+ switch (function.spk)
{
case SPK.SensorPm25:
_levelColorList.Add(0xFFADE764);
@@ -237,6 +248,7 @@
_levelColorList.Add(0xFFFF3D3D);
break;
case SPK.SensorTVOC:
+ case SPK.SensorPm10:
_levelColorList.Add(0xFFADE764);
_levelColorList.Add(0xFFFFD154);
_levelColorList.Add(0xFFFF9D54);
@@ -269,10 +281,8 @@
public List<string> GetLevelTextList(Function function)
{
var _levelTextList = new List<string>();
-
if (function.attrKeyConfigs.Count > 0)
{
-
foreach (var attrKey in function.attrKeyConfigs)
{
if (function.spk.Replace(".", "").Contains(attrKey.key.Replace(".", "")))
@@ -281,15 +291,16 @@
{
_levelTextList.Add(info.desc);
}
+ return _levelTextList;
}
}
- return _levelTextList;
}
- string spk = function.spk;
- switch (spk)
+
+ switch (function.spk)
{
case SPK.SensorPm25:
+ case SPK.SensorPm10:
_levelTextList.Add(Language.StringByID(StringId.Great));
_levelTextList.Add(Language.StringByID(StringId.Good));
_levelTextList.Add(Language.StringByID(StringId.MildPollution));
@@ -317,9 +328,9 @@
_levelTextList.Add(Language.StringByID(StringId.SensorReferenceTVOCTipLevel4));
break;
case SPK.SensorHumidity:
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceHumidityTipLevel1));
+ _levelTextList.Add(Language.StringByID(StringId.SensorReferenceHumidityTipLevel1));//娼箍
_levelTextList.Add(Language.StringByID(StringId.SensorReferenceHumidityTipLevel2));
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceHumidityTipLevel3));
+ _levelTextList.Add(Language.StringByID(StringId.SensorReferenceHumidityTipLevel3));//骞茬嚗
break;
case SPK.SensorHcho:
_levelTextList.Add(Language.StringByID(StringId.Class_I_BuildingStandard));
@@ -334,6 +345,69 @@
}
return _levelTextList;
}
+
+ /// <summary>
+ /// 鑾峰彇
+ /// </summary>
+ /// <param name="function"></param>
+ /// <returns></returns>
+ public uint GetCurColor(Function function)
+ {
+ var spk = function.spk;
+ var values = GetValues(function);
+ uint level = 0x00000000;
+ if (function.attrKeyConfigs.Count > 0)
+ {
+
+ foreach (var attrKey in function.attrKeyConfigs)
+ {
+ if (function.spk.Replace(".", "").Contains(attrKey.key.Replace(".", "")))
+ {
+ foreach (var info in attrKey.configs)
+ {
+ if ((Convert.ToInt32(info.start) >= values) && (Convert.ToInt32(info.end) < values))
+ {
+ return Convert.ToUInt32(info.color, 16);
+ }
+ }
+ }
+ }
+ }
+
+ return level;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏂囨湰
+ /// </summary>
+ /// <param name="function"></param>
+ /// <returns></returns>
+ public string GetCurText(Function function)
+ {
+ var spk = function.spk;
+ var values = GetValues(function);
+ var level = "";
+ if (function.attrKeyConfigs.Count > 0)
+ {
+
+ foreach (var attrKey in function.attrKeyConfigs)
+ {
+ if (function.spk.Replace(".", "").Contains(attrKey.key.Replace(".", "")))
+ {
+ foreach (var info in attrKey.configs)
+ {
+ if ((Convert.ToInt32(info.start) >= values) && (Convert.ToInt32(info.end) < values))
+ {
+ return info.desc;
+ }
+ }
+ }
+ }
+ }
+
+ return level;
+ }
+
/// <summary>
/// 褰撳墠绛夌骇
/// </summary>
@@ -342,6 +416,37 @@
var spk = function.spk;
var values = GetValues(function);
int level = 1;
+
+
+
+ if (function.attrKeyConfigs.Count > 0)
+ {
+
+ foreach (var attrKey in function.attrKeyConfigs)
+ {
+ if (function.spk.Replace(".", "").Contains(attrKey.key.Replace(".", "")))
+ {
+ level = 1;
+ if(attrKey.configs.Count == 0)
+ {
+ break;
+ }
+ foreach (var info in attrKey.configs)
+ {
+ if ((Convert.ToDouble(info.start) <= values) && (Convert.ToDouble(info.end) >= values))
+ {
+ return level;
+ }
+ level++;
+
+ }
+ }
+ }
+ return 1;
+ }
+
+
+
switch (spk)
{
case SPK.SensorPm25:
@@ -406,6 +511,10 @@
else
level = 3;
break;
+ default:
+ level = 1;
+ break;
+
}
return level;
}
--
Gitblit v1.8.0