From 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 28 十月 2024 11:58:31 +0800
Subject: [PATCH] 谷歌版本问题修复
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index 5608ce8..ea84682 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -84,6 +84,15 @@
public FloorHeatingPage(Function func)
{
bodyView = this;
+ var tempAttr = func.GetAttribute(FunctionAttributeKey.SetTemp);
+ if (tempAttr != null)
+ {
+ if(tempAttr.min == 0 && tempAttr.max == 0)
+ {
+ tempAttr.min = 16;
+ tempAttr.max = 30;
+ }
+ }
function = func;
}
@@ -97,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",
@@ -188,7 +197,7 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(200),
Width = Application.GetRealWidth(80),
- Height = Application.GetRealWidth(60),
+ Height = Application.GetRealWidth(65),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 56,
IsBold = true,
@@ -196,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,
@@ -217,12 +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()
{
X = Application.GetRealWidth(21),
--
Gitblit v1.8.0