From 561052e04a4bde86e963c89e10f7614df38fd002 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 04 九月 2024 10:58:21 +0800
Subject: [PATCH] 地暖面板，新增SPK
---
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
index d0e3e9c..382e769 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
@@ -145,16 +145,17 @@
#if __IOS__
pvGenerate_TodayValuesButton.TextAlignment = TextAlignment.TopLeft;
- pvGenerate_TodayValuesButton.Width = pvGenerate_TodayValuesButton.GetTextWidth() + Application.GetRealWidth(8);
+ pvGenerate_TodayValuesButton.Width = pvGenerate_TodayValuesButton.GetTextWidth() + Application.GetRealWidth(4);
#else
pvGenerate_TodayValuesButton.TextAlignment = TextAlignment.BottomLeft;
- pvGenerate_TodayValuesButton.Width = pvGenerate_TodayValuesButton.GetTextWidth();
+ pvGenerate_TodayValuesButton.Y = Application.GetRealWidth(37);
+ pvGenerate_TodayValuesButton.Width = pvGenerate_TodayValuesButton.GetTextWidth() + Application.GetRealWidth(4);
#endif
pvGenerate_todayUintButton = new Button()
{
- Y = Application.GetRealWidth(41),
+ Y = Application.GetRealWidth(43),
Height = Application.GetRealWidth(17),
- Text = "kwh",
+ Text = "kw",
TextColor = CSS_Color.MainBackgroundColor,
TextSize = 12,
TextAlignment = TextAlignment.CenterLeft,
@@ -215,9 +216,9 @@
var loadEle_TodayUintButton = new Button()
{
- Y = Application.GetRealWidth(41),
+ Y = Application.GetRealWidth(43),
Height = Application.GetRealWidth(17),
- Text = "kwh",
+ Text = "kw",
TextColor = CSS_Color.MainBackgroundColor,
TextSize = 12,
TextAlignment = TextAlignment.CenterRight,
@@ -242,6 +243,11 @@
TextAlignment = TextAlignment.TopRight,
IsBold = true,
};
+#if __IOS__
+#else
+ pvLoad_TodayValuesButton.Y = Application.GetRealWidth(37);
+ pvLoad_TodayValuesButton.X = Application.GetRealWidth(81 - 16) - loadEle_TodayUintButton.Width;
+#endif
loadEleView.AddChidren(pvLoad_TodayValuesButton);
pvLoad_TotalValuesButton = new Button()
@@ -395,7 +401,7 @@
Y = Application.GetRealWidth(220),
Width = Application.GetRealWidth(100),
Height = Application.GetRealWidth(17),
- Text = "浠婃棩鍙戠數閲� (kwh)",
+ Text = "浠婃棩鍙戠數閲� (kw)",
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = 12,
@@ -424,7 +430,7 @@
Y = Application.GetRealWidth(220),
Width = Application.GetRealWidth(100),
Height = Application.GetRealWidth(17),
- Text = "鏈湀鍙戠數閲� (kwh)",
+ Text = "鏈湀鍙戠數閲� (kw)",
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = 12,
@@ -453,7 +459,7 @@
Y = Application.GetRealWidth(220),
Width = Application.GetRealWidth(100),
Height = Application.GetRealWidth(17),
- Text = "绱鍙戠數閲� (kwh)",
+ Text = "绱鍙戠數閲� (kw)",
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = 12,
@@ -538,7 +544,7 @@
Y = Application.GetRealWidth(220),
Width = Application.GetRealWidth(100),
Height = Application.GetRealWidth(17),
- Text = "浠婃棩鐢ㄧ數閲� (kwh)",
+ Text = "浠婃棩鐢ㄧ數閲� (kw)",
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = 12,
@@ -566,7 +572,7 @@
Y = Application.GetRealWidth(220),
Width = Application.GetRealWidth(100),
Height = Application.GetRealWidth(17),
- Text = "鏈湀鐢ㄧ數閲� (kwh)",
+ Text = "鏈湀鐢ㄧ數閲� (kw)",
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = 12,
@@ -594,7 +600,7 @@
Y = Application.GetRealWidth(220),
Width = Application.GetRealWidth(100),
Height = Application.GetRealWidth(17),
- Text = "绱鐢ㄧ數閲� (kwh)",
+ Text = "鏈勾鐢ㄧ數閲� (kw)",
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = 12,
@@ -698,8 +704,8 @@
var esRunStatus_ValuesInfoView = new FrameLayout()
{
- Width = Application.GetRealWidth(263),
- Height = Application.GetRealWidth(134),
+ Width = Application.GetRealWidth(282),
+ Height = Application.GetRealWidth(153),
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealWidth(40),
BackgroundImagePath = "FunctionIcon/Acst/Inverter/EnergyStorageStatusBg.png",
@@ -709,7 +715,7 @@
#region 瀹炴椂鍏呯數鍔熺巼
var esRunStatus_ChargeValuesView = new FrameLayout()
{
- X = Application.GetRealWidth(2),
+ X = Application.GetRealWidth(15),
Width = Application.GetRealWidth(128),
Height = Application.GetRealWidth(128),
};
@@ -743,7 +749,7 @@
#region 瀹炴椂鏀剧數鍔熺巼
var esRunStatus_DischargeValuesView = new FrameLayout()
{
- X = Application.GetRealWidth(132),
+ X = Application.GetRealWidth(132+13),
Width = Application.GetRealWidth(128),
Height = Application.GetRealWidth(128),
};
@@ -838,11 +844,7 @@
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
};
-#if __IOS__
socialContribution_Info1_ValuesButton.Width = socialContribution_Info1_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
-#else
- socialContribution_Info1_ValuesButton.Width = socialContribution_Info1_ValuesButton.GetTextWidth();
-#endif
socialContribution_InfoView_1.AddChidren(socialContribution_Info1_ValuesButton);
var socialContribution_Info1_UintButton = new Button()
@@ -908,11 +910,7 @@
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
};
-#if __IOS__
socialContribution_Info2_ValuesButton.Width = socialContribution_Info2_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
-#else
- socialContribution_Info2_ValuesButton.Width = socialContribution_Info2_ValuesButton.GetTextWidth();
-#endif
socialContribution_InfoView_2.AddChidren(socialContribution_Info2_ValuesButton);
var socialContribution_Info2_UintButton = new Button()
@@ -978,11 +976,7 @@
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
};
-#if __IOS__
socialContribution_Info3_ValuesButton.Width = socialContribution_Info3_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
-#else
- socialContribution_Info3_ValuesButton.Width = socialContribution_Info3_ValuesButton.GetTextWidth();
-#endif
socialContribution_InfoView_3.AddChidren(socialContribution_Info3_ValuesButton);
var socialContribution_Info3_UintButton = new Button()
--
Gitblit v1.8.0