From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 190ce80..c888bc1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -244,7 +244,7 @@
{
string value = dic["value"];
- if (value == "true")
+ if (value == "open")
{
inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
@@ -295,6 +295,22 @@
}
inputView.btnState.Text = str;
+ }
+ break;
+ case SPK.SenesorMegahealth:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "fall")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.diedao);
+ }
+ else
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.wuren);
+ }
+ }
}
break;
@@ -387,6 +403,40 @@
}
inputView.btnText.TextID = StringId.tianqibianhua;
+ inputView.btnState.Text = strtext;
+ }
+ }
+ break;
+ case "9":
+ {
+ inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
+ foreach (var dic in dicList)
+ {
+ string strtext = "";
+ string value = dic["value"];
+ switch (value)
+ {
+ case "excellent":
+ {
+ strtext = Language.StringByID(StringId.kongqiyou);
+
+ }
+ break;
+ case "good":
+ {
+
+ strtext = Language.StringByID(StringId.kongqiliang);
+
+ }
+ break;
+ case "poor":
+ {
+ strtext = Language.StringByID(StringId.kongqicha);
+ }
+ break;
+
+ }
+ inputView.btnText.TextID = StringId.kongqizhiliang;
inputView.btnState.Text = strtext;
}
}
@@ -546,6 +596,15 @@
WeatherCondition weatherCondition = new WeatherCondition();
MainPage.BasePageView.AddChidren(weatherCondition);
weatherCondition.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ break;
+ case "9":
+ {
+
+ AirQuality airQuality = new AirQuality();
+ MainPage.BasePageView.AddChidren(airQuality);
+ airQuality.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
break;
@@ -883,7 +942,7 @@
break;
case "3":
{
- targetView.btnIcon.UnSelectedImagePath = "LogicIcon/delayed.png";
+ targetView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
foreach (var dic in dicList)
{
string value = dic["value"];
@@ -1278,7 +1337,7 @@
foreach (var dic in dicList)
{
string value = dic["value"];
- if (value == "true")
+ if (value == "open")
{
button1.Text = Language.StringByID(StringId.kaiqi);
}
@@ -1328,6 +1387,22 @@
}
}
break;
+ case SPK.SenesorMegahealth:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "fall")
+ {
+ button1.Text = Language.StringByID(StringId.diedao);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.wuren);
+ }
+ }
+ }
+ break;
}
}
/// <summary>
--
Gitblit v1.8.0