From 4a446825261d475ac1e9b8402fb956c1d26b9ffe Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 17 十一月 2021 17:54:08 +0800
Subject: [PATCH] 2021-11-17-01
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 208 ++++++++++++++++++++++++++--------------------------
1 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index cb26d92..f616e2c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -147,9 +147,11 @@
case SPK.CurtainRoller:
case SPK.CurtainTrietex:
//绌鸿皟
- case SPK.AcStandard:case SPK.HvacAC:
+ case SPK.AcStandard:
+ case SPK.HvacAC:
//鍦扮儹
- case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
+ case SPK.HvacFloorHeat:
+ case SPK.FloorHeatStandard:
//鏂伴
case SPK.AirFreshStandard:
case SPK.HvacAirFresh:
@@ -388,8 +390,8 @@
break;
case SPK.SensorTemperature:
{
-
- string str =new InpOrOutLogicMethod { }.GetText(dicList, "temperature");
+
+ string str = new InpOrOutLogicMethod { }.GetText(dicList, "temperature");
inputView.btnState.Text = str;
}
break;
@@ -431,8 +433,9 @@
}
}
break;
- case "4":
+ case "6":
{
+ //inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
string strtext = "";
string strvalue = "";
@@ -444,8 +447,9 @@
switch (key)
{
- case "outdoor_temp":
+ case "temperature":
{
+ //浜戠澶╂皵鏉′欢 鍩庡競娓╁害瑙﹀彂
strvalue = value + "鈩�";
if (comparator == ">")
{
@@ -458,8 +462,9 @@
}
break;
- case "outdoor_humity":
+ case "humidity":
{
+ //浜戠澶╂皵鏉′欢 鍩庡競婀垮害瑙﹀彂
strvalue = value + "%";
if (comparator == ">")
{
@@ -472,53 +477,74 @@
}
break;
- case "pm2.5":
+ case "pm25":
{
+ //浜戠澶╂皵鏉′欢 鍩庡競pm2.5瑙﹀彂
strtext = Language.StringByID(StringId.PM25);
strvalue = new PublicInterface { }.GetString("pm25", value);
}
break;
+ case "weather":
+ {
+ //浜戠澶╂皵鏉′欢 鍩庡競澶╂皵瑙﹀彂
+ strtext = Language.StringByID(StringId.tianqibianhua);
+ switch (value)
+ {
+ case "sunny":
+ {
+ strtext = Language.StringByID(StringId.clearday);
+ }
+ break;
+ case "cloudy":
+ {
+
+ strtext = Language.StringByID(StringId.cloudy);
+
+ }
+ break;
+ case "rainy":
+ {
+ strtext = Language.StringByID(StringId.rain);
+ }
+ break;
+
+ }
+ }
+ break;
+ case "airquality":
+ {
+ //浜戠澶╂皵鏉′欢 鍩庡競绌烘皵璐ㄩ噺
+ strtext = Language.StringByID(StringId.kongqizhiliang);
+ 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;
+ }
+ }
+ break;
}
}
inputView.btnText.Text = strtext;
inputView.btnState.Text = strvalue;
- }
- break;
- case "6":
- {
- inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
- foreach (var dic in dicList)
- {
- string strtext = "";
- string value = dic["value"];
- switch (value)
- {
- case "sunny":
- {
- strtext = Language.StringByID(StringId.clearday);
-
- }
- break;
- case "cloudy":
- {
-
- strtext = Language.StringByID(StringId.cloudy);
-
- }
- break;
- case "rainy":
- {
- strtext = Language.StringByID(StringId.rain);
- }
- break;
-
- }
- inputView.btnText.TextID = StringId.tianqibianhua;
- inputView.btnState.Text = strtext;
- }
}
break;
case "8":
@@ -542,40 +568,6 @@
break;
}
inputView.btnText.TextID = StringId.likiadaoda;
- 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;
}
}
@@ -762,10 +754,10 @@
else if (device.spk == SPK.SensorTemperature)
{
- new InpOrOutLogicMethod().SensorView(thisView, device, "temperature", indexVulae);
+ new InpOrOutLogicMethod().SensorView(thisView, device, "temperature", indexVulae);
}
- else if ( device.spk == SPK.SensorHumidity)
+ else if (device.spk == SPK.SensorHumidity)
{
new InpOrOutLogicMethod().SensorView(thisView, device, "humidity", indexVulae);
@@ -804,7 +796,7 @@
}
}
break;
- case "4":
+ case "6":
{
///褰撳墠鐨勭储寮曞�兼暟鎹璞�
Input inputedit = Logic.currlogic.input[indexVulae];
@@ -819,7 +811,7 @@
stateValue = dic["value"];
switch (key)
{
- case "outdoor_temp":
+ case "temperature":
{
if (comparator == ">")
{
@@ -833,7 +825,7 @@
}
break;
- case "outdoor_humity":
+ case "humidity":
{
if (comparator == ">")
@@ -847,49 +839,57 @@
}
break;
- case "pm2.5":
+ case "pm25":
{
intValue = StringId.PM25;
+ }
+ break;
+ case "weather":
+ {
+ intValue = StringId.tianqibianhua;
+ }
+ break;
+ case "airquality":
+ {
+ intValue = StringId.kongqizhiliang;
}
break;
}
}
OutdoorEnvironment outdoorEnvironment = new OutdoorEnvironment();
- if (intValue == StringId.PM25)
+ if (intValue == StringId.tianqibianhua)
{
+ //鍩庡競澶╂皵锛堟櫞澶╋紝涓嬮洦锛�
+ WeatherCondition weatherCondition = new WeatherCondition();
+ MainPage.BasePageView.AddChidren(weatherCondition);
+ weatherCondition.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else if (intValue == StringId.PM25)
+ {
+ //鍩庡競澶╂皵锛坧m2.5锛�
outdoorEnvironment.PmAction(thisView, stateValue);
+ }
+ else if (intValue == StringId.kongqizhiliang)
+ {
+ //鍩庡競澶╂皵锛堢┖姘旇川閲忥級
+ AirQuality airQuality = new AirQuality();
+ MainPage.BasePageView.AddChidren(airQuality);
+ airQuality.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
else
{
+ //鍩庡競澶╂皵锛堟俯婀垮害锛�
outdoorEnvironment.InputBoxAction(intValue, stateValue);
}
-
}
break;
- case "6":
- {
-
- WeatherCondition weatherCondition = new WeatherCondition();
- MainPage.BasePageView.AddChidren(weatherCondition);
- weatherCondition.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
- break;
-
case "8":
{
AddInputType addInputType = new AddInputType();
- addInputType.LocationView(thisView,true);
- }
- break;
- case "9":
- {
-
- AirQuality airQuality = new AirQuality();
- MainPage.BasePageView.AddChidren(airQuality);
- airQuality.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ addInputType.LocationView(thisView, true);
}
break;
--
Gitblit v1.8.0