From fd0bbcd6e475754d88cedb798000ebeb375d07e4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 19 七月 2023 11:18:48 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-1.9
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index 04f939c..3eb5f49 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -205,11 +205,19 @@
TextAlignment = TextAlignment.Center,
};
controlView.AddChidren(btnTemp);
+ if (btnTemp.Text.Length > 2)
+ {
+ btnTemp.TextSize = 44;
+ }
+ else
+ {
+ btnTemp.TextSize = 56;
+ }
btnTempUint = new Button()
{
X = btnTemp.Right,
- Y = btnTemp.Y,
+ Y = btnTemp.Y+ Application.GetRealHeight(5),
Width = Application.GetRealWidth(30),
Height = Application.GetRealWidth(25),
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -226,11 +234,12 @@
Y = btnTemp.Bottom+ Application.GetRealWidth(10),
Width = Application.GetRealWidth(100),
Height = Application.GetRealHeight(20),
- Text = Language.StringByID(StringId.IndoorTemp) + "20掳C",
+ Text = Language.StringByID(StringId.IndoorTempOutdoorTemp).Replace("{1}",function.GetAttrState(FunctionAttributeKey.IndoorTemp)).Replace("{0}",MainPage.cityInfo.temperature),
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
};
controlView.AddChidren(btnIndoorTemp);
+
btnMinus = new Button()
{
--
Gitblit v1.8.0