From 2c1411a48874e4033a538a9725f09c8465536fa8 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 28 八月 2023 19:03:51 +0800
Subject: [PATCH] 2023年08月28日19:03:29
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 122 +++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 32662f8..7442f62 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:
@@ -1009,7 +1015,7 @@
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
-
+
case SPK.CommonSeries:
targetView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/groupControl.png";
stateStr = GetKeyValue("on_off", dicList) == "on" ? Language.StringByID(StringId.onLogic) : Language.StringByID(StringId.offLogic);
@@ -1051,14 +1057,14 @@
}
}
break;
-
-
+
+
case SPK.LightRGB:
case SPK.LightRGBW:
case SPK.LightCCT:
case SPK.LightDimming:
{
-
+
string on_off = GetKeyValue("on_off", dicList);
string brightness = GetKeyValue("brightness", dicList);
if (on_off == "on" && brightness != "")
@@ -1082,7 +1088,7 @@
//鑹叉俯杩欎釜灞炴�ф墠鏈夋晥
if (stateStr != Language.StringByID(StringId.offLogic) && GetKeyValue("cct", dicList) != "")
{
- stateStr += "," +GetKeyValue("cct", dicList) + "k";
+ stateStr += "," + GetKeyValue("cct", dicList) + "k";
}
}
if (device.spk == SPK.LightRGB)
@@ -1258,7 +1264,7 @@
if (set_temp != "")
{
- string unit =GetTemperatureUnit(device);
+ string unit = GetTemperatureUnit(device);
stateStr += set_temp + unit + ",";
}
@@ -1469,14 +1475,55 @@
{
string song_name = GetKeyValue("song_name", dicList);
string volume = GetKeyValue("volume", dicList);
- stateStr = song_name + ";" +Language.StringByID(StringId.volumeMusic)+volume;
+ stateStr = song_name + ";" + Language.StringByID(StringId.volumeMusic) + volume;
if (stateStr.StartsWith(";"))
{
stateStr = stateStr.Substring(1, stateStr.Length - 1);
- }else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
+ } else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
{
stateStr = stateStr.Substring(0, stateStr.Length - 3);
}
+ }
+ break;
+ case SPK.ElectricalTvHisense:
+ {
+ string on_off = GetKeyValue("on_off", dicList);
+ string volumet = GetKeyValue("set_volume", dicList);
+ string signal = GetKeyValue("signal", dicList);
+ if (!string.IsNullOrEmpty(on_off))
+ {
+ if (on_off == "on")
+ {
+ stateStr = Language.StringByID(StringId.onLogic);
+ }
+ else
+ {
+ stateStr = Language.StringByID(StringId.offLogic);
+ //濡傛灉鍏充簡锛屽叾瀹冨睘鎬т笉鏄剧ず
+ break;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(stateStr))
+ {
+ stateStr += ",";
+ }
+ if (!string.IsNullOrEmpty(volumet))
+ {
+ stateStr += Language.StringByID(StringId.yinliang) + volumet;
+ }
+
+ if (!string.IsNullOrEmpty(stateStr))
+ {
+ stateStr += ",";
+ }
+ if (!string.IsNullOrEmpty(signal))
+ {
+ var p = new PublicInterface();
+ string key = p.GetKey(p.GetHisenseSignalSourceDic(), signal);
+ stateStr += key;
+ }
+ stateStr = stateStr.TrimEnd(',');
}
break;
}
@@ -2182,7 +2229,7 @@
}
}
break;
-
+
case SPK.SensorGas:
case SPK.SensorSmoke:
{
@@ -2448,6 +2495,59 @@
button2.Tag = tag;
}
break;
+ case SPK.ElectricalTvHisense:
+ {
+ 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 "set_volume":
+ {
+ if (button2 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ button2.Text = value;
+ }
+ break;
+ case "signal":
+ {
+ if (button3 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ var p = new PublicInterface();
+ string key = p.GetKey(p.GetHisenseSignalSourceDic(), value);
+ button3.Text = key;
+ }
+ break;
+ }
+
+ }
+ }
+ break;
+
}
}
--
Gitblit v1.8.0