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-10 16:51:11 +08:00
parent 3405e47d63
commit 4f6a56bf6e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BLV_Studio/FrmMain.vb
View File

@@ -5168,17 +5168,16 @@ Public Class FrmMain
If TrNode.Level > 1 Then If TrNode.Level > 1 Then
TrNode = TrNode.Parent TrNode = TrNode.Parent
End If 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 Dim FVer As Integer = 0
If Not String.IsNullOrEmpty(FirmwareVer) Then If Not String.IsNullOrEmpty(FirmwareVer) Then
Dim Firbuf As String() = FirmwareVer.Split("_") Dim Firbuf As String() = FirmwareVer.Split("_")
If Firbuf.Length > 3 Then If Firbuf.Length > 1 Then
'将Firbuf(3)十六进制字符串转换为十进制 '将Firbuf(3)十六进制字符串转换为十进制
FVer = Convert.ToInt32(Firbuf(0))
FVer = Convert.ToInt32(Firbuf(3), 16)
End If End If
End If End If
UploadDeviceList(FVer) UploadDeviceList(FVer)
End Sub End Sub
@@ -5282,12 +5281,13 @@ Public Class FrmMain
If TrNode.Level > 1 Then If TrNode.Level > 1 Then
TrNode = TrNode.Parent TrNode = TrNode.Parent
End If 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 Dim FVer As Integer = 0
If Not String.IsNullOrEmpty(FirmwareVer) Then If Not String.IsNullOrEmpty(FirmwareVer) Then
Dim Firbuf As String() = FirmwareVer.Split("_") Dim Firbuf As String() = FirmwareVer.Split("_")
If Firbuf.Length > 3 Then If Firbuf.Length > 1 Then
FVer = Convert.ToInt32(Firbuf(3), 16) '将Firbuf(3)十六进制字符串转换为十进制
FVer = Convert.ToInt32(Firbuf(0))
End If End If
End If End If
UploadDeviceList1(FVer) UploadDeviceList1(FVer)

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

@@ -4265,7 +4265,7 @@ Public Class TableInteraction
Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*") Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*")
ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16")) ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16"))
End If End If
If FVer >43 Then If FVer >67 Then
Dim btxtr As string Dim btxtr As string
Dim bctr As Integer=32 Dim bctr As Integer=32
@@ -4348,7 +4348,7 @@ Public Class TableInteraction
ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16")) ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16"))
End If End If
If FVer >43 Then If FVer >67 Then
Dim btxtr As string Dim btxtr As string
Dim bctr As Integer=32 Dim bctr As Integer=32