From 9523ea8fc874c27ad1369c076de59c00bbc5d470 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 15 十月 2024 16:06:11 +0800
Subject: [PATCH] 空调功能更新

---
 HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
index c4da2d5..fb7b707 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
@@ -143,7 +143,7 @@
             var contentView = new VerticalScrolViewLayout()
             {
                 Y = Application.GetRealHeight(74),
-                Height = Application.GetRealHeight(Application.DesignHeight - 74),
+                Height = Application.GetRealHeight(Application.DesignHeight)- Application.GetRealHeight(74),
             };
             bodyView.AddChidren(contentView);
 
@@ -202,6 +202,7 @@
                 TextColor = CSS_Color.MainBackgroundColor,
                 TextSize = 18,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             electricityGenerationView.AddChidren(pvGenerate_TodayValuesButton);
 
@@ -304,6 +305,7 @@
                 TextSize = 18,
                 TextAlignment = TextAlignment.TopRight,
                 IsBold = true,
+                FontName = "BEBAS",
             };
 #if __IOS__
             pvLoad_TodayValuesButton.Y = Application.GetRealWidth(34);
@@ -463,6 +465,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = 24,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             powerGenerationView.AddChidren(pvPower_ValuesButton);
 
@@ -492,6 +495,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = 18,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             pvEleGenerationInfoView.AddChidren(pvGeneration_TodayValuesButton);
 
@@ -521,6 +525,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = 18,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             pvEleGenerationInfoView.AddChidren(pvGeneration_MonthValuesButton);
 
@@ -550,6 +555,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = 18,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             pvEleGenerationInfoView.AddChidren(pvGeneration_YearValuesButton);
 
@@ -686,6 +692,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = 24,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             powerUsageView.AddChidren(loadElec_ValuesButton);
 
@@ -714,6 +721,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = 18,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             electricityUsageStatusView.AddChidren(powerUsage_TodayValuesButton);
 
@@ -741,6 +749,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = 18,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             electricityUsageStatusView.AddChidren(loadElec_MonthValuesButton);
 
@@ -769,6 +778,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = 18,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             electricityUsageStatusView.AddChidren(powerUsage_YearValuesButton);
 
@@ -953,6 +963,7 @@
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = 24,
                     IsBold = true,
+                FontName = "BEBAS",
                 };
                 esRunStatus_ChargeValuesView.AddChidren(esRunStatus_ChargeValuesButton);
 
@@ -987,6 +998,7 @@
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = 24,
                     IsBold = true,
+                FontName = "BEBAS",
                 };
                 esRunStatus_DischargeValuesView.AddChidren(esRunStatus_DischargeValuesButton);
 
@@ -1031,7 +1043,7 @@
             {
                 Gravity = Gravity.CenterHorizontal,
                 Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(142),
+                Height = Application.GetRealWidth(142),//142
                 ScrollEnabled = false,
             };
             contentView.AddChidren(socialContributionView);
@@ -1066,6 +1078,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextAlignment = TextAlignment.BottomLeft,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             socialContribution_Info1_ValuesButton.Width = socialContribution_Info1_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
             socialContribution_InfoView_1.AddChidren(socialContribution_Info1_ValuesButton);
@@ -1135,6 +1148,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextAlignment = TextAlignment.BottomLeft,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             socialContribution_Info2_ValuesButton.Width = socialContribution_Info2_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
             socialContribution_InfoView_2.AddChidren(socialContribution_Info2_ValuesButton);
@@ -1204,6 +1218,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextAlignment = TextAlignment.BottomLeft,
                 IsBold = true,
+                FontName = "BEBAS",
             };
             socialContribution_Info3_ValuesButton.Width = socialContribution_Info3_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
             socialContribution_InfoView_3.AddChidren(socialContribution_Info3_ValuesButton);

--
Gitblit v1.8.0