From cc7eb0553e93844be984045bca3e335d4ae0dede Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 04 七月 2022 10:46:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into release0123
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 1d7589f..abf4b91 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:
@@ -230,7 +230,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)
{
@@ -634,7 +634,7 @@
break;
case StringId.wuren:
{
- if (device.spk == SPK.SenesorMegahealth || device.spk == SPK.SenesorMegahealth2)
+ if (device.spk == SPK.SenesorMegahealth2)
{
value = "uninhabited";
}
--
Gitblit v1.8.0