From 157be5220d9d81bce18e8248ef6ac056415405a1 Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期二, 31 八月 2021 09:29:45 +0800
Subject: [PATCH] 更新推送库
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 298 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 278 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 398c19a..1158bc6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -149,6 +149,8 @@
case SPK.AcStandard:
//鍦扮儹
case SPK.FloorHeatStandard:
+ //鏂伴
+ case SPK.AirFreshStandard:
{//寮�鍏崇伅
foreach (var dic in dicList)
{
@@ -376,7 +378,41 @@
}
break;
+ case SPK.SensorTemperature:
+ {
+
+ string str =new InpOrOutLogicMethod { }.GetText(dicList);
+ inputView.btnState.Text = str;
+ }
+ break;
+ case SPK.SensorHumidity:
+ {
+ string str = new InpOrOutLogicMethod { }.GetText(dicList);
+ inputView.btnState.Text = str;
+ }
+ break;
+ case SPK.SensorCO2:
+ {
+ string str = new InpOrOutLogicMethod { }.GetText(dicList);
+ inputView.btnState.Text = str;
+
+ }
+ break;
+ case SPK.SensorPm25:
+ {
+ string str = new InpOrOutLogicMethod { }.GetText(dicList);
+ inputView.btnState.Text = str;
+
+ }
+ break;
+ case SPK.SensorTVOC:
+ {
+ string str = new InpOrOutLogicMethod { }.GetText(dicList);
+ inputView.btnState.Text = str;
+
+ }
+ break;
}
}
break;
@@ -504,6 +540,17 @@
}
}
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;
}
//鍐嶆缂栬緫鏉′欢鐘舵�佺偣鍑讳簨浠�
@@ -601,7 +648,15 @@
{
//鐢╯id鎵惧埌璁惧锛�
var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
- if (device.spk == SPK.SensorEnvironment|| device.spk == SPK.SensorEnvironment2 || device.spk == SPK.SensorEnvironment3)
+ if (device.spk == SPK.SensorEnvironment
+ || device.spk == SPK.SensorEnvironment2
+ || device.spk == SPK.SensorEnvironment3
+ || device.spk == SPK.SensorTemperature
+ || device.spk == SPK.SensorHumidity
+ || device.spk == SPK.SensorCO2
+ || device.spk == SPK.SensorPm25
+ || device.spk == SPK.SensorTVOC
+ )
{
//杩欎釜璁惧姣旇緝鐗规畩
ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
@@ -755,6 +810,7 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
break;
+
}
};
///鍒犻櫎鎺т欢
@@ -801,7 +857,6 @@
targetView.btnText.Text = device.name;
//鏀瑰彉璁惧鍚嶇О鏄剧ず鎺т欢瀹藉害
targetView.btnText.Width = Application.GetRealWidth(80);
-
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
@@ -1036,27 +1091,61 @@
break;
}
+ }
+ if (on_off != "" && on_off == "off")
+ {
+ stateStr = Language.StringByID(StringId.offLogic);
+ }
+ else
+ {
+ stateStr = stateStr.TrimEnd(',');
- switch (mode)
+ }
+ }
+ break;
+ case SPK.AirFreshStandard:
+ {
+ string on_off = GetKeyValue("on_off", dicList);
+ string fan = GetKeyValue("fan", dicList);
+ if (on_off != "")
+ {
+ switch (on_off)
{
- case "cool":
+ case "on":
{
- stateStr += Language.StringByID(StringId.coolLogic) + ",";
+ stateStr = Language.StringByID(StringId.onLogic) + ",";
}
break;
- case "heat":
+ case "off":
{
- stateStr += Language.StringByID(StringId.heatingLogic) + ",";
+ stateStr = Language.StringByID(StringId.offLogic) + ",";
+ }
+ break;
+ }
+ }
+ if (fan != "")
+ {
+
+ switch (fan)
+ {
+ case "high":
+ {
+ stateStr += Language.StringByID(StringId.HighWindSpeed) + ",";
+ }
+ break;
+ case "medium":
+ {
+ stateStr += Language.StringByID(StringId.MiddleWindSpeed) + ",";
+ }
+ break;
+ case "low":
+ {
+ stateStr += Language.StringByID(StringId.LowWindSpeed) + ",";
}
break;
case "auto":
{
- stateStr += Language.StringByID(StringId.autoLogic) + ",";
- }
- break;
- case "dry":
- {
- stateStr += Language.StringByID(StringId.dehumidifyLogic) + ",";
+ stateStr += Language.StringByID(StringId.Auto) + ",";
}
break;
}
@@ -1088,6 +1177,27 @@
break;
case "3":
{
+ //鐢╯id鎵惧埌瀹夐槻锛�
+ var security = LogicMethod.CurrLogicMethod.GetSecurity(outputTarget.sid);
+ targetView.btnIcon.UnSelectedImagePath = "LogicIcon/security.png";
+ targetView.btnDelay.Visible = false;
+ //鏄剧ず瀹夐槻鍚嶇О
+ targetView.btnText.Text = security.name;
+ string value = GetKeyValue("security", dicList);
+ if (value == "enable")
+ {
+ stateStr = Language.StringByID(StringId.bufang);
+
+ }
+ else
+ {
+ stateStr = Language.StringByID(StringId.chefang);
+ }
+
+ }
+ break;
+ case "4":
+ {
targetView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
foreach (var dic in dicList)
{
@@ -1098,9 +1208,9 @@
break;
}
- if (outputTarget.target_type == "1")
+ if (outputTarget.target_type == "1" || outputTarget.target_type == "3")
{
- targetView.btnState.Text =new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
+ targetView.btnState.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
}
else
{
@@ -1139,7 +1249,12 @@
break;
case "3":
{
-
+ Security security = new Security();
+ security.SecurityMethod(thisView, "", edit, indexVulae);
+ }
+ break;
+ case "4":
+ {
FrameLayout fLayout = new FrameLayout
{
BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
@@ -1468,6 +1583,73 @@
}
break;
+ case SPK.AirFreshStandard:
+ {
+
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ switch (dic["key"])
+ {
+ case "on_off":
+ {
+ switch (value)
+ {
+ case "on":
+ {
+ button1.Text = Language.StringByID(StringId.onLogic);
+ }
+ break;
+ case "off":
+ {
+ button1.Text = Language.StringByID(StringId.offLogic);
+ }
+ break;
+ }
+ }
+ break;
+
+ case "fan":
+ {
+ if (button2 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ switch (value)
+ {
+ case "high":
+ {
+ button2.Text = Language.StringByID(StringId.HighWindSpeed);
+ }
+ break;
+ case "medium":
+ {
+ button2.Text = Language.StringByID(StringId.MiddleWindSpeed);
+ }
+ break;
+ case "low":
+ {
+ button2.Text = Language.StringByID(StringId.LowWindSpeed);
+ }
+ break;
+ case "auto":
+ {
+ button2.Text = Language.StringByID(StringId.Auto);
+ }
+ break;
+ }
+
+
+ }
+ break;
+
+ }
+
+ }
+
+ }
+ break;
case SPK.SensorGas:
case SPK.SensorSmoke:
{
@@ -1662,6 +1844,13 @@
name = device.name + "-";
}
break;
+ case "10":
+ {
+ //鐢╯id鎵惧埌鍦烘櫙锛�
+ var scene = LogicMethod.CurrLogicMethod.GetSecne(inputCondition.sid);
+ name = scene.name + "-";
+ }
+ break;
}
//榛樿鍙栫涓�涓洰鏍�
@@ -1783,18 +1972,24 @@
}
break;
+ case "3":
+ {
+ //鐢╯id鎵惧埌瀹夐槻锛�
+ var security = LogicMethod.CurrLogicMethod.GetSecurity(outputTarget.sid);
+ name += security.name;
+
+ }
+ break;
}
if (!MainView.IsGatewayType)
{
- name +=Language.StringByID(StringId.push);
+ name += Language.StringByID(StringId.push);
}
}
catch { }
return name;
}
-
-
/// <summary>
/// 寤舵椂鏃堕棿鏂规硶
/// </summary>
@@ -1890,11 +2085,74 @@
state = seconds.ToString() + Language.StringByID(StringId.s);
}
}
- if (!string.IsNullOrEmpty(state)) {
+ if (!string.IsNullOrEmpty(state))
+ {
state = Language.StringByID(StringId.delayLogic) + state;
}
return state;
}
+ /// <summary>
+ /// 鑾峰彇鏄剧ず闈㈢啛鏂囨湰
+ /// </summary>
+ /// <param name="dicList">鐘舵�佹暟鎹垪琛�</param>
+ /// <returns></returns>
+ private string GetText(List<Dictionary<string, string>> dicList)
+ {
+ string strtext = "";
+ foreach (var dic in dicList)
+ {
+ string key = dic["key"];
+ string value = dic["value"];
+ string comparator = dic["comparator"];
+ switch (key)
+ {
+
+ case "temperature":
+ {
+ if (comparator == ">")
+ {
+ strtext = ">" + value + "鈩�";
+ }
+ else if (comparator == "<")
+ {
+ strtext = "<" + value + "鈩�";
+ }
+
+ }
+ break;
+ case "humidity":
+ {
+ if (comparator == ">")
+ {
+ strtext = ">" + value + "%";
+ }
+ else if (comparator == "<")
+ {
+ strtext = "<" + value + "%";
+ }
+
+ }
+ break;
+ case "co2":
+ {
+ strtext = Language.StringByID(StringId.co2) + new PublicInterface { }.GetString("co2", value);
+ }
+ break;
+ case "pm25":
+ {
+ strtext = Language.StringByID(StringId.pm25) + new PublicInterface { }.GetString("pm25", value);
+ }
+ break;
+ case "tvoc":
+ {
+ strtext = Language.StringByID(StringId.tvoc) + new PublicInterface { }.GetString("tvoc", value);
+ }
+ break;
+ }
+ }
+ return strtext;
+ }
}
}
+
--
Gitblit v1.8.0