From c7f0f1a0c2148ca9a8944e523404b06351bb7977 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 14 四月 2022 15:35:39 +0800
Subject: [PATCH] 金茂温控器更新
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs | 115 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 74 insertions(+), 41 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs
index 6a8adb8..71f5518 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs
@@ -13,9 +13,16 @@
EchartsOption_BrokenLine brokenLine;
MyEchartsViewOn myEchartsView_Line;
string curQueryType = "hour";
- public CacDayHistoryPage()
+ string queryTime;
+ string functionId;
+ string time;
+ public CacDayHistoryPage(string functionId,string queryType, string time)
{
+ this.time = time;
+ this.functionId = functionId;
+ curQueryType = queryType;
bodyView = this;
+ queryTime = time;
}
@@ -33,6 +40,23 @@
Height = Application.GetRealHeight(603),
};
bodyView.AddChidren(contentView);
+
+ var btnTitle = new Button()
+ {
+ Height = Application.GetRealHeight(60),
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ };
+ if(curQueryType == "room_temp")
+ {
+ btnTitle.Text = queryTime + "瀹ゅ唴娓╁害鍘嗗彶鏁版嵁";
+ }
+ else
+ {
+ btnTitle.Text = queryTime + "瀹ゅ唴婀垮害鍘嗗彶鏁版嵁";
+ }
+ contentView.AddChidren(btnTitle);
var historyDataView = new FrameLayout()
@@ -56,42 +80,43 @@
#if DEBUG
- List<string> vs = new List<string>() {
- "1","2","3","4","5","6","7","8","9","10","11","12","13","14"
- };
- brokenLine.InitXdataText(vs);
- brokenLine.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");
- brokenLine.yTitle = "(鈩�)";
- brokenLine.xTitle = "";
- if (curQueryType != "hour")
- {
- brokenLine.xTitle = Language.StringByID(StringId.Date);
- }
- var opString = brokenLine.InitOption();
+ //List<string> vs = new List<string>() {
+ // "1","2","3","4","5","6","7","8","9","10","11","12","13","14"
+ // };
+ //brokenLine.InitXdataText(vs);
+ //brokenLine.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");
+ //brokenLine.yTitle = "(鈩�)";
+ //brokenLine.xTitle = "";
+ ////if (curQueryType != "hour")
+ ////{
+ //// brokenLine.xTitle = Language.StringByID(StringId.Date);
+ ////}
+ //var opString = brokenLine.InitOption();
- myEchartsView_Line.ShowWithOption(opString);
+ // myEchartsView_Line.ShowWithOption(opString);
#endif
+ LoadMothed_GetHistoryData();
}
/// <summary>
/// 璇诲彇鍘嗗彶鏁版嵁
/// </summary>
- void LoadMothed_GetHistoryData(Function sr, bool isDel)
+ void LoadMothed_GetHistoryData()
{
var loadPage = new Loading()
@@ -109,8 +134,7 @@
loadPage.Start(Language.StringByID(StringId.PleaseWait));
});
- var sensorType = sr.spk.Split(".")[1];
- var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId, "total_electricity");
+ var revertObj = new HttpServerRequest().GetSensorHistory("day_hour", functionId, curQueryType,time);
if (revertObj != null)
{
if (revertObj.Code == StateCode.SUCCESS)
@@ -126,19 +150,28 @@
}
brokenLine.InitXdataText(vs);
}
- if (sr.GetAttribute("ydata") == null)
- {
- sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
- }
- sr.SetAttrState("ydata", brokenLine.InitYdataText(sr.name, revertData, sr.GetAttrState("color")) + ",");
+ //if (sr.GetAttribute("ydata") == null)
+ //{
+ // sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
+ //}
+ //sr.SetAttrState("ydata",
+ brokenLine.InitYdataText("", revertData, "#FF9D54");// + ",");
}
}
- brokenLine.yTitle = Language.StringByID(StringId.EnergyConsumption) + "(kW)";
- brokenLine.xTitle = Language.StringByID(StringId.timeMode);
- if (curQueryType != "hour")
+ brokenLine.yTitle = Language.StringByID(StringId.Uint);
+ if(curQueryType == "room_temp")
{
- brokenLine.xTitle = Language.StringByID(StringId.Date);
+ brokenLine.yTitle += ":掳C";
}
+ else
+ {
+ brokenLine.yTitle += ":%";
+ }
+ brokenLine.xTitle = Language.StringByID(StringId.timeMode);
+ //if (curQueryType != "hour")
+ //{
+ // brokenLine.xTitle = Language.StringByID(StringId.Date);
+ //}
var opString = brokenLine.InitOption();
Application.RunOnMainThread(() =>
--
Gitblit v1.8.0