From 1eb43291d6f565fd8106ee401240d1c7a41da776 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 27 九月 2021 09:31:46 +0800
Subject: [PATCH] 组合调光
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index a6dc46d..bd54b23 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -56,8 +56,10 @@
case SPK.AcStandard:
//鍦扮儹
case SPK.FloorHeatStandard:
+ case SPK.HvacFloorHeat:
//鏂伴
case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -189,6 +191,7 @@
break;
//姣背娉紶鎰熷櫒
case SPK.SenesorMegahealth:
+ case SPK.SenesorMegahealth2:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
view.btnText.TextID = StringId.mubiaozhuangtai;//鐩爣鐘舵��
@@ -364,7 +367,7 @@
{
///hcho
LogicView.FunTypeView hchoView = new LogicView.FunTypeView();
- hchoView.btnText.TextID = StringId.tvoc;
+ hchoView.btnText.TextID = StringId.Formaldehyde;
fLayout.AddChidren(hchoView.FLayoutView());
///hcho鐐瑰嚮浜嬩欢
hchoView.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -478,6 +481,7 @@
}
break;
case SPK.SenesorMegahealth:
+ case SPK.SenesorMegahealth2:
{
keyVlaue = "action_state";
}
@@ -515,7 +519,7 @@
break;
case StringId.wuren:
{
- if (device.spk == SPK.SenesorMegahealth)
+ if (device.spk == SPK.SenesorMegahealth || device.spk == SPK.SenesorMegahealth2)
{
value = "uninhabited";
}
--
Gitblit v1.8.0