修正温控提示音组包开关位取值和增加上传设备列表密码输入框
This commit is contained in:
@@ -4268,16 +4268,21 @@ Public Class TableInteraction
|
||||
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<<4)
|
||||
bctr=bctr or (1<<2)
|
||||
bctr=bctr And Not (1 << 4)
|
||||
End If
|
||||
If checkbuf(3).Equals("1") Then
|
||||
bctr=bctr or (1<<3)
|
||||
bctr=bctr or (1<<4)
|
||||
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
|
||||
@@ -4356,12 +4361,19 @@ Public Class TableInteraction
|
||||
Dim bctr As Integer=32
|
||||
If checkbuf(1).Equals("1") Then
|
||||
bctr=bctr or (1<<2)
|
||||
bctr=bctr or (1<<4)
|
||||
bctr=bctr And Not (1 << 4)
|
||||
End If
|
||||
If checkbuf(3).Equals("1") Then
|
||||
bctr=bctr or (1<<3)
|
||||
bctr=bctr or (1<<4)
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user