From 23bbed132eea46eef51c6d01c21b346238e29ee2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:39:12 +0800
Subject: [PATCH] Merge branch 'wxr0114' into V1.5.9
---
HDL_ON/Entity/Function/Sensor.cs | 123 ++++++++++------------------------------
1 files changed, 32 insertions(+), 91 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index 0ad5cc8..aff130f 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -1,6 +1,5 @@
锘縰sing System;
using System.Collections.Generic;
-using Shared;
namespace HDL_ON.Entity
{
@@ -82,30 +81,9 @@
/// <summary>
/// 姣忎釜绛夌骇瀵瑰尯闂村��
/// </summary>
- public List<string> GetIntervalValue(Function function)
+ public List<string> GetIntervalValue(string spk)
{
var _intervalValue = new List<string>();
-
-
- 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)
- {
- _intervalValue.Add(info.start + " ~ " + info.end);
- }
- }
- }
- if (_intervalValue.Count > 0)
- return _intervalValue;
- }
-
-
- string spk = function.spk;
switch (spk)
{
case SPK.SensorPm25:
@@ -195,27 +173,9 @@
/// <summary>
/// 姣忎釜绛夌骇鐨勯鑹插��
/// </summary>
- public List<uint> GetLevelColorList(Function function)
+ public List<uint> GetLevelColorList(string spk)
{
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(Convert.ToUInt32(info.color, 16));
- }
- }
- }
- if (_levelColorList.Count > 0)
- return _levelColorList;
- }
-
- string spk = function.spk;
switch (spk)
{
case SPK.SensorPm25:
@@ -269,71 +229,52 @@
/// <summary>
/// 姣忎釜绛夌骇鐨勫悕绉�
/// </summary>
- public List<string> GetLevelTextList(Function function)
+ public List<int> GetLevelTextList(string spk)
{
- var _levelTextList = new List<string>();
-
- 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)
- {
- _levelTextList.Add(info.desc);
- }
- }
- }
- if (_levelTextList.Count > 0)
- return _levelTextList;
- }
-
- string spk = function.spk;
+ var _levelTextList = new List<int>();
switch (spk)
{
case SPK.SensorPm25:
- _levelTextList.Add(Language.StringByID(StringId.Great));
- _levelTextList.Add(Language.StringByID(StringId.Good));
- _levelTextList.Add(Language.StringByID(StringId.MildPollution));
- _levelTextList.Add(Language.StringByID(StringId.HeavyPollution));
+ _levelTextList.Add(StringId.Great);
+ _levelTextList.Add(StringId.Good);
+ _levelTextList.Add(StringId.MildPollution);
+ _levelTextList.Add(StringId.HeavyPollution);
break;
case SPK.SensorCO2:
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceTipCO2Level1));
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceTipCO2Level2));
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceTipCO2Level3));
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceTipCO2Level4));
+ _levelTextList.Add(StringId.SensorReferenceTipCO2Level1);
+ _levelTextList.Add(StringId.SensorReferenceTipCO2Level2);
+ _levelTextList.Add(StringId.SensorReferenceTipCO2Level3);
+ _levelTextList.Add(StringId.SensorReferenceTipCO2Level4);
break;
case SPK.SensorTemperature:
- _levelTextList.Add(Language.StringByID(StringId.ExtremelyCold));
- _levelTextList.Add(Language.StringByID(StringId.Cold));
- _levelTextList.Add(Language.StringByID(StringId.SlightlyCold));
- _levelTextList.Add(Language.StringByID(StringId.Comfortable));
- _levelTextList.Add(Language.StringByID(StringId.TepidFever));
- _levelTextList.Add(Language.StringByID(StringId.Heat_SensorTip));
- _levelTextList.Add(Language.StringByID(StringId.ExtremeHeat));
+ _levelTextList.Add(StringId.ExtremelyCold);
+ _levelTextList.Add(StringId.Cold);
+ _levelTextList.Add(StringId.SlightlyCold);
+ _levelTextList.Add(StringId.Comfortable);
+ _levelTextList.Add(StringId.TepidFever);
+ _levelTextList.Add(StringId.Heat_SensorTip);
+ _levelTextList.Add(StringId.ExtremeHeat);
break;
case SPK.SensorTVOC:
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceTVOCTipLevel1));
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceTVOCTipLevel2));
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceTVOCTipLevel3));
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceTVOCTipLevel4));
+ _levelTextList.Add(StringId.SensorReferenceTVOCTipLevel1);
+ _levelTextList.Add(StringId.SensorReferenceTVOCTipLevel2);
+ _levelTextList.Add(StringId.SensorReferenceTVOCTipLevel3);
+ _levelTextList.Add(StringId.SensorReferenceTVOCTipLevel4);
break;
case SPK.SensorHumidity:
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceHumidityTipLevel1));
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceHumidityTipLevel2));
- _levelTextList.Add(Language.StringByID(StringId.SensorReferenceHumidityTipLevel3));
+ _levelTextList.Add(StringId.SensorReferenceHumidityTipLevel1);
+ _levelTextList.Add(StringId.SensorReferenceHumidityTipLevel2);
+ _levelTextList.Add(StringId.SensorReferenceHumidityTipLevel3);
break;
case SPK.SensorHcho:
- _levelTextList.Add(Language.StringByID(StringId.Class_I_BuildingStandard));
- _levelTextList.Add(Language.StringByID(StringId.SecondaryBuildingStandard));
- _levelTextList.Add(Language.StringByID(StringId.ExceedingTheStandard));
+ _levelTextList.Add(StringId.Class_I_BuildingStandard);
+ _levelTextList.Add(StringId.SecondaryBuildingStandard);
+ _levelTextList.Add(StringId.ExceedingTheStandard);
break;
default:
- _levelTextList.Add("");
- _levelTextList.Add("");
- _levelTextList.Add("");
+ _levelTextList.Add(99999999);
+ _levelTextList.Add(99999999);
+ _levelTextList.Add(99999999);
break;
}
return _levelTextList;
--
Gitblit v1.8.0