From dd922032a3301ae960f4968eaf33ca14768c0ed1 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 11:42:03 +0800
Subject: [PATCH] V2.6.0金茂热水器，金茂光伏测试通过的版本
---
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
index b5397a1..02bbf02 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
@@ -29,6 +29,10 @@
/// </summary>
Button pvLoad_TodayValuesButton;
/// <summary>
+ /// 浠婃棩鐢ㄧ數閲忓崟浣嶆寜閽�
+ /// </summary>
+ Button loadEle_TodayUintButton;
+ /// <summary>
/// 绱鐢ㄧ數閲忔暟鎹寜閽�
/// </summary>
Button pvLoad_TotalValuesButton;
@@ -272,7 +276,7 @@
loadEleView.AddChidren(loadEle_TodayTextButton);
- var loadEle_TodayUintButton = new Button()
+ loadEle_TodayUintButton = new Button()
{
Y = Application.GetRealWidth(43),
Height = Application.GetRealWidth(17),
@@ -302,6 +306,8 @@
IsBold = true,
};
#if __IOS__
+ pvLoad_TodayValuesButton.Y = Application.GetRealWidth(34);
+ pvLoad_TodayValuesButton.X = Application.GetRealWidth(81 - 12) - loadEle_TodayUintButton.Width;
#else
pvLoad_TodayValuesButton.Y = Application.GetRealWidth(37);
pvLoad_TodayValuesButton.X = Application.GetRealWidth(81 - 16) - loadEle_TodayUintButton.Width;
@@ -1295,6 +1301,15 @@
private void upatePvGenerateTodayValues()
{
pvGenerate_TodayValuesButton.Text = pvGeneration_TodayValuesButton.Text = function.GetAttrState(InverterJinmao_AttrEnum.pv_electricity_today.ToString());
+
+#if __IOS__
+ pvGenerate_TodayValuesButton.TextAlignment = TextAlignment.TopLeft;
+ pvGenerate_TodayValuesButton.Width = pvGenerate_TodayValuesButton.GetTextWidth() + Application.GetRealWidth(8);
+#else
+ pvGenerate_TodayValuesButton.TextAlignment = TextAlignment.BottomLeft;
+ pvGenerate_TodayValuesButton.Y = Application.GetRealWidth(37);
+ pvGenerate_TodayValuesButton.Width = pvGenerate_TodayValuesButton.GetTextWidth() + Application.GetRealWidth(4);
+#endif
pvGenerate_todayUintButton.X = pvGenerate_TodayValuesButton.Right;
}
/// <summary>
@@ -1317,6 +1332,14 @@
private void upatePvLoadTodayValues()
{
pvLoad_TodayValuesButton.Text = powerUsage_TodayValuesButton.Text = function.GetAttrState(InverterJinmao_AttrEnum.load_electricity_today.ToString());
+
+#if __IOS__
+ pvLoad_TodayValuesButton.Y = Application.GetRealWidth(34);
+ pvLoad_TodayValuesButton.X = Application.GetRealWidth(81 - 12) - loadEle_TodayUintButton.Width;
+#else
+ pvLoad_TodayValuesButton.Y = Application.GetRealWidth(37);
+ pvLoad_TodayValuesButton.X = Application.GetRealWidth(81 - 16) - loadEle_TodayUintButton.Width;
+#endif
}
/// <summary>
/// 鏇存柊鏈湀鐢ㄧ數閲�
--
Gitblit v1.8.0