From 0da9f8c36c0f78c8749d4eb6484cd38fb61bd41c Mon Sep 17 00:00:00 2001
From: chenzhihao <1798906853@qq.com>
Date: Fri, 13 Mar 2026 09:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=80=9F=E6=A8=A1=E5=BC=8F=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E9=9F=B3=E3=80=81=E5=BC=80=E5=85=B3=E6=9C=BA=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E9=9F=B3=E7=9A=84=E6=8E=A7=E5=88=B6=E6=94=B9=E5=88=B0?=
 =?UTF-8?q?=E6=B8=A9=E6=8E=A7=E8=AE=BE=E5=A4=87=E5=AD=98=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E5=B1=9E=E6=80=A7=E4=B8=AD=E5=92=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=A2=B3=E8=BE=BE=E4=BA=BA=E8=8A=82=E8=83=BD=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=9B=9E=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BLV_Studio/EnergySavingAttribute.vb          |  5 ++++
 BLV_Studio/Test/GridTest/TableInteraction.vb | 28 +++++++++++++++++---
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/BLV_Studio/EnergySavingAttribute.vb b/BLV_Studio/EnergySavingAttribute.vb
index 85e955f..de71ecb 100644
--- a/BLV_Studio/EnergySavingAttribute.vb
+++ b/BLV_Studio/EnergySavingAttribute.vb
@@ -585,6 +585,11 @@ Public Class EnergySavingAttribute
                 lidic.Add("ModalAddress", item.Values(4))
                 lidic.Add("IsUploadBaoJing", True)
                 li.Add(lidic)
+            Else
+                Dim lidic As New Dictionary(Of String, Object)
+                lidic.Add("ModalAddress", item.Values(4))
+                lidic.Add("IsUploadBaoJing", False)
+                li.Add(lidic)
             End If
 
         Next
diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb
index 857dd2f..818f5b2 100644
--- a/BLV_Studio/Test/GridTest/TableInteraction.vb
+++ b/BLV_Studio/Test/GridTest/TableInteraction.vb
@@ -4265,7 +4265,7 @@ Public Class TableInteraction
                         Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*")
                         ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16"))
                     End If
-                    If FVer >67 Then 
+                    If FVer =67 Then 
                        
                         Dim btxtr As string
                         Dim bctr As Integer=48
@@ -4287,6 +4287,7 @@ Public Class TableInteraction
                        dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr)
                         btxli(5) = bctr
                        ncbuf.Add(btxli)
+                           Else If FVer > 67 Then
                     Else
                         If checkbuf(1).Equals("1") Then
                         'Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*")
@@ -4355,7 +4356,7 @@ Public Class TableInteraction
                         ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16"))
 
                     End If
-                        If FVer >67 Then 
+                        If FVer =67 Then 
                        
                         Dim btxtr As string
                         Dim bctr As Integer=32
@@ -4379,6 +4380,8 @@ Public Class TableInteraction
                        dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr)
                         btxli(5) = bctr
                        ncbuf.Add(btxli)
+                        Else If FVer > 67 Then
+
                     Else
                     If checkbuf(1).Equals("1") Then
                         Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*")
@@ -6684,7 +6687,7 @@ Public Class TableInteraction
         node = FindAttributeUnderModel(pNode, "设备存在", "水机无阀")
         If node Then
             Dim BaudDevPort() As String = FindAttributeValueUnderModel(pNode, "设备存在", "水机无阀").Split(" ")
-            TemptDevType = CInt(BaudDevPort(0)) '父设备美型(1字节)
+            T1TemptDevType = CInt(BaudDevPort(0)) '父设备美型(1字节)
         End If
         For Each Tcnode In pNode.Nodes
             If Tcnode.Name.Equals("RS485_Curtain") And Not IsNothing(pNode.Desc.DevDescription) Then
@@ -6710,6 +6713,24 @@ Public Class TableInteraction
                 End If
 
             End If
+               If Tcnode.Name.ToUpper.Equals("TEMP") And Not IsNothing(pNode.Desc.DevDescription) Then
+                Curtainbuf=   pNode.Desc.DevDescription.split(",")
+                If Curtainbuf.Length > 3 Then                
+                  If Curtainbuf(3).Equals("1") Then
+                    TemptDevType =1
+                        Else
+                    TemptDevType =2
+                  End If
+                    If Curtainbuf(1).Equals("1") Then
+                        TemptDevType=TemptDevType+4
+                        Else
+                        TemptDevType=TemptDevType+8
+                    End If
+                                 
+                End If
+
+            End If
+
         Next
 
 
@@ -6718,6 +6739,7 @@ Public Class TableInteraction
         keepParam(2) = ParentDevPort
         keepParam(8) =T1TemptDevType 
         keepParam(9) = TemptDevType
+        
         For indexi = 1 To 5
             node = FindAttributeUnderModel(pNode, "设备存在", $"弱电输入{indexi}")
             If node Then