From dc6b96a219645c1125de6d6bb5e94d61cf167be1 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 21 八月 2021 17:37:53 +0800
Subject: [PATCH] 2021-8-21-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 86 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 81 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index c2f9703..22c90d5 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -258,7 +258,7 @@
}
}
break;
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
string str = "";
foreach (var dic in dicList)
@@ -315,7 +315,9 @@
}
}
break;
- case SPK.SenesorEnvironment:
+ case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
{
string strtext = "";
foreach (var dic in dicList)
@@ -468,6 +470,51 @@
}
}
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;
+ }
+ }
+ break;
+ case "10":
+ {
+ //鐢╯id鎵惧埌鍦烘櫙锛�
+ var scene = LogicMethod.CurrLogicMethod.GetSecne(inputCondition.sid);
+ inputView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png";
+ inputView.btnNextIcon.Visible = false;
+ inputView.btnClick.Visible = false;
+ //鏄剧ず鍦烘櫙鍚嶇О
+ inputView.btnText.Text = scene.name;
+ }
+ break;
}
//鍐嶆缂栬緫鏉′欢鐘舵�佺偣鍑讳簨浠�
@@ -565,7 +612,7 @@
{
//鐢╯id鎵惧埌璁惧锛�
var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
- if (device.spk == SPK.SenesorEnvironment)
+ if (device.spk == SPK.SensorEnvironment|| device.spk == SPK.SensorEnvironment2 || device.spk == SPK.SensorEnvironment3)
{
//杩欎釜璁惧姣旇緝鐗规畩
ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
@@ -710,6 +757,16 @@
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;
+
}
};
///鍒犻櫎鎺т欢
@@ -1043,6 +1100,15 @@
break;
case "3":
{
+ //鐢╯id鎵惧埌瀹夐槻锛�
+ var security = LogicMethod.CurrLogicMethod.GetSecurity(outputTarget.sid);
+ targetView.btnIcon.UnSelectedImagePath = "LogicIcon/security.png";
+ //鏄剧ず瀹夐槻鍚嶇О
+ stateStr = security.name;
+ }
+ break;
+ case "4":
+ {
targetView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
foreach (var dic in dicList)
{
@@ -1094,7 +1160,12 @@
break;
case "3":
{
-
+ AddTarget addTarget = new AddTarget();
+ addTarget.SecurityMethod(thisView, edit, indexVulae);
+ }
+ break;
+ case "4":
+ {
FrameLayout fLayout = new FrameLayout
{
BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
@@ -1506,7 +1577,7 @@
}
}
break;
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
foreach (var dic in dicList)
{
@@ -1739,6 +1810,11 @@
}
break;
}
+
+ if (!MainView.IsGatewayType)
+ {
+ name +=Language.StringByID(StringId.push);
+ }
}
catch { }
return name;
--
Gitblit v1.8.0