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

BLV_Studio/FrmMain.vb

@@ -5362,6 +5362,9 @@ Public Class FrmMain
     End Function
 
     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
         Else
             MsgBox("请选择发布节点")
@@ -5478,6 +5481,8 @@ Public Class FrmMain
     End Sub
 
     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
         Else
             MsgBox("请选择发布节点")

BLV_Studio/Test/GridTest/TableInteraction.vb

@@ -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)