From 58d4ef9af9c906acf2e9f65a3e65092363c8e1cd Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 24 八月 2023 17:42:49 +0800
Subject: [PATCH] 2023年08月24日17:42:25
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 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 e8e8b0f..193eb02 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1488,19 +1488,31 @@
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 == "1")
+ 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 += ",";
@@ -2492,12 +2504,12 @@
{
switch (value)
{
- case "1":
+ case "on":
{
button1.Text = Language.StringByID(StringId.onLogic);
}
break;
- case "0":
+ case "off":
{
button1.Text = Language.StringByID(StringId.offLogic);
}
@@ -2505,14 +2517,25 @@
}
}
break;
- case "signal":
+
+ case "set_volume":
{
if (button2 == null)
{
//鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
break;
}
- button2.Text = value.Replace("_", " ");
+ button2.Text = value;
+ }
+ break;
+ case "signal":
+ {
+ if (button3 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ button3.Text = value.Replace("_", " ");
}
break;
}
--
Gitblit v1.8.0