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

修正温控提示音组包开关位取值和增加上传设备列表密码输入框

Browse Source
This commit is contained in:
chenzhihao
2026-03-12 14:17:33 +08:00
parent fea9bbfc0d
commit 58ee52f088
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BLV_Studio/FrmMain.vb
View File

@@ -5362,6 +5362,9 @@ Public Class FrmMain
End Function End Function
Private Sub ToolStripButton19_Click(sender As Object, e As EventArgs) Handles ToolStripButton19.Click Private Sub ToolStripButton19_Click(sender As Object, e As EventArgs) Handles ToolStripButton19.Click
Dim strInputMsg As String = InputBox("请输入上传设备列表密码", "密码确认")
If strInputMsg <> "123456" Then Return
If Releaseflag And Not IsNothing(TvwMain.SelectedNode) Then If Releaseflag And Not IsNothing(TvwMain.SelectedNode) Then
Else Else
MsgBox("请选择发布节点") MsgBox("请选择发布节点")
@@ -5478,6 +5481,8 @@ Public Class FrmMain
End Sub End Sub
Private Sub ToolStripButton23_Click(sender As Object, e As EventArgs) Handles ToolStripButton23.Click Private Sub ToolStripButton23_Click(sender As Object, e As EventArgs) Handles ToolStripButton23.Click
Dim strInputMsg As String = InputBox("请输入上传设备列表密码", "密码确认")
If strInputMsg <> "123456" Then Return
If Releaseflag And Not IsNothing(TvwMain.SelectedNode) Then If Releaseflag And Not IsNothing(TvwMain.SelectedNode) Then
Else Else
MsgBox("请选择发布节点") MsgBox("请选择发布节点")

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

@@ -4268,16 +4268,21 @@ Public Class TableInteraction
If FVer >67 Then If FVer >67 Then
Dim btxtr As string Dim btxtr As string
Dim bctr As Integer=32 Dim bctr As Integer=48
If checkbuf(1).Equals("1") Then If checkbuf(1).Equals("1") Then
bctr=bctr or (1<<2) bctr=bctr or (1<<2)
bctr=bctr or (1<<4) bctr=bctr And Not (1 << 4)
End If End If
If checkbuf(3).Equals("1") Then If checkbuf(3).Equals("1") Then
bctr=bctr or (1<<3) bctr=bctr or (1<<3)
bctr=bctr or (1<<4) bctr=bctr And Not (1 << 4)
End If 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" btxtr= $"0,2,0,2,1,0,0"
dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr) dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr)
btxli(5) = bctr btxli(5) = bctr
@@ -4356,12 +4361,19 @@ Public Class TableInteraction
Dim bctr As Integer=32 Dim bctr As Integer=32
If checkbuf(1).Equals("1") Then If checkbuf(1).Equals("1") Then
bctr=bctr or (1<<2) bctr=bctr or (1<<2)
bctr=bctr or (1<<4) bctr=bctr And Not (1 << 4)
End If End If
If checkbuf(3).Equals("1") Then If checkbuf(3).Equals("1") Then
bctr=bctr or (1<<3) bctr=bctr or (1<<3)
bctr=bctr or (1<<4) bctr=bctr And Not (1 << 4)
End If 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" btxtr= $"0,2,0,2,1,0,0"
dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr) dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr)