From 132dc0402e0c5e22a7d54cdddc1700a1842304bd Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 十二月 2022 15:42:23 +0800
Subject: [PATCH] Merge branch 'wjc' into dev--wxr
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index 8564f29..e826f65 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -30,7 +30,7 @@
VerticalScrolViewLayout vv = new VerticalScrolViewLayout
{
Y = funAllAreaView.frameLayout.Bottom,
- Height = Application.GetRealHeight(667 - 64 - 50 * funCount - 8),
+ Height = Application.GetRealHeight(667 - 64 - 50 * funCount - 8-50),
};
viewLayout.AddChidren(vv);
if (!MainView.IsGatewayType)
@@ -275,9 +275,10 @@
funView.btnLine.X = Application.GetRealWidth(16);
funView.btnLine.Width = Application.GetRealWidth(343);
verticalScrolView.AddChidren(funView.FLayoutView());
- funView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetIconPath(dev.spk);
+ funView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetDeviceIconPath(dev);
funView.btnDeviceName.Text = dev.name;
funView.btnRoomName.Text = dev.GetRoomListName();
+
funView.btnClick.MouseUpEventHandler += (sen, e) =>
{
if (if_Type == LogicMethod.condition_if)
--
Gitblit v1.8.0