From a7885a24a152a164d7e26b12098ab92a0e272f24 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 18 十一月 2021 13:13:31 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr6
---
HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
index 661dbcd..0e7d6c0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
@@ -129,31 +129,31 @@
{
case StringId.wendugaoyu:
{
- keyValue = "outdoor_temp";
+ keyValue = "temperature";
comparator = ">";
}
break;
case StringId.wendudiyu:
{
- keyValue = "outdoor_temp";
+ keyValue = "temperature";
comparator = "<";
}
break;
case StringId.shidugaoyu:
{
- keyValue = "outdoor_humity";
+ keyValue = "humidity";
comparator = ">";
}
break;
case StringId.shidudiyu:
{
- keyValue = "outdoor_humity";
+ keyValue = "humidity";
comparator = "<";
}
break;
}
- AddDic(keyValue, comparator, value);
+ AddDic(keyValue, comparator, value,"float");
});
}
/// <summary>
@@ -169,24 +169,24 @@
, (text) =>
{
var value= pmView.GetValue("pm25", text);
- AddDic("pm2.5", "in", value);
+ AddDic("pm25", "in", value, "integer");
});
}
/// <summary>
/// 灏佽鏁版嵁
/// </summary>
- /// <param name="keyValue">绫诲瀷鍊�(pm2.5锛沷utdoor_temp锛沷utdoor_humity)</param>
+ /// <param name="keyValue">绫诲瀷鍊�(pm25锛泃emperature锛沨umidity)</param>
/// <param name="comparator">姣旇緝鍏崇郴</param>
/// <param name="value">鍊�</param>
- private void AddDic(string keyValue, string comparator, string value)
+ public void AddDic(string keyValue, string comparator,string value,string data_type)
{
Input input = new Input();
input.sid = LogicMethod.CurrLogicMethod.NewSid();
- input.condition_type = "4";
+ input.condition_type = "6";
Dictionary<string, string> dic = new Dictionary<string, string>();
LogicMethod.CurrLogicMethod.dictionary(dic, "key", keyValue);
LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", comparator);
- LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "float");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", data_type);
LogicMethod.CurrLogicMethod.dictionary(dic, "value", value);
input.condition.Add(dic);
AddCondition(input, keyValue, comparator);
@@ -204,7 +204,7 @@
for (var i = 0; i < Logic.currlogic.input.Count; i++)
{
var condition_type = Logic.currlogic.input[i].condition_type;
- if (condition_type == "4")
+ if (condition_type == "6")
{
var dicList = Logic.currlogic.input[i].condition;
if (ExistKey(dicList, keyValue, comparator))
--
Gitblit v1.8.0