From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 85 ++++++++++++++++++++++++++++++++++--------
1 files changed, 69 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index fb73532..baeab02 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -115,7 +115,7 @@
TextColor = CSS_Color.PromptingColor2,
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = StringId.month,
+ Text = DateTime.Now.Month.ToString() + Language.StringByID(StringId.month),
};
showDataTypeView.AddChidren(btnShowHistroyData_Month);
#endregion
@@ -164,7 +164,6 @@
switch (sensor.functionType)
{
- case FunctionType.PM10:
case FunctionType.PM25:
tipValuesView.AddChidren(new Button()
{
@@ -233,10 +232,6 @@
//_levelTextList.Add(StringId.MildPollution);
//_levelTextList.Add(StringId.HeavyPollution);
//break;
- //case FunctionType.Noise:
- // break;
- case FunctionType.WindPower:
- break;
case FunctionType.CO2:
tipValuesView.AddChidren(new Button()
{
@@ -646,7 +641,7 @@
bool initTitleButton = true;
- foreach (var tempSensor in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
+ foreach (var tempSensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
{
if (tempSensor.sid == sensor.sid)
{
@@ -840,17 +835,69 @@
curMonth = DateTime.Now.Month;
}
int i = 0;
- foreach (var tempSensor in DB_ResidenceData.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 FunctionType.PM25:
+// level = Math.Round(random.NextDouble() * 130, 0);
+// break;
+// case FunctionType.CO2:
+// level = Math.Round(random.NextDouble() * 6000, 0);
+// break;
+// case FunctionType.Temp:
+// level = Math.Round(random.NextDouble() * 40, 0);
+// break;
+// case FunctionType.TVOC:
+// level = Math.Round(random.NextDouble() * 10, 1);
+// break;
+// case FunctionType.Humidity:
+// 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 DB_ResidenceData.functionList.sensorsEnvironmentalScience)
{
- if (tempSensor.sid == sensor.sid)
+ if (sr.functionType != sensor.functionType)
{
continue;
}
- if (tempSensor.functionType != sensor.functionType)
- {
- continue;
- }
- var sr = DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience[i];
if (showSensors.Find((obj) => obj.sid == sr.sid) == null)
{
i++;
@@ -884,9 +931,17 @@
int ass = 0;
for (int j = 0; j < revertData.Count; j++)
{
+ if (curQueryType == QueryType.NowMonth && revertData[j].CreatedOnUtc.Day > DateTime.Now.Day)
+ {
+ continue;
+ }
if (revertData[j].TargetValue.ToString() != "NaN")
{
ass = Convert.ToInt32(revertData[j].TargetValue);
+ }
+ else
+ {
+ ass = 0;
}
sItem.data.Add(ass);
switch (curQueryType)
@@ -915,8 +970,6 @@
i++;
}
- //echartRootJson.title.text = "娓╁害(鈩�)";lineStyle
- //echartRootJson.color = new List<string> { "#80AEFF" };//, "FFD154", "FF9D54", "FE6A6A", "B183C3", "ADE764"
echartRootJson.series = seriesList;
--
Gitblit v1.8.0