From ab05fa182c317b62ff8b61489aac86162fab9e25 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 19 十月 2022 17:13:13 +0800
Subject: [PATCH] 人居环境更新
---
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs | 125 ++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 57 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
index f7055ad..eb0b3db 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
@@ -179,62 +179,64 @@
#if DEBUG
- List<string> vs = new List<string>() {
- "1","2","3","4","5","6","7","8","9","10","11","12","13","14"
- };
- tempEchartOption.InitXdataText(vs);
- tempEchartOption.InitYdataText("yData", new List<EnvironmentalSensorHistor>() {
- new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" },
- new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" },
- new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "-11" },
- new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" },
- new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "-41" },
- new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" },
- new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "-31" },
- new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "-23" },
- new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "-11" },
- new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "-21" },
- new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" },
- new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" },
- new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" },
- new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }
- }, "#FF9D54");
- tempEchartOption.yTitle = "娓╁害 (掳)";
- tempEchartOption.xTitle = "";
- var opString = tempEchartOption.InitOption();
- tempEchartsView.ShowWithOption(opString);
+ //List<string> vs = new List<string>() {
+ // "1","2","3","4","5","6","7","8","9","10","11","12","13","14"
+ // };
+ //tempEchartOption.InitXdataText(vs);
+ //tempEchartOption.InitYdataText("yData", new List<EnvironmentalSensorHistor>() {
+ // new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" },
+ // new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" },
+ // new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "-11" },
+ // new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" },
+ // new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "-41" },
+ // new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" },
+ // new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "-31" },
+ // new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "-23" },
+ // new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "-11" },
+ // new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "-21" },
+ // new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" },
+ // new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" },
+ // new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" },
+ // new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }
+ //}, "#FF9D54");
+ //tempEchartOption.yTitle = "娓╁害 (掳)";
+ //tempEchartOption.xTitle = "";
+ //var opString = tempEchartOption.InitOption();
+ //tempEchartsView.ShowWithOption(opString);
- List<string> vs2 = new List<string>() {
- "1","2","3","4","5","6","7","8","9","10","11","12","13","14"
- };
- humiEchartsOption.InitXdataText(vs2);
- humiEchartsOption.InitYdataText("yData", new List<EnvironmentalSensorHistor>() {
- new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" },
- new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" },
- new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "-11" },
- new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" },
- new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "-41" },
- new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" },
- new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "-31" },
- new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "-23" },
- new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "-11" },
- new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "-21" },
- new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" },
- new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" },
- new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" },
- new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }
- }, "#FF9D54");
- humiEchartsOption.yTitle = "婀垮害 (%)";
- humiEchartsOption.xTitle = "";
- var opString2 = humiEchartsOption.InitOption();
+ //List<string> vs2 = new List<string>() {
+ // "1","2","3","4","5","6","7","8","9","10","11","12","13","14"
+ // };
+ //humiEchartsOption.InitXdataText(vs2);
+ //humiEchartsOption.InitYdataText("yData", new List<EnvironmentalSensorHistor>() {
+ // new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" },
+ // new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" },
+ // new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "-11" },
+ // new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" },
+ // new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "-41" },
+ // new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" },
+ // new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "-31" },
+ // new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "-23" },
+ // new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "-11" },
+ // new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "-21" },
+ // new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" },
+ // new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" },
+ // new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" },
+ // new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }
+ //}, "#FF9D54");
+ //humiEchartsOption.yTitle = "婀垮害 (%)";
+ //humiEchartsOption.xTitle = "";
+ //var opString2 = humiEchartsOption.InitOption();
- humiEchartsView.ShowWithOption(opString2);
+ //humiEchartsView.ShowWithOption(opString2);
#endif
+
LoadEvent_ChangeSensorHistoryShowType();
+ LoadMothed_GetHistoryData();
}
@@ -247,6 +249,8 @@
btnShowHistroyData_Month.IsSelected = false;
btnShowHistroyData_Week.IsSelected = false;
curQueryType = "hour";
+ tempEchartOption.YvalueText = "";
+ humiEchartsOption.YvalueText = "";
LoadMothed_GetHistoryData();
};
@@ -257,6 +261,8 @@
btnShowHistroyData_Month.IsSelected = true;
btnShowHistroyData_Week.IsSelected = false;
curQueryType = "month";
+ tempEchartOption.YvalueText = "";
+ humiEchartsOption.YvalueText = "";
LoadMothed_GetHistoryData();
};
btnShowHistroyData_Week.MouseUpEventHandler = (sender, e) =>
@@ -266,6 +272,8 @@
btnShowHistroyData_Month.IsSelected = false;
btnShowHistroyData_Week.IsSelected = true;
curQueryType = "week";
+ tempEchartOption.YvalueText = "";
+ humiEchartsOption.YvalueText = "";
LoadMothed_GetHistoryData();
};
@@ -303,7 +311,7 @@
loadPage.Start(Language.StringByID(StringId.PleaseWait));
});
- var revertObj = new HttpServerRequest().GetSensorHistory( function.deviceId, curQueryType , "room_temp");
+ var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, function.deviceId , "room_temp");
if (revertObj != null)
{
if (revertObj.Code == StateCode.SUCCESS)
@@ -320,15 +328,16 @@
tempEchartOption.InitXdataText(vs);
}
tempEchartOption.InitYdataText("", revertData, "#FF80AEFF");
+
+ tempEchartOption.xTitle = Language.StringByID(StringId.timeMode);
+ var opString = tempEchartOption.InitOption();
+
+ Application.RunOnMainThread(() =>
+ {
+ tempEchartsView.ShowWithOption(opString);
+ });
}
}
- tempEchartOption.xTitle = Language.StringByID(StringId.timeMode);
- var opString = tempEchartOption.InitOption();
-
- Application.RunOnMainThread(() =>
- {
- tempEchartsView.ShowWithOption(opString);
- });
}
catch (Exception ex)
{
@@ -336,6 +345,7 @@
}
finally
{
+ inReadTempHistory = false;
if (!inReadHumiHistory)
{
Application.RunOnMainThread(() =>
@@ -357,7 +367,7 @@
loadPage.Start(Language.StringByID(StringId.PleaseWait));
});
- var revertObj = new HttpServerRequest().GetSensorHistory(function.deviceId, curQueryType, "room_humidity");
+ var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType,function.deviceId, "room_humidity");
if (revertObj != null)
{
if (revertObj.Code == StateCode.SUCCESS)
@@ -390,6 +400,7 @@
}
finally
{
+ inReadHumiHistory = false;
if (!inReadTempHistory)
{
Application.RunOnMainThread(() =>
--
Gitblit v1.8.0