From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 1b41b53..536cc06 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -253,12 +253,12 @@
}
/// <summary>
- ///
+ /// 瓒呭嚭5涓厓绱犺鐢ㄦ粦鍔ㄦ帶浠�
/// </summary>
/// <param name="frame">鏄剧ず鍦ㄥ摢涓晫闈㈢殑鐖舵帶浠�</param>
/// <param name="list">鏄剧ず鏁版嵁婧�</param>
/// <param name="titleText">鏍囬</param>
- /// <param name="action">杩斿洖鍊�</param>
+ /// <param name="action">杩斿洖鍊肩储寮曞��</param>
public void FrameOrVv(FrameLayout frame, List<string>list, int titleText,Action<int> action) {
int line = 0;
@@ -379,6 +379,7 @@
{
return;
}
+ //鍒楄〃绱㈠紩鍊�
int indexValue = int.Parse(checkBtn.Tag.ToString());
action(indexValue);
//绉婚櫎fLayout鐣岄潰
@@ -447,6 +448,28 @@
list = new List<string> {
Language.StringByID(StringId.andCondition),
Language.StringByID(StringId.orCondition),
+ };
+ }
+ break;
+ case "time":
+ {
+ list = new List<string> {
+ "30 s",
+ "1 min",
+ "2 min",
+ "3 min",
+ "5 min",
+ };
+ }
+ break;
+ case "pm2.5":
+ {
+ list = new List<string> {
+ Language.StringByID(StringId.pmyou),
+ Language.StringByID(StringId.pmliang),
+ Language.StringByID(StringId.pmqingdu),
+ Language.StringByID(StringId.pmzhongdu),
+ Language.StringByID(StringId.pmzhongduwuran),
};
}
break;
@@ -624,5 +647,7 @@
return stateList;
}
+
+
}
}
--
Gitblit v1.8.0