From 88b9c9dbae4f0f28529cd3b3ffe53cd26f19f738 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 30 七月 2023 21:55:50 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs | 201 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 154 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
index a37e5be..f0dfb5c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
@@ -119,6 +119,9 @@
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.month,
+ SelectedBackgroundColor = 0x1F5C62FE,
+ BackgroundColor = 0x00000000,
+ IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
};
@@ -133,6 +136,9 @@
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.Years,
+ SelectedBackgroundColor = 0x1F5C62FE,
+ BackgroundColor = 0x00000000,
+ IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
};
@@ -147,51 +153,123 @@
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.Total,
+ SelectedBackgroundColor = 0x1F5C62FE,
+ BackgroundColor = 0x00000000,
+ IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
};
showDataTypeView.AddChidren(btnShowHistroyData_Total);
+ btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
+
+
+ btnShowHistroyData_Total.MouseUpEventHandler = (sender, e) =>
+ {
+ (sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
+ (sender as Button).BackgroundColor = 0x1F5C62FE;
+ (sender as Button).BorderColor = CSS_Color.MainColor;
+ (sender as Button).BorderWidth = 2;
+ (sender as Button).IsSelected = true;
+
+ btnShowHistroyData_Month.IsSelected = false;
+ btnShowHistroyData_Month.BorderWidth = 1;
+ btnShowHistroyData_Month.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Month.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Month.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Year.IsSelected = false;
+ btnShowHistroyData_Year.BorderWidth = 1;
+ btnShowHistroyData_Year.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Year.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Year.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Day.IsSelected = false;
+ btnShowHistroyData_Day.BorderWidth = 1;
+ btnShowHistroyData_Day.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Day.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Day.SelectedBackgroundColor = 0x00000000;
+ };
btnShowHistroyData_Day.MouseUpEventHandler = (sender, e) =>
{
- //showDataTypeView.BackgroundImagePath = "FunctionIcon/EnvironmentalScience/SensorHistoryBg1.png";
- //btnShowHistroyData_Day.IsSelected = true;
- //btnShowHistroyData_Year.IsSelected = false;
- //btnShowHistroyData_Month.IsSelected = false;
- //curQueryType = "hour";
- //brokenLine.YvalueText = "";
- //foreach (var enery in queryList)
- //{
- // LoadMothed_GetHistoryData(enery, false);
- //}
+ (sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
+ (sender as Button).BackgroundColor = 0x1F5C62FE;
+ (sender as Button).BorderColor = CSS_Color.MainColor;
+ (sender as Button).BorderWidth = 2;
+ (sender as Button).IsSelected = true;
+
+ btnShowHistroyData_Month.IsSelected = false;
+ btnShowHistroyData_Month.BorderWidth = 1;
+ btnShowHistroyData_Month.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Month.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Month.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Year.IsSelected = false;
+ btnShowHistroyData_Year.BorderWidth = 1;
+ btnShowHistroyData_Year.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Year.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Year.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Total.IsSelected = false;
+ btnShowHistroyData_Total.BorderWidth = 1;
+ btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Total.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
};
btnShowHistroyData_Month.MouseUpEventHandler = (sender, e) =>
{
- //showDataTypeView.BackgroundImagePath = "FunctionIcon/EnvironmentalScience/SensorHistoryBg2.png";
- //btnShowHistroyData_Day.IsSelected = false;
- //btnShowHistroyData_Year.IsSelected = false;
- //btnShowHistroyData_Month.IsSelected = true;
- //curQueryType = "week";
- //brokenLine.YvalueText = "";
- //foreach (var enery in queryList)
- //{
- // LoadMothed_GetHistoryData(enery, false);
- //}
+ (sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
+ (sender as Button).BackgroundColor = 0x1F5C62FE;
+ (sender as Button).BorderColor = CSS_Color.MainColor;
+ (sender as Button).BorderWidth = 2;
+ (sender as Button).IsSelected = true;
+
+ btnShowHistroyData_Day.IsSelected = false;
+ btnShowHistroyData_Day.BorderWidth = 1;
+ btnShowHistroyData_Day.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Day.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Day.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Year.IsSelected = false;
+ btnShowHistroyData_Year.BorderWidth = 1;
+ btnShowHistroyData_Year.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Year.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Year.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Total.IsSelected = false;
+ btnShowHistroyData_Total.BorderWidth = 1;
+ btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Total.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
};
+
btnShowHistroyData_Year.MouseUpEventHandler = (sender, e) =>
{
- //showDataTypeView.BackgroundImagePath = "FunctionIcon/EnvironmentalScience/SensorHistoryBg3.png";
- //btnShowHistroyData_Day.IsSelected = false;
- //btnShowHistroyData_Year.IsSelected = true;
- //btnShowHistroyData_Month.IsSelected = false;
- //curQueryType = "month";
- //brokenLine.YvalueText = "";
- //foreach (var enery in queryList)
- //{
- // LoadMothed_GetHistoryData(enery, false);
- //}
+ (sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
+ (sender as Button).BackgroundColor = 0x1F5C62FE;
+ (sender as Button).BorderColor = CSS_Color.MainColor;
+ (sender as Button).BorderWidth = 2;
+ (sender as Button).IsSelected = true;
+
+ btnShowHistroyData_Month.IsSelected = false;
+ btnShowHistroyData_Month.BorderWidth = 1;
+ btnShowHistroyData_Month.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Month.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Month.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Day.IsSelected = false;
+ btnShowHistroyData_Day.BorderWidth = 1;
+ btnShowHistroyData_Day.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Day.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Day.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Total.IsSelected = false;
+ btnShowHistroyData_Total.BorderWidth = 1;
+ btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Total.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
};
#endregion
@@ -217,12 +295,8 @@
historyDataView.AddChidren(myEchartsView_Line);
//EnergyRow(energy, energyListView, index);
- new System.Threading.Thread(() =>
- {
- Control.Ins.SendReadCommand(device);
- })
- { IsBackground = true }.Start();
+ LoadMothed_GetHistoryData();
}
@@ -251,27 +325,60 @@
});
var sensorType = device.spk.Split(".")[1];
- var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, device.deviceId, "total_electricity");
+ var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, device.deviceId, "power_a");
if (revertObj != null)
{
if (revertObj.Code == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<EnvironmentalSensorHistor>>(revertObj.Data.ToString());
-
- List<string> vs = new List<string>();
- if (brokenLine.YvalueText == "")
- {
- foreach (var data in revertData)
+ if (revertData == null || revertData.Count == 0) {
+#if DEBUG
+ List<string> vs = new List<string>() {
+ "813","313","213","123",
+ "113","213","183","133",
+ "133","513","133","413",
+ };
+ brokenLine.InitXdataText(vs);
+ revertData = new List<EnvironmentalSensorHistor>()
{
- vs.Add(data.fieldName);
+ new EnvironmentalSensorHistor{ fieldValue = "100"},
+ new EnvironmentalSensorHistor{ fieldValue = "200"},
+ new EnvironmentalSensorHistor{ fieldValue = "300"},
+ new EnvironmentalSensorHistor{ fieldValue = "400"},
+ new EnvironmentalSensorHistor{ fieldValue = "500"},
+ new EnvironmentalSensorHistor{ fieldValue = "400"},
+ new EnvironmentalSensorHistor{ fieldValue = "100"},
+ new EnvironmentalSensorHistor{ fieldValue = "200"},
+ new EnvironmentalSensorHistor{ fieldValue = "300"},
+ new EnvironmentalSensorHistor{ fieldValue = "400"},
+ new EnvironmentalSensorHistor{ fieldValue = "500"},
+ new EnvironmentalSensorHistor{ fieldValue = "400"},
+ };
+ if (device.GetAttribute("ydata") == null)
+ {
+ device.attributes.Add(new FunctionAttributes() { key = "ydata" });
}
- brokenLine.InitXdataText(vs);
+ device.SetAttrState("ydata", brokenLine.InitYdataText(device.name, revertData, "#5C62FE") + ", ");
+
+#endif
}
- if (device.GetAttribute("ydata") == null)
+ else
{
- device.attributes.Add(new FunctionAttributes() { key = "ydata" });
+ List<string> vs = new List<string>();
+ if (brokenLine.YvalueText == "")
+ {
+ foreach (var data in revertData)
+ {
+ vs.Add(data.fieldName);
+ }
+ brokenLine.InitXdataText(vs);
+ }
+ if (device.GetAttribute("ydata") == null)
+ {
+ device.attributes.Add(new FunctionAttributes() { key = "ydata" });
+ }
+ device.SetAttrState("ydata", brokenLine.InitYdataText(device.name, revertData, "#5C62FE") + ", ");
}
- device.SetAttrState("ydata", brokenLine.InitYdataText(device.name, revertData, device.GetAttrState("color")) + ",");
}
}
brokenLine.yTitle = Language.StringByID(StringId.EnergyConsumption) + "(kW)";
@@ -280,7 +387,7 @@
{
brokenLine.xTitle = Language.StringByID(StringId.Date);
}
- var opString = brokenLine.InitOption();
+ var opString = brokenLine.InitOption(30);
Application.RunOnMainThread(() =>
{
--
Gitblit v1.8.0