From 271c46f52e74845dac76fa5ece4eb8b94d9168f4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 08 四月 2022 10:12:31 +0800
Subject: [PATCH] 金茂温控器

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 01a0587..1c9b2bc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -61,6 +61,7 @@
                 //绌鸿皟
                 case SPK.AcStandard:
                 case SPK.HvacAC:
+                case SPK.HvacCac://姣涚粏绌鸿皟
                 //鍦扮儹
                 case SPK.FloorHeatStandard:
                 case SPK.HvacFloorHeat:
@@ -667,6 +668,8 @@
         {
             if (edit)
             {
+                ///
+                this.function = device;
                 Input inputs = Logic.currlogic.input[index];
                 //娓呴櫎涔嬪墠鏃ф暟鎹�
                 dicSateteList.Clear();
@@ -854,6 +857,9 @@
         private bool Is_SpkAttribute(string key) {
             ///淇敼鏂板睘鎬�
             ///璇嗗埆浣跨敤鍔熻兘鏄惁瀛樺湪灞炴��
+            if (this.function==null) {
+                return false;
+            }
             var job = this.function.GetAttribute(key);
             if (job != null)
             {

--
Gitblit v1.8.0