修复空调提示音组包标记错误问题
This commit is contained in:
Binary file not shown.
@@ -4555,40 +4555,40 @@ Public Class FrmMain
|
|||||||
'Try
|
'Try
|
||||||
'生成文件夹
|
'生成文件夹
|
||||||
If CreateXmlPath() Then
|
If CreateXmlPath() Then
|
||||||
If _TableInteraction.CheckGridData Then
|
If _TableInteraction.CheckGridData Then
|
||||||
|
|
||||||
|
|
||||||
'填充配置信息
|
'填充配置信息
|
||||||
'_grdModel._ConfigInf
|
'_grdModel._ConfigInf
|
||||||
Dim TrNode As TreeNode = TvwMain.SelectedNode
|
Dim TrNode As TreeNode = TvwMain.SelectedNode
|
||||||
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.NextNode.NextNode.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 > 3 Then
|
||||||
FVer = Convert.ToInt32(Firbuf(3))
|
FVer = Convert.ToInt32(Firbuf(3))
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
If _TableInteraction.TableCompiletoByte(FVer, savePath, True) = True Then
|
If _TableInteraction.TableCompiletoByte(FVer, savePath, True) = True Then
|
||||||
_TableInteraction.Save(savePath) '保存配置文件
|
_TableInteraction.Save(savePath) '保存配置文件
|
||||||
If IsShowCompileResult Then MsgBox($"Compile complete, Configuration version number:" & _TableInteraction.ConfigInfo.CfgFileVersion)
|
If IsShowCompileResult Then MsgBox($"Compile complete, Configuration version number:" & _TableInteraction.ConfigInfo.CfgFileVersion)
|
||||||
Return True
|
Return True
|
||||||
Else
|
Else
|
||||||
MsgBox("Compilation failure", MsgBoxStyle.OkOnly + MsgBoxStyle.Information, "Compilation failure.")
|
MsgBox("Compilation failure", MsgBoxStyle.OkOnly + MsgBoxStyle.Information, "Compilation failure.")
|
||||||
Return False
|
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..")
|
MsgBox("If the rule check fails, process the rule item by item and recompile it!", MsgBoxStyle.OkOnly + MsgBoxStyle.Information, "Compilation failure..")
|
||||||
Return False
|
Return False
|
||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
MsgBox("Compilation failure!", MsgBoxStyle.OkOnly + MsgBoxStyle.Information, "Failed to create the project file..")
|
MsgBox("Compilation failure!", MsgBoxStyle.OkOnly + MsgBoxStyle.Information, "Failed to create the project file..")
|
||||||
Return False
|
Return False
|
||||||
End If
|
End If
|
||||||
'Catch ex As Exception
|
'Catch ex As Exception
|
||||||
' MsgBox($"编译失败,{ex.Message}")
|
' MsgBox($"编译失败,{ex.Message}")
|
||||||
' Return False
|
' Return False
|
||||||
|
|||||||
@@ -4307,7 +4307,7 @@ Public Class TableInteraction
|
|||||||
|
|
||||||
Dim btxtr As string
|
Dim btxtr As string
|
||||||
Dim bctr As Integer=32
|
Dim bctr As Integer=32
|
||||||
If checkbuf(0).Equals("1") Then
|
If checkbuf(1).Equals("1") Then
|
||||||
bctr=bctr or (1<<2)
|
bctr=bctr or (1<<2)
|
||||||
End If
|
End If
|
||||||
If checkbuf(3).Equals("1") Then
|
If checkbuf(3).Equals("1") Then
|
||||||
@@ -4390,7 +4390,7 @@ Public Class TableInteraction
|
|||||||
|
|
||||||
Dim btxtr As string
|
Dim btxtr As string
|
||||||
Dim bctr As Integer=32
|
Dim bctr As Integer=32
|
||||||
If checkbuf(0).Equals("1") Then
|
If checkbuf(1).Equals("1") Then
|
||||||
bctr=bctr or (1<<2)
|
bctr=bctr or (1<<2)
|
||||||
End If
|
End If
|
||||||
If checkbuf(3).Equals("1") Then
|
If checkbuf(3).Equals("1") Then
|
||||||
|
|||||||
Reference in New Issue
Block a user