diff --git a/.vs/BLV_Studio/v16/.suo b/.vs/BLV_Studio/v16/.suo index d0a59a1..882f666 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 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