From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期五, 27 九月 2024 14:01:19 +0800 Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google --- HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs index a7e40b8..297105a 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs @@ -92,7 +92,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", @@ -204,6 +204,10 @@ Text = "掳C", }; controlView.AddChidren(btnTempUint); + if (function.GetAttribute(FunctionAttributeKey.TempType) != null) + { + btnTempUint.Text = function.GetAttrState(FunctionAttributeKey.TempType); + } btnIndoorTemp = new Button() { -- Gitblit v1.8.0