From f735f0fb57d1539a258972ef8772f48a17e1333a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 07 十二月 2022 17:34:18 +0800
Subject: [PATCH] 大华更新

---
 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