From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 9cfe721..b1c6ab8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -229,10 +229,10 @@
///寮�鍏�
LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
curtainSwitchView.btnText.TextID = StringId.switchLogic;
- fLayout.AddChidren(curtainSwitchView.FLayoutView());
+ //fLayout.AddChidren(curtainSwitchView.FLayoutView());//2023骞�04鏈�17鏃�16:27:10 浜у搧瑕佹眰鐨勫幓鎺�
///鐧惧垎姣�
LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
- crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
+ //crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
crtainPercentumView.btnText.TextID = StringId.percentum;
fLayout.AddChidren(crtainPercentumView.FLayoutView());
crtainPercentumView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
@@ -297,6 +297,7 @@
break;
case SPK.AcStandard:
case SPK.HvacAC:
+ case SPK.AcIr:
{
#region 鐣岄潰
///寮�鍏�
@@ -699,6 +700,7 @@
break;
}
case SPK.HvacAC:
+ case SPK.AcIr:
case SPK.AcStandard:
case SPK.FloorHeatStandard:
case SPK.HvacFloorHeat:
--
Gitblit v1.8.0