From a3dfbcd5218270f9a75e6e32807b08215270b657 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 11:48:23 +0800
Subject: [PATCH] Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs
index f8b7a85..db3e0fe 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs
@@ -11,7 +11,7 @@
/// <param name="frameLayout">寮圭獥鐖舵帶浠�</param>
/// <param name="stateValue">涔嬪墠鐘舵�佸��</param>
/// <param name="action">杩斿洖缁撴灉</param>
- public void FLayoutView(FrameLayout frameLayout, string stateValue, Action<string> action,int min,int max,string unit)
+ public void FLayoutView(FrameLayout frameLayout, string stateValue, Action<string> action,int min,int max,string unit, string setTempAttr)
{
FrameLayout frame = new FrameLayout
{
@@ -32,7 +32,10 @@
{
//娣诲姞鏁版嵁
temperatureList.Add(i.ToString() + unit);
- temperatureList.Add((i + 0.5).ToString() + unit);
+ if (setTempAttr == "0.5")
+ {
+ temperatureList.Add((i + 0.5).ToString() + unit);
+ }
}
//鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
view.mUIPickerView.setNPicker(temperatureList, null, null);
--
Gitblit v1.8.0