From 1789f33db1b549f0211258d828c551cc33c7c407 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 03 八月 2023 15:46:18 +0800
Subject: [PATCH] cct控制组件高度
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs | 83 +++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
index 359e656..c08e442 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
@@ -319,7 +319,7 @@
var btnTip = new Button()
{
- Y = Application.GetRealHeight(289),
+ Y = Application.GetRealWidth(289),
Height = Application.GetRealHeight(41),
Width = Application.GetRealWidth(300),
TextAlignment = TextAlignment.Center,
@@ -452,19 +452,21 @@
btnTitlea.MouseUpEventHandler = (sender, e) => {
var skipView = new AirSwitchP3SubloopEnergyPage(device,FunctionAttributeKey.ElectricityA);
MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage();
+ skipView.LoadPage(StringId.RealTimeElectricityConsumptionDataOfPhaseA);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- btnTitlea.MouseUpEventHandler = (sender, e) => {
+
+ btnTitleb.MouseUpEventHandler = (sender, e) => {
var skipView = new AirSwitchP3SubloopEnergyPage(device, FunctionAttributeKey.ElectricityB);
MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage();
+ skipView.LoadPage(StringId.RealTimeElectricityConsumptionDataOfPhaseB);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- btnTitlea.MouseUpEventHandler = (sender, e) => {
+
+ btnTitlec.MouseUpEventHandler = (sender, e) => {
var skipView = new AirSwitchP3SubloopEnergyPage(device, FunctionAttributeKey.ElectricityC);
MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage();
+ skipView.LoadPage(StringId.RealTimeElectricityConsumptionDataOfPhaseC);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
@@ -493,6 +495,9 @@
};
totalElectricityView.AddChidren(btnTotalElectricity);
+
+ double totalNumber = 0.00;
+ double.TryParse(device.GetAttrState(FunctionAttributeKey.TotalElectricity), out totalNumber);
var btnTotalNumber = new Button()
{
Y = Application.GetRealHeight(27),
@@ -501,43 +506,43 @@
TextSize = 49,
TextColor = 0xFF030D1C,
TextAlignment = TextAlignment.Center,
- Text = device.GetAttrState(FunctionAttributeKey.TotalElectricity),
+ Text = totalNumber.ToString("F2"),
};
totalElectricityView.AddChidren(btnTotalNumber);
btnShowHistroyData_Day.MouseUpEventHandler += (sender, e) => {
totalElectricityView.RemoveFromParent();
historyDataView.AddChidren(myEchartsView_Line);
- viewa.Visible = true;
- viewb.Visible = true;
- viewc.Visible = true;
+ //viewa.Visible = true;
+ //viewb.Visible = true;
+ //viewc.Visible = true;
btnTip.TextID = StringId.AirSwitchP3HistroyTip1;
- historyDataView.Height = Application.GetRealHeight(330);
+ historyDataView.Height = Application.GetRealWidth(330);
};
btnShowHistroyData_Month.MouseUpEventHandler += (sender, e) => {
totalElectricityView.RemoveFromParent();
historyDataView.AddChidren(myEchartsView_Line);
- viewa.Visible = true;
- viewb.Visible = true;
- viewc.Visible = true;
+ //viewa.Visible = true;
+ //viewb.Visible = true;
+ //viewc.Visible = true;
btnTip.TextID = StringId.AirSwitchP3HistroyTip2;
- historyDataView.Height = Application.GetRealHeight(330);
+ historyDataView.Height = Application.GetRealWidth(330);
};
btnShowHistroyData_Year.MouseUpEventHandler += (sender, e) => {
totalElectricityView.RemoveFromParent();
historyDataView.AddChidren(myEchartsView_Line);
- viewa.Visible = false;
- viewb.Visible = false;
- viewc.Visible = false;
+ //viewa.Visible = false;
+ //viewb.Visible = false;
+ //viewc.Visible = false;
btnTip.TextID = StringId.AirSwitchP3HistroyTip3;
- historyDataView.Height = Application.GetRealHeight(330);
+ historyDataView.Height = Application.GetRealWidth(330);
};
btnShowHistroyData_Total.MouseUpEventHandler += (sender, e) => {
myEchartsView_Line.RemoveFromParent();
historyDataView.AddChidren(totalElectricityView);
- viewa.Visible = false;
- viewb.Visible = false;
- viewc.Visible = false;
+ //viewa.Visible = false;
+ //viewb.Visible = false;
+ //viewc.Visible = false;
historyDataView.Height = Application.GetRealHeight(184);
};
@@ -576,37 +581,25 @@
});
var sensorType = device.spk.Split(".")[1];
- var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, device.deviceId, "power_a");
+ var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, device.deviceId, FunctionAttributeKey.TotalElectricity);
if (revertObj != null)
{
if (revertObj.Code == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<EnvironmentalSensorHistor>>(revertObj.Data.ToString());
- if (revertData == null || revertData.Count == 0) {
#if DEBUG
+ if (revertData == null || revertData.Count == 0) {
List<string> vs = new List<string>() {
- "813","313","213","123",
- "113","213","183","133",
- "133","513","133","413",
- "813","313","213","123",
- "113","213","183","133",
- "133","513","133","413",
+ "1","2","3","4",
+ "5","6","7","8",
+ "9","10","11","12",
+ //"13","14","15","16",
+ //"17","18","19","20",
+ //"21","22","23","24",
};
brokenLine.InitXdataText(vs);
revertData = new List<EnvironmentalSensorHistor>()
{
- 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"},
new EnvironmentalSensorHistor{ fieldValue = "100"},
new EnvironmentalSensorHistor{ fieldValue = "200"},
new EnvironmentalSensorHistor{ fieldValue = "300"},
@@ -626,9 +619,9 @@
}
device.SetAttrState("ydata", brokenLine.InitYdataText2(device.name, revertData, "#5C62FE", curQueryType == "year_month") + ", ");
+ }
+ else
#endif
- }
- else
{
List<string> vs = new List<string>();
if (brokenLine.YvalueText == "")
@@ -654,7 +647,7 @@
brokenLine.xTitle = Language.StringByID(StringId.Date);
}
- var opString = brokenLine.InitOption(50, curQueryType == "year_month");
+ var opString = brokenLine.InitOption(100, curQueryType == "year_month");
Application.RunOnMainThread(() =>
{
myEchartsView_Line.ShowWithOption(opString);
--
Gitblit v1.8.0