From 0f66b9ebc18398af6f7e2c2b411f65c84fe718fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 31 七月 2023 22:53:59 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr-2.1
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs
index b9cfbc3..dcc70c0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs
@@ -488,6 +488,9 @@
};
totalElectricityView.AddChidren(btnTotalElectricity);
+
+ double totalNumber = 0.00;
+ double.TryParse(device.GetAttrState(key), out totalNumber);
var btnTotalNumber = new Button()
{
Y = Application.GetRealHeight(27),
@@ -496,9 +499,10 @@
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();
@@ -506,7 +510,8 @@
//viewa.Visible = true;
//viewb.Visible = true;
//viewc.Visible = true;
- historyDataView.Height = Application.GetRealHeight(330);
+ btnTip.TextID = StringId.AirSwitchP3HistroyTip1;
+ historyDataView.Height = Application.GetRealWidth(330);
};
btnShowHistroyData_Month.MouseUpEventHandler += (sender, e) => {
totalElectricityView.RemoveFromParent();
@@ -514,7 +519,8 @@
//viewa.Visible = true;
//viewb.Visible = true;
//viewc.Visible = true;
- historyDataView.Height = Application.GetRealHeight(330);
+ btnTip.TextID = StringId.AirSwitchP3HistroyTip2;
+ historyDataView.Height = Application.GetRealWidth(330);
};
btnShowHistroyData_Year.MouseUpEventHandler += (sender, e) => {
totalElectricityView.RemoveFromParent();
@@ -522,7 +528,8 @@
//viewa.Visible = true;
//viewb.Visible = true;
//viewc.Visible = true;
- historyDataView.Height = Application.GetRealHeight(330);
+ btnTip.TextID = StringId.AirSwitchP3HistroyTip3;
+ historyDataView.Height = Application.GetRealWidth(330);
};
btnShowHistroyData_Total.MouseUpEventHandler += (sender, e) => {
myEchartsView_Line.RemoveFromParent();
--
Gitblit v1.8.0