From c71ae86a575c5f47f9e3c2c154fc9891c84b5894 Mon Sep 17 00:00:00 2001 From: chenzhihao <1798906853@qq.com> Date: Tue, 10 Mar 2026 16:54:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=A9=E6=8E=A7=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=9F=B3=E7=9A=84=E6=AF=94=E8=BE=83=E6=95=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/BLV_Studio/v16/.suo | Bin 727040 -> 708608 bytes BLV_Studio/FrmMain.vb | 15 +++++++-------- BLV_Studio/Test/GridTest/TableInteraction.vb | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.vs/BLV_Studio/v16/.suo b/.vs/BLV_Studio/v16/.suo index d00065073deb41a0edfc7ead56caa34a0037284e..896950b131f99328bb1438ecc6c7e1342004245c 100644 GIT binary patch delta 6107 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 VRyVt`(e7Ds*Iutu{Wta={|>Al&i()Z delta 7259 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 diff --git a/BLV_Studio/FrmMain.vb b/BLV_Studio/FrmMain.vb index 18e8fdc..787d7b8 100644 --- a/BLV_Studio/FrmMain.vb +++ b/BLV_Studio/FrmMain.vb @@ -4852,15 +4852,13 @@ Public Class FrmMain If TrNode.Level > 1 Then TrNode = TrNode.Parent End If - Dim FirmwareVer As String = TrNode.FirstNode.NextNode.NextNode.Text ' TrNode.NextVisibleNode.NextNode.Text + Dim FirmwareVer As String = TrNode.FirstNode.Text ' TrNode.NextVisibleNode.NextNode.Text Dim FVer As Integer = 0 If Not String.IsNullOrEmpty(FirmwareVer) Then Dim Firbuf As String() = FirmwareVer.Split("_") - If Firbuf.Length > 3 Then + If Firbuf.Length > 1 Then '将Firbuf(3)十六进制字符串转换为十进制 - - - FVer = Convert.ToInt32(Firbuf(3), 16) + FVer = Convert.ToInt32(Firbuf(0)) End If End If UploadDeviceList(FVer) @@ -4966,12 +4964,13 @@ Public Class FrmMain If TrNode.Level > 1 Then TrNode = TrNode.Parent End If - Dim FirmwareVer As String = TrNode.FirstNode.NextNode.NextNode.Text ' TrNode.NextVisibleNode.NextNode.Text + Dim FirmwareVer As String = TrNode.FirstNode.Text ' TrNode.NextVisibleNode.NextNode.Text Dim FVer As Integer = 0 If Not String.IsNullOrEmpty(FirmwareVer) Then Dim Firbuf As String() = FirmwareVer.Split("_") - If Firbuf.Length > 3 Then - FVer = Convert.ToInt32(Firbuf(3), 16) + If Firbuf.Length > 1 Then + '将Firbuf(3)十六进制字符串转换为十进制 + FVer = Convert.ToInt32(Firbuf(0)) End If End If UploadDeviceList1(FVer) diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb index d40f267..f9ba290 100644 --- a/BLV_Studio/Test/GridTest/TableInteraction.vb +++ b/BLV_Studio/Test/GridTest/TableInteraction.vb @@ -4303,7 +4303,7 @@ Public Class TableInteraction Dbuf = dic.Item(GetDescriptionOriginal（AddPeripherals.Temproweven.互锁)).Trim.Split("*") ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16")) End If - If FVer >43 Then + If FVer >67 Then Dim btxtr As string Dim bctr As Integer=32 @@ -4386,7 +4386,7 @@ Public Class TableInteraction ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16")) End If - If FVer >43 Then + If FVer >67 Then Dim btxtr As string Dim bctr As Integer=32