From 9c4967cd8843ac7ed65ee64195bcf69c592c4a20 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 07 六月 2023 15:57:36 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into Dev-Wxr-1.8.1
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 6835fc1..9543bc9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -19,6 +19,10 @@
{
return;
}
+ if (updateTemp.sid != bodyView.function.sid)
+ {
+ return;
+ }
var outinTemp = Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", ".")));
bodyView.btnTemp.Text = outinTemp.ToString();
//bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "掳C";
@@ -198,6 +202,14 @@
{
function.SetAttrState(FunctionAttributeKey.SetTemp, e);
btnTemp.Text = Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", ".")).ToString();
+ if (btnTemp.Text.Length > 2)
+ {
+ btnTemp.TextSize = 44;
+ }
+ else
+ {
+ btnTemp.TextSize = 56;
+ }
};
}
/// <summary>
--
Gitblit v1.8.0