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/3-Intelligence/Automation/LogicView/TemperatureView.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 5dad653..f8b7a85 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)
+ public void FLayoutView(FrameLayout frameLayout, string stateValue, Action<string> action,int min,int max,string unit)
{
FrameLayout frame = new FrameLayout
{
@@ -28,18 +28,18 @@
};
//鍒濆鍖栧垪琛�
var temperatureList = new List<string>();
- for (int i = 16; i < 32; i++)
+ for (int i = min; i < max; i++)
{
//娣诲姞鏁版嵁
- temperatureList.Add(i.ToString() + "鈩�");
- temperatureList.Add((i + 0.5).ToString() + "鈩�");
+ temperatureList.Add(i.ToString() + unit);
+ temperatureList.Add((i + 0.5).ToString() + unit);
}
//鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
view.mUIPickerView.setNPicker(temperatureList, null, null);
//榛樿鍒濆閫変腑鐘舵��
view.mUIPickerView.setCurrentItems(9, 0, 0);
//瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏃堕棿
- string temperature = "25鈩�";
+ string temperature = "25"+ unit;
for (int i = 0; i < temperatureList.Count; i++)
{
if (temperatureList[i] == stateValue)
--
Gitblit v1.8.0