From 38b1894d12db519c9d42c1b128c30530f8f3a5ae Mon Sep 17 00:00:00 2001 From: chenzhihao <1798906853@qq.com> Date: Tue, 10 Mar 2026 11:10:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A9=BA=E8=B0=83=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=9F=B3=E7=BB=84=E5=8C=85=E6=A0=87=E8=AE=B0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/BLV_Studio/v16/.suo | Bin 713216 -> 713216 bytes BLV_Studio/FrmMain.vb | 46 +++++++++---------- BLV_Studio/Test/GridTest/TableInteraction.vb | 4 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.vs/BLV_Studio/v16/.suo b/.vs/BLV_Studio/v16/.suo index d0a59a11579def87f966bc6504be8d567fa79ffb..882f666fca8724b0afc491ecd8757bb280cc6105 100644 GIT binary patch delta 4037 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 VPn+TY{vQg98_dNGPP-wf>F*-)vxxuz diff --git a/BLV_Studio/FrmMain.vb b/BLV_Studio/FrmMain.vb index b2d525e..886bbd1 100644 --- a/BLV_Studio/FrmMain.vb +++ b/BLV_Studio/FrmMain.vb @@ -4555,40 +4555,40 @@ Public Class FrmMain 'Try '生成文件夹 If CreateXmlPath() Then - If _TableInteraction.CheckGridData Then + If _TableInteraction.CheckGridData Then - '填充配置信息 - '_grdModel._ConfigInf - Dim TrNode As TreeNode = TvwMain.SelectedNode - If TrNode.Level > 1 Then - TrNode = TrNode.Parent - End If - Dim FirmwareVer As String = TrNode.FirstNode.NextNode.NextNode.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)) - End If - End If - If _TableInteraction.TableCompiletoByte(FVer, savePath, True) = True Then - _TableInteraction.Save(savePath) '保存配置文件 + '填充配置信息 + '_grdModel._ConfigInf + Dim TrNode As TreeNode = TvwMain.SelectedNode + If TrNode.Level > 1 Then + TrNode = TrNode.Parent + End If + Dim FirmwareVer As String = TrNode.FirstNode.NextNode.NextNode.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)) + End If + End If + If _TableInteraction.TableCompiletoByte(FVer, savePath, True) = True Then + _TableInteraction.Save(savePath) '保存配置文件 If IsShowCompileResult Then MsgBox($"Compile complete, Configuration version number:" & _TableInteraction.ConfigInfo.CfgFileVersion) Return True - Else + Else MsgBox("Compilation failure", MsgBoxStyle.OkOnly + MsgBoxStyle.Information, "Compilation failure.") Return False - End If + End If - Else + Else MsgBox("If the rule check fails, process the rule item by item and recompile it!", MsgBoxStyle.OkOnly + MsgBoxStyle.Information, "Compilation failure..") Return False - End If - Else + End If + Else MsgBox("Compilation failure!", MsgBoxStyle.OkOnly + MsgBoxStyle.Information, "Failed to create the project file..") Return False - End If + End If 'Catch ex As Exception ' MsgBox($"编译失败,{ex.Message}") ' Return False diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb index bbb1125..2d00569 100644 --- a/BLV_Studio/Test/GridTest/TableInteraction.vb +++ b/BLV_Studio/Test/GridTest/TableInteraction.vb @@ -4307,7 +4307,7 @@ Public Class TableInteraction Dim btxtr As string Dim bctr As Integer=32 - If checkbuf(0).Equals("1") Then + If checkbuf(1).Equals("1") Then bctr=bctr or (1<<2) End If If checkbuf(3).Equals("1") Then @@ -4390,7 +4390,7 @@ Public Class TableInteraction Dim btxtr As string Dim bctr As Integer=32 - If checkbuf(0).Equals("1") Then + If checkbuf(1).Equals("1") Then bctr=bctr or (1<<2) End If If checkbuf(3).Equals("1") Then