From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45

---
 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index 04f939c..4f8edc6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -106,7 +106,7 @@
             FrameLayout controlView = new FrameLayout()
             {
                 Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(88),
+                Y = Application.GetRealHeight(88 + 10),
                 Width = Application.GetRealWidth(327),
                 Height = Application.GetRealHeight(526),
                 BackgroundImagePath = "Public/Fragmentbg.png",
@@ -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