From dc9a1b15bb69227e19afc070adf58156a362d2a2 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 30 九月 2024 17:07:58 +0800
Subject: [PATCH] 安卓可视对讲响铃，
---
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs | 113 +++++++++++++++++++++++++++++---------------------------
1 files changed, 59 insertions(+), 54 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
index eb0b3db..786666a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
@@ -35,10 +35,12 @@
string curQueryType = "hour";
string queryTime;
Function function;
- public AcstSubHistoryPage(Function temp)
+ string colorString;
+ public AcstSubHistoryPage(Function temp,string colorStr)
{
function = temp;
bodyView = this;
+ colorString = colorStr;
}
@@ -47,7 +49,10 @@
/// </summary>
public void LoadPage()
{
- new TopViewDiv(bodyView, function.GetRoomListName()).LoadTopView();
+ var topView = new TopViewDiv(bodyView, function.name);
+ topView.maginY = 10;
+ topView.LoadTopView();
+
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
//var contentView = new FrameLayout()
@@ -134,7 +139,7 @@
{
Y = Application.GetRealHeight(222),
Height = Application.GetRealHeight(34),
- Text = "鏈�杩�24灏忔椂鐨勫钩鍧囧鍐呮俯搴�",
+ TextID = StringId.Temp,
TextSize = 10,
TextColor = 0xFF798394,
TextAlignment = TextAlignment.Center,
@@ -169,7 +174,7 @@
{
Y = Application.GetRealHeight(222),
Height = Application.GetRealHeight(34),
- Text = "鏈�杩�24灏忔椂鐨勫钩鍧囧鍐呮箍搴�",
+ TextID = StringId.Humidity,
TextSize = 10,
TextColor = 0xFF798394,
TextAlignment = TextAlignment.Center,
@@ -179,59 +184,59 @@
#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
@@ -327,7 +332,7 @@
}
tempEchartOption.InitXdataText(vs);
}
- tempEchartOption.InitYdataText("", revertData, "#FF80AEFF");
+ tempEchartOption.InitYdataTextLinearGradient("(掳C)", revertData, colorString);
tempEchartOption.xTitle = Language.StringByID(StringId.timeMode);
var opString = tempEchartOption.InitOption();
@@ -383,7 +388,7 @@
}
humiEchartsOption.InitXdataText(vs);
}
- humiEchartsOption.InitYdataText("", revertData, "#FF80AEFF");
+ humiEchartsOption.InitYdataTextLinearGradient("(%)", revertData, colorString);
}
}
humiEchartsOption.xTitle = Language.StringByID(StringId.timeMode);
--
Gitblit v1.8.0