From 7232642ff48a7fbde2018cde652f3e771fa58025 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 27 一月 2021 14:32:55 +0800
Subject: [PATCH] 20200127-英文版处理
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 114 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 95 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index dc1c474..0770c48 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -3,6 +3,7 @@
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using System.Collections.Generic;
+using HDL_ON.DAL.Server;
namespace HDL_ON.UI
{
@@ -162,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),
@@ -222,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");
@@ -232,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),
@@ -290,7 +291,7 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
});
break;
- case FunctionType.Temp:
+ case SPK.SensorTemperature:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(50),
@@ -410,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),
@@ -468,7 +469,7 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
});
break;
- case FunctionType.Humidity:
+ case SPK.SensorHumidity:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(151),
@@ -641,13 +642,13 @@
bool initTitleButton = true;
- foreach (var tempSensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
+ foreach (var tempSensor in FunctionList.List.sensorsEnvironmentalScience)
{
if (tempSensor.sid == sensor.sid)
{
continue;
}
- if (tempSensor.functionType != sensor.functionType)
+ if (tempSensor.spk != sensor.spk)
{
continue;
}
@@ -827,7 +828,7 @@
try
{
Application.RunOnMainThread(() => {
- loadPage.Start("Loading...");
+ loadPage.Start(Language.StringByID(StringId.PleaseWait));
});
var curMonth = 0;
if(curQueryType == QueryType.NowMonth)
@@ -835,9 +836,66 @@
curMonth = DateTime.Now.Month;
}
int i = 0;
- foreach (var sr in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
+
+//#if DEBUG
+// var sItem = new EchartSeriesItem
+// {
+// name = sensor.GetRoomListName(),
+// data = new List<int>(),
+// lineStyle = new EchartLineStyle()
+// {
+// color = tipColorStringList[i],
+//#if __IOS__
+// width = 5,
+//#elif __ANDROID__
+// width = 2,
+//#endif
+// },
+// };
+// Random random = new Random();
+// double level = 0.0;
+// int countddd = 24;
+// for (int j = 0; j < countddd; j++)
+// {
+// switch (sensor.functionType)
+// {
+// case SPK.SensorPm25:
+// level = Math.Round(random.NextDouble() * 130, 0);
+// break;
+// case SPK.SensorCO2:
+// level = Math.Round(random.NextDouble() * 6000, 0);
+// break;
+// case SPK.SensorTemperature:
+// level = Math.Round(random.NextDouble() * 40, 0);
+// break;
+// case SPK.SensorTVOC:
+// level = Math.Round(random.NextDouble() * 10, 1);
+// break;
+// case SPK.SensorHumidity:
+// level = Math.Round(random.NextDouble() * 100, 0);
+// break;
+// }
+// sItem.data.Add((int)level);
+// }
+// seriesList.Add(sItem);
+// echartRootJson.series = seriesList;
+//#if __IOS__
+// echartRootJson.xAxis.axisLabel.fontSize = 22;
+// echartRootJson.yAxis.axisLabel.fontSize = 22;
+//#else
+// echartRootJson.xAxis.axisLabel.fontSize = 8;
+// echartRootJson.yAxis.axisLabel.fontSize = 8;
+//#endif
+// echartRootJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(echartRootJson);
+// Application.RunOnMainThread(() =>
+// {
+// myEchartsView.ShowWithOptionJsonString(echartRootJsonString);
+// });
+//#endif
+
+ foreach (var sr in FunctionList.List.sensorsEnvironmentalScience)
{
- if (sr.functionType != sensor.functionType)
+ if (sr.spk != sensor.spk)
{
continue;
}
@@ -846,13 +904,33 @@
i++;
continue;
}
- var revertObj = new DAL.Server.HttpServerRequest().GetSensorHistory(sr.bus_Data.SubnetID, sr.bus_Data.DeviceID,
- 5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus_Data.LoopID, curMonth,
- DB_ResidenceData.residenceData.residenceGatewayMAC);
+
+ 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, sensorType, (int)curQueryType, sr.bus.LoopId, curMonth,
+ DB_ResidenceData.Instance.residenceGatewayMAC);
if (revertObj != null)
{
- if (revertObj.StateCode == "SUCCESS")
+ if (revertObj.StateCode == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SensorPushHistoryRes>>(revertObj.ResponseData.ToString());
@@ -874,7 +952,7 @@
int ass = 0;
for (int j = 0; j < revertData.Count; j++)
{
- if (curQueryType == QueryType.NowMonth && revertData[j].CreatedOnUtc.Day > DateTime.Now.Day )
+ if (curQueryType == QueryType.NowMonth && revertData[j].CreatedOnUtc.Day > DateTime.Now.Day)
{
continue;
}
@@ -913,8 +991,6 @@
i++;
}
- //echartRootJson.title.text = "娓╁害(鈩�)";lineStyle
- //echartRootJson.color = new List<string> { "#80AEFF" };//, "FFD154", "FF9D54", "FE6A6A", "B183C3", "ADE764"
echartRootJson.series = seriesList;
--
Gitblit v1.8.0