diff --git a/.vs/BLV_Studio/v16/.suo b/.vs/BLV_Studio/v16/.suo index d000650..896950b 100644 Binary files a/.vs/BLV_Studio/v16/.suo and b/.vs/BLV_Studio/v16/.suo differ 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