From 5ebfae19f57807906b10fec069e7100797996741 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 01 七月 2022 13:12:08 +0800
Subject: [PATCH] 2022年07月01日13:09:31

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs    |   11 +++++++++--
 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs |    6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index af47048..02bd437 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -63,7 +63,7 @@
                 case SPK.LightRGB:
                 case SPK.LightRGBW:
                 case SPK.LightCCT:
-                case SPK.LightSwitch:
+                //case SPK.LightSwitch:
                 //绐楀笜
                 case SPK.CurtainSwitch:
                 case SPK.CurtainRoller:
@@ -247,7 +247,7 @@
                         fLayout.AddChidren(view2.FLayoutView());
                         view2.btnClick.MouseUpEventHandler += (sender, e) =>
                         {
-                            DeviceView(device, view2.btnState, StringId.shi, StringId.offLogic, 1);
+                            DeviceView(device, view2.btnState, StringId.youren, StringId.wuren, 2);
                         };
                         if (edit)
                         {
@@ -652,7 +652,7 @@
                         break;
                     case StringId.wuren:
                         {
-                            if (device.spk == SPK.SenesorMegahealth || device.spk == SPK.SenesorMegahealth2)
+                            if (device.spk == SPK.SenesorMegahealth2)
                             {
                                 value = "uninhabited";
                             }
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 3db5687..eb1cc55 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -338,7 +338,11 @@
                                                     {
                                                         if (value == "true")
                                                         {
-                                                            inputView.btnState.Text = Language.StringByID(StringId.shi);
+                                                            inputView.btnState.Text = Language.StringByID(StringId.youren);
+                                                        }
+                                                        else
+                                                        {
+                                                            inputView.btnState.Text = Language.StringByID(StringId.wuren);
                                                         }
 
                                                     }
@@ -2057,7 +2061,10 @@
                                     {
                                         if (value == "true")
                                         {
-                                            button1.Text = Language.StringByID(StringId.shi);
+                                            button1.Text = Language.StringByID(StringId.youren);
+                                        }
+                                        else {
+                                            button1.Text = Language.StringByID(StringId.wuren);
                                         }
                                         
                                     }

--
Gitblit v1.8.0