修复固件版本换算方式和设备上传报错

This commit is contained in:
2026-03-10 16:34:49 +08:00
parent 38b1894d12
commit f0f0f74e2f
8 changed files with 479 additions and 6 deletions

View File

@@ -265,6 +265,7 @@ Partial Class FrmMain
Me.tsb_SyncConfigFiles = New System.Windows.Forms.ToolStripButton()
Me.ToolStripButton4 = New System.Windows.Forms.ToolStripButton()
Me.ToolStripButton17 = New System.Windows.Forms.ToolStripButton()
Me.ToolStripButton23 = New System.Windows.Forms.ToolStripButton()
Me.MsMain.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
Me.CmsEvent.SuspendLayout()
@@ -1140,17 +1141,15 @@ Partial Class FrmMain
'
'ToolStripButton19
'
Me.ToolStripButton19.Enabled = False
Me.ToolStripButton19.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
Me.ToolStripButton19.ForeColor = System.Drawing.Color.Black
Me.ToolStripButton19.Image = CType(resources.GetObject("ToolStripButton19.Image"), System.Drawing.Image)
Me.ToolStripButton19.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton19.Name = "ToolStripButton19"
Me.ToolStripButton19.Size = New System.Drawing.Size(33, 37)
Me.ToolStripButton19.Text = "导出"
Me.ToolStripButton19.Size = New System.Drawing.Size(81, 37)
Me.ToolStripButton19.Text = "上传设备信息"
Me.ToolStripButton19.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
Me.ToolStripButton19.ToolTipText = "将文件导出到Excel表格"
Me.ToolStripButton19.Visible = False
'
'ToolStripSeparator22
'
@@ -1580,7 +1579,7 @@ Partial Class FrmMain
'
'ToolStrip2
'
Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsb_ReleaseToProjcet, Me.ToolStripSeparator7, Me.tsb_RuleCheck, Me.tsb_Compile, Me.tsb_DownLoad, Me.ToolStripSeparator4, Me.TsBtnNewFile, Me.TsBtnLoad, Me.tsb_SaveFile, Me.TsBtnSaveAs, Me.tsb_OpenFileFolder, Me.ToolStripSeparator6, Me.TsBtnAddModel, Me.TsBtnAddActions, Me.TsBtnAddDev, Me.TsBtnAddCondition, Me.TsBtnAddAction, Me.tsb_ExportToExcel, Me.ToolStripSeparator13, Me.UploadFirmware_btn, Me.ToolStripSeparator17})
Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsb_ReleaseToProjcet, Me.ToolStripSeparator7, Me.tsb_RuleCheck, Me.tsb_Compile, Me.tsb_DownLoad, Me.ToolStripSeparator4, Me.TsBtnNewFile, Me.TsBtnLoad, Me.tsb_SaveFile, Me.TsBtnSaveAs, Me.tsb_OpenFileFolder, Me.ToolStripSeparator6, Me.TsBtnAddModel, Me.TsBtnAddActions, Me.TsBtnAddDev, Me.TsBtnAddCondition, Me.TsBtnAddAction, Me.tsb_ExportToExcel, Me.ToolStripSeparator13, Me.UploadFirmware_btn, Me.ToolStripSeparator17, Me.ToolStripButton23})
Me.ToolStrip2.Location = New System.Drawing.Point(3, 3)
Me.ToolStrip2.Name = "ToolStrip2"
Me.ToolStrip2.Size = New System.Drawing.Size(987, 40)
@@ -2706,6 +2705,17 @@ Partial Class FrmMain
Me.ToolStripButton17.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
Me.ToolStripButton17.Visible = False
'
'ToolStripButton23
'
Me.ToolStripButton23.ForeColor = System.Drawing.Color.Blue
Me.ToolStripButton23.Image = CType(resources.GetObject("ToolStripButton23.Image"), System.Drawing.Image)
Me.ToolStripButton23.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton23.Name = "ToolStripButton23"
Me.ToolStripButton23.Size = New System.Drawing.Size(60, 37)
Me.ToolStripButton23.Text = "上传设备"
Me.ToolStripButton23.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.ToolStripButton23.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
'
'FrmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
@@ -3031,4 +3041,5 @@ Partial Class FrmMain
Friend WithEvents lab_RoomType As Label
Friend WithEvents ToolStripButton17 As ToolStripButton
Friend WithEvents TvwMain As TreeViewEx
Friend WithEvents ToolStripButton23 As ToolStripButton
End Class