From 58ee52f088dc28c94e3ad9cb98a767ef537c932f Mon Sep 17 00:00:00 2001
From: chenzhihao <1798906853@qq.com>
Date: Thu, 12 Mar 2026 14:17:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B8=A9=E6=8E=A7=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E9=9F=B3=E7=BB=84=E5=8C=85=E5=BC=80=E5=85=B3=E4=BD=8D?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E5=92=8C=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E5=AF=86=E7=A0=81=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BLV_Studio/FrmMain.vb                        |  5 ++++
 BLV_Studio/Test/GridTest/TableInteraction.vb | 30 ++++++++++++++------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/BLV_Studio/FrmMain.vb b/BLV_Studio/FrmMain.vb
index 572f2d4..26c02e5 100644
--- a/BLV_Studio/FrmMain.vb
+++ b/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("请选择发布节点")
diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb
index ae28449..857dd2f 100644
--- a/BLV_Studio/Test/GridTest/TableInteraction.vb
+++ b/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)