From f7913245f890462eacb8754bbb6de12c82c3a416 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 25 九月 2023 19:49:53 +0800
Subject: [PATCH] 2023年09月25日19:49:23

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs |   50 ++++++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 98000c6..f1ec56c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1509,22 +1509,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))
                                         {
@@ -2525,19 +2524,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