Boonlive_RD_Web/Desktop_BLVStudio_EN
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 温控风风速模式提示音、开关机提示音的控制改到温控设备存在的私有属性中

Browse Source
This commit is contained in:
chenzhihao
2026-03-13 10:32:21 +08:00
parent c71ae86a57
commit ffa7bf3369
5 changed files with 158 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
BLV_Studio/Test/GridTest/TableInteraction.vb
View File

@@ -4303,28 +4303,36 @@ Public Class TableInteraction
Dbuf = dic.Item(GetDescriptionOriginal（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=32
Dim bctr As Integer=48
If checkbuf(1).Equals("1") Then
bctr=bctr or (1<<2)
bctr=bctr or (1<<2)
bctr=bctr And Not (1 << 4)
End If
If checkbuf(3).Equals("1") Then
bctr=bctr or (1<<3)
End If
bctr=bctr And Not (1 << 4)
End If
If bctr And (1<<4) Then
bctr=bctr or (1<<2)
bctr=bctr or (1<<3)
Else
End If
btxtr= $"0,2,0,2,1,0,0"
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("*")
ncbuf.Add(GetActionData(DeviceModuleDic, hostname, "MUSIC", 1, "0,2,3,1,11,0"))
End If
If checkbuf(3).Equals("1") Then
If checkbuf(3).Equals("1") Then
ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,2,1,0,0"))
Else
ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,2,2,0,0"))
@@ -4386,33 +4394,44 @@ 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
If checkbuf(1).Equals("1") Then
bctr=bctr or (1<<2)
bctr=bctr or (1<<2)
bctr=bctr And Not (1 << 4)
End If
If checkbuf(3).Equals("1") Then
bctr=bctr or (1<<3)
End If
bctr=bctr And Not (1 << 4)
End If
If bctr And (1<<4) Then
bctr=bctr or (1<<2)
bctr=bctr or (1<<3)
Else
End If
btxtr= $"0,2,0,2,1,0,0"
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(GetDescriptionOriginal（AddPeripherals.Temproweven.互锁)).Trim.Split("*")
Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*")
ncbuf.Add(GetActionData(DeviceModuleDic, hostname, "MUSIC", 1, "0,2,3,1,12,0"))
End If
If checkbuf(3).Equals("1") Then
ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,2,1,0,0"))
Else
ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,2,2,0,0"))
End If
End If
Case 3 '冷阀开
UShort.TryParse(1028, strEventNum)
eventNum = BitConverter.GetBytes(strEventNum)