From b271bcceb1c4e718377ca86b6213816abcf7482a Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 13:57:18 +0800
Subject: [PATCH] 20210111-删除功能类别，统一使用spk去设备功能
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 258637d..0770c48 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -163,9 +163,9 @@
};
diagramView.AddChidren(tipTextView);
- switch (sensor.functionType)
+ switch (sensor.spk)
{
- case FunctionType.PM25:
+ case SPK.SensorPm25:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(101),
@@ -223,7 +223,7 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
});
break;
- //case FunctionType.PM25:
+ //case SPK.SensorPm25:
//_intervalValue.Add("0 ~ 35");
//_intervalValue.Add("36 ~ 75");
//_intervalValue.Add("76 ~ 115");
@@ -233,7 +233,7 @@
//_levelTextList.Add(StringId.MildPollution);
//_levelTextList.Add(StringId.HeavyPollution);
//break;
- case FunctionType.CO2:
+ case SPK.SensorCO2:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(101),
@@ -291,7 +291,7 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
});
break;
- case FunctionType.Temp:
+ case SPK.SensorTemperature:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(50),
@@ -411,7 +411,7 @@
//_levelTextList.Add(StringId.);
//_levelTextList.Add(StringId.ExtremeHeat);
break;
- case FunctionType.TVOC:
+ case SPK.SensorTVOC:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(101),
@@ -469,7 +469,7 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
});
break;
- case FunctionType.Humidity:
+ case SPK.SensorHumidity:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(151),
@@ -648,7 +648,7 @@
{
continue;
}
- if (tempSensor.functionType != sensor.functionType)
+ if (tempSensor.spk != sensor.spk)
{
continue;
}
@@ -828,7 +828,7 @@
try
{
Application.RunOnMainThread(() => {
- loadPage.Start("Loading...");
+ loadPage.Start(Language.StringByID(StringId.PleaseWait));
});
var curMonth = 0;
if(curQueryType == QueryType.NowMonth)
@@ -859,19 +859,19 @@
// {
// switch (sensor.functionType)
// {
-// case FunctionType.PM25:
+// case SPK.SensorPm25:
// level = Math.Round(random.NextDouble() * 130, 0);
// break;
-// case FunctionType.CO2:
+// case SPK.SensorCO2:
// level = Math.Round(random.NextDouble() * 6000, 0);
// break;
-// case FunctionType.Temp:
+// case SPK.SensorTemperature:
// level = Math.Round(random.NextDouble() * 40, 0);
// break;
-// case FunctionType.TVOC:
+// case SPK.SensorTVOC:
// level = Math.Round(random.NextDouble() * 10, 1);
// break;
-// case FunctionType.Humidity:
+// case SPK.SensorHumidity:
// level = Math.Round(random.NextDouble() * 100, 0);
// break;
// }
@@ -895,7 +895,7 @@
foreach (var sr in FunctionList.List.sensorsEnvironmentalScience)
{
- if (sr.functionType != sensor.functionType)
+ if (sr.spk != sensor.spk)
{
continue;
}
@@ -904,8 +904,28 @@
i++;
continue;
}
+
+ byte sensorType = 0;
+ switch (sr.spk)
+ {
+ case SPK.SensorTemperature:
+ sensorType = 2;
+ break;
+ case SPK.SensorHumidity:
+ sensorType = 3;
+ break;
+ case SPK.SensorTVOC:
+ sensorType = 5;
+ break;
+ case SPK.SensorPm25:
+ sensorType = 6;
+ break;
+ case SPK.SensorCO2:
+ sensorType = 7;
+ break;
+ }
var revertObj = new HttpServerRequest().GetSensorHistory(sr.bus.SubnetID, sr.bus.DeviceID,
- 5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus.LoopId, curMonth,
+ 5, sensorType, (int)curQueryType, sr.bus.LoopId, curMonth,
DB_ResidenceData.Instance.residenceGatewayMAC);
if (revertObj != null)
--
Gitblit v1.8.0