From 0816a06ec79ad93d3a95a8102b4cdc88e46ded3a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 31 七月 2023 15:18:02 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr-2.1
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs
index 130e809..d47db5a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs
@@ -87,13 +87,13 @@
Button btnRighta = new Button()
{
- X = Application.GetRealWidth(221),
+ X = Application.GetRealWidth(201),
Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(116),
TextAlignment = TextAlignment.CenterRight,
TextColor = 0xFF768194,
TextSize = CSS_FontSize.TextFontSize,
- Text = "---V",
+ Text = "--- V",
};
viewa.AddChidren(btnRighta);
@@ -128,13 +128,13 @@
Button btnRightb = new Button()
{
- X = Application.GetRealWidth(221),
+ X = Application.GetRealWidth(201),
Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(116),
TextAlignment = TextAlignment.CenterRight,
TextColor = 0xFF768194,
TextSize = CSS_FontSize.TextFontSize,
- Text = "---A",
+ Text = "--- A",
};
viewb.AddChidren(btnRightb);
@@ -169,13 +169,13 @@
Button btnRightc = new Button()
{
- X = Application.GetRealWidth(221),
+ X = Application.GetRealWidth(201),
Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(116),
TextAlignment = TextAlignment.CenterRight,
TextColor = 0xFF768194,
TextSize = CSS_FontSize.TextFontSize,
- Text = "---W",
+ Text = "--- W",
};
viewc.AddChidren(btnRightc);
@@ -446,7 +446,18 @@
};
historyDataView.AddChidren(myEchartsView_Line);
- //EnergyRow(energy, energyListView, index);
+ var btnTip = new Button()
+ {
+ Y = Application.GetRealHeight(289),
+ Height = Application.GetRealHeight(41),
+ Width = Application.GetRealWidth(300),
+ TextAlignment = TextAlignment.Center,
+ Gravity = Gravity.CenterHorizontal,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextID = StringId.AirSwitchP3HistroyTip1,
+ };
+ historyDataView.AddChidren(btnTip);
LoadMothed_GetHistoryData();
@@ -485,9 +496,10 @@
TextSize = 49,
TextColor = 0xFF030D1C,
TextAlignment = TextAlignment.Center,
- Text = device.GetAttrState(FunctionAttributeKey.TotalElectricity),
+ Text = device.GetAttrState(key),
};
totalElectricityView.AddChidren(btnTotalNumber);
+
btnShowHistroyData_Day.MouseUpEventHandler += (sender, e) => {
totalElectricityView.RemoveFromParent();
@@ -495,6 +507,7 @@
//viewa.Visible = true;
//viewb.Visible = true;
//viewc.Visible = true;
+ btnTip.TextID = StringId.AirSwitchP3HistroyTip1;
historyDataView.Height = Application.GetRealHeight(330);
};
btnShowHistroyData_Month.MouseUpEventHandler += (sender, e) => {
@@ -503,6 +516,7 @@
//viewa.Visible = true;
//viewb.Visible = true;
//viewc.Visible = true;
+ btnTip.TextID = StringId.AirSwitchP3HistroyTip2;
historyDataView.Height = Application.GetRealHeight(330);
};
btnShowHistroyData_Year.MouseUpEventHandler += (sender, e) => {
@@ -511,6 +525,7 @@
//viewa.Visible = true;
//viewb.Visible = true;
//viewc.Visible = true;
+ btnTip.TextID = StringId.AirSwitchP3HistroyTip3;
historyDataView.Height = Application.GetRealHeight(330);
};
btnShowHistroyData_Total.MouseUpEventHandler += (sender, e) => {
--
Gitblit v1.8.0