From 41232526f444403eecd12ed95de4f3f9758c6d93 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 17 十月 2023 13:38:12 +0800
Subject: [PATCH] Update Shared.IOS.dll
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 54 +++++++++++++++++++++++++++++-------------------------
1 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index c0a2216..ff12c6b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -181,7 +181,7 @@
}
}
break;
- //浼犳劅鍣�
+ //绱ф�ユ眰鍔╀紶鎰熷櫒
case SPK.SensorHelp:
{
string value = this.GetKeyValue("alarm_status", dicList);
@@ -1055,6 +1055,7 @@
}
}
break;
+ case SPK.OtherCommon:
case SPK.AirSwitch:
case SPK.LightSwitch:
//鎻掑骇
@@ -1509,22 +1510,21 @@
break;
case SPK.ElectricalTvHisense:
{
- string on_off = GetKeyValue("on_off", dicList);
+ string on = GetKeyValue("wol", dicList);
+ string 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(off))
+ {
+ stateStr = Language.StringByID(StringId.offLogic);
+ //濡傛灉鍏充簡锛屽叾瀹冨睘鎬т笉鏄剧ず
+ break;
+ }
+
+ if (!string.IsNullOrEmpty(on))
+ {
+ stateStr = Language.StringByID(StringId.onLogic);
}
if (!string.IsNullOrEmpty(stateStr))
{
@@ -1716,6 +1716,7 @@
break;
case SPK.ElectricSocket:
//寮�鍏崇伅鍏�
+ case SPK.OtherCommon:
case SPK.AirSwitch:
case SPK.LightSwitch:
//鏈烘鎵�
@@ -2525,19 +2526,22 @@
{
case "on_off":
{
- switch (value)
+ if (value == "off")
{
- case "on":
- {
- button1.Text = Language.StringByID(StringId.onLogic);
- }
- break;
- case "off":
- {
- button1.Text = Language.StringByID(StringId.offLogic);
- }
- break;
+ button1.Text = Language.StringByID(StringId.offLogic);
+
}
+
+ }
+ break;
+ case "wol":
+ {
+ if (value == "on")
+ {
+ button1.Text = Language.StringByID(StringId.onLogic);
+
+ }
+
}
break;
--
Gitblit v1.8.0