删除自动风复选框及相关功能、增加发布时附加回路上传、优化温控提示音组包方式
This commit is contained in:
@@ -4270,10 +4270,12 @@ Public Class TableInteraction
|
||||
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 or (1<<4)
|
||||
End If
|
||||
If checkbuf(3).Equals("1") Then
|
||||
bctr=bctr or (1<<3)
|
||||
bctr=bctr or (1<<4)
|
||||
End If
|
||||
|
||||
btxtr= $"0,2,0,2,1,0,0"
|
||||
@@ -4353,10 +4355,12 @@ Public Class TableInteraction
|
||||
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 or (1<<4)
|
||||
End If
|
||||
If checkbuf(3).Equals("1") Then
|
||||
bctr=bctr or (1<<3)
|
||||
bctr=bctr or (1<<4)
|
||||
End If
|
||||
|
||||
btxtr= $"0,2,0,2,1,0,0"
|
||||
@@ -4573,9 +4577,8 @@ Public Class TableInteraction
|
||||
Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.风高)).Trim.Split("*")
|
||||
ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), Dbuf(2), Dbuf(1), Chr(TableColSwitchKeyDate.TurnDrown).ToString))
|
||||
End Select
|
||||
If checkbuf.Length>3 AndAlso checkbuf(4).Equals("1") Then 'czh 260110 在高风速时增加设置为自动风
|
||||
ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,0,0,0,0"))
|
||||
End If
|
||||
|
||||
|
||||
|
||||
Case 10 '风速高
|
||||
UShort.TryParse(6152, strEventNum)
|
||||
@@ -4596,9 +4599,7 @@ Public Class TableInteraction
|
||||
Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.风高)).Trim.Split("*")
|
||||
ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), Dbuf(2), Dbuf(1), Chr(TableColSwitchKeyDate.TurnOn).ToString))
|
||||
End Select
|
||||
If checkbuf.Length>3 AndAlso checkbuf(4).Equals("1") Then 'czh 260110 在高风速时增加设置为自动风
|
||||
ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,0,0,0,0"))
|
||||
End If
|
||||
|
||||
Case 11 '控制
|
||||
UShort.TryParse(30, strEventNum)
|
||||
eventNum = BitConverter.GetBytes(strEventNum)
|
||||
|
||||
Reference in New Issue
Block a user