From 1c1b485b579ef0dfa1d0317a0ac8eb916777f446 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 一月 2023 13:57:54 +0800
Subject: [PATCH] 版本号更新
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 74 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 14e387d..4930ec3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -140,7 +140,7 @@
//鐢╯id鎵惧埌璁惧锛�
var device = LogicMethod.Current.GetDevice(inputCondition.sid);
//鐢ㄨ澶囩殑functionType绫诲瀷鎵惧埌瀵瑰簲鍥炬爣锛�
- inputView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetIconPath(device.spk);
+ inputView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetDeviceIconPath(device);
//鏄剧ず璁惧鍚嶇О
inputView.btnText.Text = device.name;
//鏀瑰彉璁惧鍚嶇О鏄剧ず鎺т欢瀹藉害
@@ -281,6 +281,7 @@
}
break;
case SPK.SenesorMegahealth:
+ case SPK.SensorMmvPose:
{
string key = this.GetKey(dicList);
string value = this.GetValue(dicList);
@@ -385,6 +386,7 @@
}
break;
+ case SPK.SensorPm10:
case SPK.SensorCO2:
case SPK.SensorPm25:
case SPK.SensorTVOC:
@@ -416,6 +418,15 @@
var FaceItem = this.GetFaceItem(userId, device.deviceId);
inputView.btnState.Text = FaceItem.userName;
}
+ }
+ break;
+ case SPK.IpCam_Imou:
+ {
+ if (inputCondition.identifier == "door_caipcam_region_alram_eventll_cloud_event")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);
+ }
+
}
break;
}
@@ -748,6 +759,12 @@
this.SensorView(thisView, device, "co2", indexVulae);
}
+ else if (device.spk == SPK.SensorPm10)
+ {
+
+ this.SensorView(thisView, device, "pm10", indexVulae);
+
+ }
else if (device.spk == SPK.SensorPm25)
{
@@ -913,7 +930,7 @@
//鐢╯id鎵惧埌璁惧锛�
var device = LogicMethod.Current.GetDevice(outputTarget.sid);
//鐢ㄨ澶囩殑functionType绫诲瀷鎵惧埌瀵瑰簲鍥炬爣锛�
- targetView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetIconPath(device.spk);
+ targetView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetDeviceIconPath(device);
//鏄剧ず璁惧鍚嶇О
targetView.btnText.Text = device.name;
//鏀瑰彉璁惧鍚嶇О鏄剧ず鎺т欢瀹藉害
@@ -922,11 +939,24 @@
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
-
+
+ //鎻掑骇(鏈塙SB)
+ case SPK.PanelSocket:
+ {
+ string on_off = GetKeyValue("on_off_master", dicList);
+ if (on_off == "on")
+ {
+ stateStr = Language.StringByID(StringId.onLogic);
+ }
+ else
+ {
+ stateStr = stateStr = Language.StringByID(StringId.offLogic);
+ }
+ }
+ break;
case SPK.AirSwitch:
case SPK.LightSwitch:
//鎻掑骇
- case SPK.PanelSocket:
case SPK.ElectricSocket:
//鏈烘鎵�
case SPK.MechanicalArm:
@@ -1440,8 +1470,23 @@
{
switch (device.spk)
{
- //鎻掑骇
+ //鎻掑骇(鏈塙SB)
case SPK.PanelSocket:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "on")
+ {
+ button1.Text = Language.StringByID(StringId.onLogic);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.offLogic);
+ }
+ }
+ }
+ break;
case SPK.ElectricSocket:
//寮�鍏崇伅鍏�
case SPK.AirSwitch:
@@ -2020,6 +2065,7 @@
}
break;
case SPK.SenesorMegahealth:
+ case SPK.SensorMmvPose:
{
foreach (var dic in dicList)
{
@@ -2104,6 +2150,7 @@
button2.Text = this.GetFaceItem(value, device.deviceId).userName;
}
break;
+
}
}
/// <summary>
@@ -2397,7 +2444,9 @@
/// <returns></returns>
private string GetTimeText(string strTimeValue)
{
- var timeValue = int.Parse(strTimeValue);
+ //鍥犱负璋冭瘯杞欢涓婁紶涓虹┖杩�;
+ string intTimeValue = string.IsNullOrEmpty(strTimeValue) ? "0" : strTimeValue;
+ var timeValue = int.Parse(intTimeValue);
string state = "";
var minutes = timeValue / 60;
var seconds = timeValue % 60;
@@ -2471,6 +2520,11 @@
strtext = Language.StringByID(StringId.co2) + new PublicInterface { }.GetString("co2", value);
}
break;
+ case "pm10":
+ {
+ strtext = Language.StringByID(StringId.pm10) + new PublicInterface { }.GetString("pm25", value);
+ }
+ break;
case "pm25":
{
strtext = Language.StringByID(StringId.pm25) + new PublicInterface { }.GetString("pm25", value);
@@ -2497,8 +2551,9 @@
Input inputedit = Logic.currlogic.input[indexVulae];
///鐘舵�佸��
string stateValue = "";
- foreach (var dic in inputedit.condition)
+ for (int i=0;i<inputedit.condition.Count;i++)
{
+ var dic = inputedit.condition[i];
string comparator = dic["comparator"];
stateValue = dic["value"];
switch (key)
@@ -2537,6 +2592,11 @@
ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
}
break;
+ case "pm10":
+ {
+ ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm10", StringId.pm10, indexVulae, true, stateValue);
+ }
+ break;
case "pm25":
{
ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
--
Gitblit v1.8.0