From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs | 95 ++++++++++-------------------------------------
1 files changed, 20 insertions(+), 75 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
index 8d7f8e3..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>
@@ -164,50 +164,30 @@
public void PmAction(FrameLayout frame, string stateValue = "")
{
PublicInterface pmView = new PublicInterface();
- var pmListStr = pmView.GetViewList("pm2.5");
- pmView.SingleSelectionShow(frame, pmListStr, Language.StringByID(StringId.PM25), GetString(stateValue)
+ var pmListStr = pmView.GetViewList("pm25");
+ pmView.SingleSelectionShow(frame, pmListStr, Language.StringByID(StringId.PM25), pmView.GetString("pm25", stateValue)
, (text) =>
{
- string value = "";
- if (text == Language.StringByID(StringId.pmyou))
- {
- value = "10";
- }
- else if (text == Language.StringByID(StringId.pmliang))
- {
- value = "50";
- }
- else if (text == Language.StringByID(StringId.pmqingdu))
- {
- value = "90";
- }
- else if (text == Language.StringByID(StringId.pmzhongdu))
- {
- value = "130";
- }
- else if (text == Language.StringByID(StringId.pmzhongduwuran))
- {
- value = "170";
- }
- AddDic("pm2.5", "=", value);
+ var value= pmView.GetValue("pm25", text);
+ 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.NewSid();
- input.condition_type = "4";
+ input.sid = LogicMethod.CurrLogicMethod.NewSid();
+ input.condition_type = "6";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", keyValue);
- LogicMethod.dictionary(dic, "comparator", comparator);
- LogicMethod.dictionary(dic, "data_type", "float");
- LogicMethod.dictionary(dic, "value", value);
+ LogicMethod.CurrLogicMethod.dictionary(dic, "key", keyValue);
+ LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", comparator);
+ LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", data_type);
+ LogicMethod.CurrLogicMethod.dictionary(dic, "value", value);
input.condition.Add(dic);
AddCondition(input, keyValue, comparator);
}
@@ -224,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))
@@ -247,7 +227,7 @@
Logic.currlogic.input.Add(input);
}
- LogicMethod.RemoveAllView();
+ LogicMethod.CurrLogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
@@ -277,41 +257,6 @@
return false;
}
- /// <summary>
- /// 鏁板�艰繑鍥炴枃鏈�
- /// </summary>
- /// <param name="strValue">鍊�</param>
- /// <returns></returns>
- public string GetString(string strValue)
- {
- string text = "";
- int intValue = 0;
- if (strValue != "")
- {
- intValue = int.Parse(strValue);
- }
- if (intValue > 0 && intValue < 35)
- {
- text = Language.StringByID(StringId.pmyou);
- }
- else if (intValue > 35 && intValue < 75)
- {
- text = Language.StringByID(StringId.pmliang);
- }
- else if (intValue > 75 && intValue < 115)
- {
- text = Language.StringByID(StringId.pmqingdu);
- }
- else if (intValue > 115 && intValue < 150)
- {
- text = Language.StringByID(StringId.pmzhongdu);
- }
- else if (intValue > 150)
- {
- text = Language.StringByID(StringId.pmzhongduwuran);
- }
-
- return text;
- }
+
}
}
--
Gitblit v1.8.0