风速模式提示音、开关机提示音的控制改到温控设备存在的私有属性中和优化碳达人节能上传回路

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