删除自动风复选框及相关功能、增加发布时附加回路上传、优化温控提示音组包方式

2026-03-12 11:31:54 +08:00
parent 4f6a56bf6e
commit fea9bbfc0d
11 changed files with 417 additions and 191 deletions
--- a/BLV_Studio/FrmMain.Designer.vb
+++ b/BLV_Studio/FrmMain.Designer.vb
@@ -91,9 +91,7 @@ Partial Class FrmMain
        Me.SplitContainer7 = New System.Windows.Forms.SplitContainer()
        Me.TabProject = New System.Windows.Forms.TabControl()
        Me.TabPage1 = New System.Windows.Forms.TabPage()
-        Me.TvwMain = New BLV_Studio.TreeViewEx()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
-        Me.tv_ResourceTree = New BLV_Studio.TreeViewEx()
        Me.TabPage3 = New System.Windows.Forms.TabPage()
        Me.Grid_ErrList = New FlexCell.Grid()
        Me.TabPage4 = New System.Windows.Forms.TabPage()
@@ -119,8 +117,8 @@ Partial Class FrmMain
        Me.ToolStripButton9 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButton15 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButton16 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton19 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripSeparator22 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripButton19 = New System.Windows.Forms.ToolStripButton()
        Me.Tablet_DeleteRow = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButton21 = New System.Windows.Forms.ToolStripButton()
@@ -194,6 +192,7 @@ Partial Class FrmMain
        Me.ToolStripSeparator17 = New System.Windows.Forms.ToolStripSeparator()
        Me.ToolStripButton20 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripSeparator21 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripButton23 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStrip5 = New System.Windows.Forms.ToolStrip()
        Me.tab_Pojermanag = New System.Windows.Forms.TabPage()
        Me.TabControl2 = New System.Windows.Forms.TabControl()
@@ -216,7 +215,6 @@ Partial Class FrmMain
        Me.Label33 = New System.Windows.Forms.Label()
        Me.Label32 = New System.Windows.Forms.Label()
        Me.Panel8 = New System.Windows.Forms.Panel()
-        Me.UserControl11 = New BLV_Studio.UserControl1()
        Me.ricLabel_Grb = New System.Windows.Forms.Panel()
        Me.dellabel_btn = New System.Windows.Forms.Button()
        Me.Addlabel_btn = New System.Windows.Forms.Button()
@@ -272,7 +270,9 @@ 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.TvwMain = New BLV_Studio.TreeViewEx()
+        Me.tv_ResourceTree = New BLV_Studio.TreeViewEx()
+        Me.UserControl11 = New BLV_Studio.UserControl1()
        Me.MsMain.SuspendLayout()
        Me.StatusStrip1.SuspendLayout()
        Me.CmsEvent.SuspendLayout()
@@ -838,20 +838,6 @@ Partial Class FrmMain
        Me.TabPage1.Text = "项目"
        Me.TabPage1.UseVisualStyleBackColor = True
        '
-        'TvwMain
-        '
-        Me.TvwMain.CheckBoxes = True
-        Me.TvwMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.TvwMain.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.TvwMain.ImageKey = "OTHERS"
-        Me.TvwMain.ImageList = Me.ImgLstMain
-        Me.TvwMain.ItemHeight = 60
-        Me.TvwMain.Location = New System.Drawing.Point(3, 3)
-        Me.TvwMain.Name = "TvwMain"
-        Me.TvwMain.SelectedImageIndex = 32
-        Me.TvwMain.Size = New System.Drawing.Size(231, 616)
-        Me.TvwMain.TabIndex = 0
-        '
        'TabPage2
        '
        Me.TabPage2.Controls.Add(Me.tv_ResourceTree)
@@ -863,46 +849,6 @@ Partial Class FrmMain
        Me.TabPage2.Text = "资源管理器"
        Me.TabPage2.UseVisualStyleBackColor = True
        '
-        'tv_ResourceTree
-        '
-        Me.tv_ResourceTree.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.tv_ResourceTree.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.tv_ResourceTree.ImageIndex = 35
-        Me.tv_ResourceTree.ImageList = Me.ImgLstMain
-        Me.tv_ResourceTree.ItemHeight = 60
-        Me.tv_ResourceTree.Location = New System.Drawing.Point(3, 3)
-        Me.tv_ResourceTree.Name = "tv_ResourceTree"
-        TreeNode1.Name = "节点2"
-        TreeNode1.Text = "节点2"
-        TreeNode2.Name = "节点3"
-        TreeNode2.Text = "节点3"
-        TreeNode3.Name = "节点4"
-        TreeNode3.Text = "节点4"
-        TreeNode4.Name = "动作"
-        TreeNode4.Text = "节点1"
-        TreeNode5.Name = "节点5"
-        TreeNode5.Text = "节点5"
-        TreeNode6.Name = "节点6"
-        TreeNode6.Text = "节点6"
-        TreeNode7.Name = "节点7"
-        TreeNode7.Text = "节点7"
-        TreeNode8.Name = "节点0"
-        TreeNode8.Text = "节点0"
-        TreeNode9.Name = "节点8"
-        TreeNode9.Text = "节点8"
-        TreeNode10.Name = "节点9"
-        TreeNode10.Text = "节点9"
-        TreeNode11.Name = "节点10"
-        TreeNode11.Text = "节点10"
-        TreeNode12.Name = "节点1"
-        TreeNode12.Text = "节点1"
-        TreeNode13.Name = "节点0"
-        TreeNode13.Text = "酒店-房型"
-        Me.tv_ResourceTree.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode13})
-        Me.tv_ResourceTree.SelectedImageIndex = 42
-        Me.tv_ResourceTree.Size = New System.Drawing.Size(231, 616)
-        Me.tv_ResourceTree.TabIndex = 1
-        '
        'TabPage3
        '
        Me.TabPage3.Controls.Add(Me.Grid_ErrList)
@@ -1170,6 +1116,11 @@ Partial Class FrmMain
        Me.ToolStripButton16.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.ToolStripButton16.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
        '
+        'ToolStripSeparator22
+        '
+        Me.ToolStripSeparator22.Name = "ToolStripSeparator22"
+        Me.ToolStripSeparator22.Size = New System.Drawing.Size(6, 40)
+        '
        'ToolStripButton19
        '
        Me.ToolStripButton19.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
@@ -1182,11 +1133,6 @@ Partial Class FrmMain
        Me.ToolStripButton19.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
        Me.ToolStripButton19.ToolTipText = "将文件导出到Excel表格"
        '
-        'ToolStripSeparator22
-        '
-        Me.ToolStripSeparator22.Name = "ToolStripSeparator22"
-        Me.ToolStripSeparator22.Size = New System.Drawing.Size(6, 40)
-        '
        'Tablet_DeleteRow
        '
        Me.Tablet_DeleteRow.Image = CType(resources.GetObject("Tablet_DeleteRow.Image"), System.Drawing.Image)
@@ -1856,6 +1802,17 @@ Partial Class FrmMain
        Me.ToolStripSeparator21.Name = "ToolStripSeparator21"
        Me.ToolStripSeparator21.Size = New System.Drawing.Size(6, 40)
        '
+        '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
+        '
        'ToolStrip5
        '
        Me.ToolStrip5.Location = New System.Drawing.Point(3, 3)
@@ -2125,15 +2082,6 @@ Partial Class FrmMain
        Me.Panel8.Size = New System.Drawing.Size(608, 622)
        Me.Panel8.TabIndex = 82
        '
-        'UserControl11
-        '
-        Me.UserControl11.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UserControl11.Location = New System.Drawing.Point(0, 0)
-        Me.UserControl11.Margin = New System.Windows.Forms.Padding(4)
-        Me.UserControl11.Name = "UserControl11"
-        Me.UserControl11.Size = New System.Drawing.Size(608, 622)
-        Me.UserControl11.TabIndex = 0
-        '
        'ricLabel_Grb
        '
        Me.ricLabel_Grb.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -2777,16 +2725,68 @@ Partial Class FrmMain
        Me.ToolStripButton17.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
        Me.ToolStripButton17.Visible = False
        '
-        'ToolStripButton23
+        'TvwMain
        '
-        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
+        Me.TvwMain.CheckBoxes = True
+        Me.TvwMain.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TvwMain.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
+        Me.TvwMain.ImageKey = "OTHERS"
+        Me.TvwMain.ImageList = Me.ImgLstMain
+        Me.TvwMain.ItemHeight = 60
+        Me.TvwMain.Location = New System.Drawing.Point(3, 3)
+        Me.TvwMain.Name = "TvwMain"
+        Me.TvwMain.SelectedImageIndex = 32
+        Me.TvwMain.Size = New System.Drawing.Size(231, 616)
+        Me.TvwMain.TabIndex = 0
+        '
+        'tv_ResourceTree
+        '
+        Me.tv_ResourceTree.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.tv_ResourceTree.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
+        Me.tv_ResourceTree.ImageIndex = 35
+        Me.tv_ResourceTree.ImageList = Me.ImgLstMain
+        Me.tv_ResourceTree.ItemHeight = 60
+        Me.tv_ResourceTree.Location = New System.Drawing.Point(3, 3)
+        Me.tv_ResourceTree.Name = "tv_ResourceTree"
+        TreeNode1.Name = "节点2"
+        TreeNode1.Text = "节点2"
+        TreeNode2.Name = "节点3"
+        TreeNode2.Text = "节点3"
+        TreeNode3.Name = "节点4"
+        TreeNode3.Text = "节点4"
+        TreeNode4.Name = "动作"
+        TreeNode4.Text = "节点1"
+        TreeNode5.Name = "节点5"
+        TreeNode5.Text = "节点5"
+        TreeNode6.Name = "节点6"
+        TreeNode6.Text = "节点6"
+        TreeNode7.Name = "节点7"
+        TreeNode7.Text = "节点7"
+        TreeNode8.Name = "节点0"
+        TreeNode8.Text = "节点0"
+        TreeNode9.Name = "节点8"
+        TreeNode9.Text = "节点8"
+        TreeNode10.Name = "节点9"
+        TreeNode10.Text = "节点9"
+        TreeNode11.Name = "节点10"
+        TreeNode11.Text = "节点10"
+        TreeNode12.Name = "节点1"
+        TreeNode12.Text = "节点1"
+        TreeNode13.Name = "节点0"
+        TreeNode13.Text = "酒店-房型"
+        Me.tv_ResourceTree.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode13})
+        Me.tv_ResourceTree.SelectedImageIndex = 42
+        Me.tv_ResourceTree.Size = New System.Drawing.Size(231, 616)
+        Me.tv_ResourceTree.TabIndex = 1
+        '
+        'UserControl11
+        '
+        Me.UserControl11.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UserControl11.Location = New System.Drawing.Point(0, 0)
+        Me.UserControl11.Margin = New System.Windows.Forms.Padding(4)
+        Me.UserControl11.Name = "UserControl11"
+        Me.UserControl11.Size = New System.Drawing.Size(608, 622)
+        Me.UserControl11.TabIndex = 0
        '
        'FrmMain
        '