From c1cb2d8c6034a2ee7aa8a5710bba15b14f76cebc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 18 八月 2023 18:54:31 +0800
Subject: [PATCH] 2023年08月18日18:54:22
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 107 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 6da1d29..1d787cb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -460,7 +460,7 @@
break;
case SPK.IpCam_Imou:
{
- if (inputCondition.identifier == "door_caipcam_region_alram_eventll_cloud_event")
+ if (inputCondition.identifier == "ipcam_region_alram_event")
{
inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);
}
@@ -468,9 +468,15 @@
}
break;
case SPK.Ev_Ipcam:
+ if (inputCondition.identifier == "motiondetect_event")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.shi);
+ }
+ break;
+ case SPK.Peephole:
if (inputCondition.identifier == "pir_event")
{
- inputView.btnState.Text = Language.StringByID(StringId.On);
+ inputView.btnState.Text = Language.StringByID(StringId.shi);
}
break;
case SPK.SensorPirHold:
@@ -1112,7 +1118,11 @@
string on_off = GetKeyValue("on_off", dicList);
string brightness = GetKeyValue("brightness", dicList);
string cct = GetKeyValue(FunctionAttributeKey.CCT, dicList);
- string colorful = GetKeyValue(FunctionAttributeKey.Colorful, dicList);
+ //鑷姩鍖栫粍鎺� 鐐僵鍔熻兘
+ //string colorful = GetKeyValue(FunctionAttributeKey.Colorful, dicList);
+ string rgb = GetKeyValue("rgb", dicList);
+
+
if (on_off == "on" && brightness != "")
{
stateStr = Language.StringByID(StringId.onLogic) + brightness + "%";
@@ -1135,22 +1145,19 @@
stateStr += "," + Language.StringByID(StringId.ColorTemperature) + cct + "k";
}
- if (!string.IsNullOrEmpty(colorful))
- {
- stateStr += "," + Language.StringByID(StringId.ColorfulFunction);
- if (colorful == "on")
- {
- stateStr += Language.StringByID(StringId.onLogic);
- }
- else if (colorful == "off")
- {
- stateStr += Language.StringByID(StringId.offLogic);
- }
+ //if (!string.IsNullOrEmpty(colorful))
+ //{
+ // stateStr += "," + Language.StringByID(StringId.ColorfulFunction);
+ // if (colorful == "on")
+ // {
+ // stateStr += Language.StringByID(StringId.onLogic);
+ // }
+ // else if (colorful == "off")
+ // {
+ // stateStr += Language.StringByID(StringId.offLogic);
+ // }
+ //}
- break;
- }
-
- string rgb = GetKeyValue("rgb", dicList);
if (!string.IsNullOrEmpty(rgb) && rgb.Length > 6)
{
targetView.btnStateColor.Visible = true;
@@ -1257,11 +1264,7 @@
if (set_temp != "")
{
- string unit = device.GetAttribute("temperature_type") == null ? "鈩�" : device.GetAttribute("temperature_type").state;
- if (string.IsNullOrEmpty(unit))
- {
- unit = "鈩�";
- }
+ string unit =GetTemperatureUnit(device);
stateStr += set_temp + unit + ",";
}
@@ -1359,11 +1362,7 @@
}
if (set_temp != "")
{
- string unit = device.GetAttribute("temperature_type") == null ? "鈩�" : device.GetAttribute("temperature_type").state;
- if (string.IsNullOrEmpty(unit))
- {
- unit = "鈩�";
- }
+ string unit = GetTemperatureUnit(device);
stateStr += set_temp + unit + ",";
}
if (mode != "")
@@ -1532,7 +1531,10 @@
break;
}
- if (outputTarget.target_type == "1" || outputTarget.target_type == "3")
+ if (outputTarget.target_type == "1"
+ || outputTarget.target_type == "3"
+ || outputTarget.target_type == "5"
+ )
{
targetView.btnState.Text = this.GetTimeText(outputTarget.delay) + stateStr;
}
@@ -1562,6 +1564,7 @@
switch (button.Name)
{
case "1":
+ case "5":
{
//鐢╯id鎵惧埌璁惧锛�
var device = LogicMethod.Current.GetDevice(outputTarget.sid);
@@ -1598,7 +1601,8 @@
this.Delayed(thisView, outputTarget.delay, (value) =>
{
outputTarget.delay = value.ToString();
- if (outputTarget.target_type == "1")
+ if (outputTarget.target_type == "1"
+ || outputTarget.target_type == "5")
{
targetView.btnState.Text = this.GetTimeText(outputTarget.delay) + stateStr;
}
@@ -1624,8 +1628,9 @@
/// <param name="button1">鏄剧ずBtn</param>
/// <param name="button2">鏄剧ずBtn</param>
/// <param name="button3">鏄剧ずBtn</param>
- /// <param name="button4">鏄剧ずBtn</param>
- public void EditDeviceState(Entity.Function device, List<Dictionary<string, string>> dicList, Button button1, Button button2, Button button3, Button button4)
+ /// <param name="button4">鏄剧ずBtn</param>
+ /// <param name="attribute">灞炴�х储寮�</param>
+ public void EditDeviceState(Entity.Function device, List<Dictionary<string, string>> dicList, Button button1, Button button2, Button button3, Button button4, string attribute)
{
switch (device.spk)
{
@@ -1734,8 +1739,13 @@
{
foreach (var dic in dicList)
{
+ string key = dic["key"];
+ if (key != attribute)
+ {
+ continue;
+ }
string value = dic["value"];
- switch (dic["key"])
+ switch (key)
{
case "on_off":
case "colorful":
@@ -1785,9 +1795,11 @@
}
break;
- }
+
+ }
}
+
}
break;
case SPK.CurtainSwitch:
@@ -1928,7 +1940,7 @@
//鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
break;
}
- button2.Text = value + "鈩�";
+ button2.Text = value + GetTemperatureUnit(device); ;
}
break;
case "mode":
@@ -2041,7 +2053,7 @@
//鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
break;
}
- button2.Text = value + "鈩�";
+ button2.Text = value + GetTemperatureUnit(device); ;
}
break;
case "mode":
@@ -2176,7 +2188,7 @@
}
}
break;
-
+
case SPK.SensorGas:
case SPK.SensorSmoke:
{
@@ -2403,6 +2415,8 @@
button1.Tag = tag;
}
break;
+
+
case SPK.MusicStandard:
case SPK.AvMusic:
{
@@ -2493,6 +2507,25 @@
return dicList[0]["value"].ToString();
}
/// <summary>
+ /// 鑾峰彇娓╁害鍗曚綅
+ /// </summary>
+ /// <param name="device"></param>
+ /// <returns></returns>
+ public string GetTemperatureUnit(Entity.Function device)
+ {
+ string unit = string.Empty;
+ if (device.GetAttribute("temperature_type") != null)
+ {
+ unit = device.GetAttribute("temperature_type").unit;
+ }
+ if (string.IsNullOrEmpty(unit))
+ {
+ //璋冭瘯杞欢鏈夌┖鑳戒笂浼犱负绌�
+ unit = "鈩�";
+ }
+ return unit;
+ }
+ /// <summary>
///鑾峰彇鑷姩鍖栧悕绉�
/// </summary>
/// <returns> 鏂板缓鑷姩鍖栧懡鍚嶈鍒�</returns>
--
Gitblit v1.8.0