From ffa7bf3369ea803494ac9b04b4165ab859a07b15 Mon Sep 17 00:00:00 2001 From: chenzhihao <1798906853@qq.com> Date: Fri, 13 Mar 2026 10:32:21 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=B8=A9=E6=8E=A7=E9=A3=8E=E9=A3=8E?= =?UTF-8?q?=E9=80=9F=E6=A8=A1=E5=BC=8F=E6=8F=90=E7=A4=BA=E9=9F=B3=E3=80=81?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=9C=BA=E6=8F=90=E7=A4=BA=E9=9F=B3=E7=9A=84?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=94=B9=E5=88=B0=E6=B8=A9=E6=8E=A7=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=AD=98=E5=9C=A8=E7=9A=84=E7=A7=81=E6=9C=89=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/BLV_Studio/v16/.suo | Bin 708608 -> 721408 bytes BLV_Studio/FrmMain.vb | 15 +- .../Test/GridTest/AddPeripherals.Designer.vb | 240 +++++++++--------- BLV_Studio/Test/GridTest/ReportingScenario.vb | 10 +- BLV_Studio/Test/GridTest/TableInteraction.vb | 41 ++- 5 files changed, 158 insertions(+), 148 deletions(-) diff --git a/.vs/BLV_Studio/v16/.suo b/.vs/BLV_Studio/v16/.suo index 896950b131f99328bb1438ecc6c7e1342004245c..592b4b594392933266aba7f5133d81d5b14270d7 100644 GIT binary patch delta 8493 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 L2kff3&#wP3O|`dV diff --git a/BLV_Studio/FrmMain.vb b/BLV_Studio/FrmMain.vb index 787d7b8..633c783 100644 --- a/BLV_Studio/FrmMain.vb +++ b/BLV_Studio/FrmMain.vb @@ -2180,6 +2180,7 @@ Public Class FrmMain If projectCompile(tmp_Local_XmlFullName, False, True, devdic) Then '取当前时间 ReleaseConfigXmlToDB(tmpPath, tmpXmlName, cfgVer, newcfgVer, devdic) + UploadDeviceList1(cfgVer) Else End If @@ -4793,6 +4794,7 @@ Public Class FrmMain '取当前时间 ReleaseConfigBLVToDB(tmpPath, tmpXmlName, cfgVer, newcfgVer, devdic) + UploadDeviceList(cfgVer) Else End If @@ -4830,17 +4832,6 @@ Public Class FrmMain End Sub - - - - - - - - - - - Private Sub ToolStripButton19_Click(sender As Object, e As EventArgs) Handles ToolStripButton19.Click If Releaseflag And Not IsNothing(TvwMain.SelectedNode) Then Else @@ -4866,7 +4857,7 @@ Public Class FrmMain Public Sub UploadDeviceList(pzVer As Integer) ' 1. 参数验证 - If Not Releaseflag OrElse IsNothing(TvwMain.SelectedNode) Then + If IsNothing(TvwMain.SelectedNode) Then MsgBox("Please select the publishing node.") Return End If diff --git a/BLV_Studio/Test/GridTest/AddPeripherals.Designer.vb b/BLV_Studio/Test/GridTest/AddPeripherals.Designer.vb index 83ec579..acd7b9c 100644 --- a/BLV_Studio/Test/GridTest/AddPeripherals.Designer.vb +++ b/BLV_Studio/Test/GridTest/AddPeripherals.Designer.vb @@ -26,13 +26,17 @@ Partial Class AddPeripherals Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() Me.Label5 = New System.Windows.Forms.Label() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() - Me.CheckBox6 = New System.Windows.Forms.CheckBox() + Me.SplitContainer6 = New System.Windows.Forms.SplitContainer() + Me.FdevAddr = New System.Windows.Forms.Label() + Me.Fdevtype = New System.Windows.Forms.Label() + Me.FdevPort = New System.Windows.Forms.Label() + Me.FdevPortCom = New System.Windows.Forms.ComboBox() Me.FdevPortText = New System.Windows.Forms.ComboBox() Me.FdevtypeCom = New System.Windows.Forms.ComboBox() - Me.FdevPortCom = New System.Windows.Forms.ComboBox() - Me.FdevPort = New System.Windows.Forms.Label() - Me.Fdevtype = New System.Windows.Forms.Label() - Me.FdevAddr = New System.Windows.Forms.Label() + Me.Button2 = New System.Windows.Forms.Button() + Me.TextBox3 = New System.Windows.Forms.TextBox() + Me.Label9 = New System.Windows.Forms.Label() + Me.CheckBox6 = New System.Windows.Forms.CheckBox() Me.CheckBox5 = New System.Windows.Forms.CheckBox() Me.CheckBox4 = New System.Windows.Forms.CheckBox() Me.Label8 = New System.Windows.Forms.Label() @@ -56,10 +60,6 @@ Partial Class AddPeripherals Me.Grid1 = New FlexCell.Grid() Me.Temp_Grid = New FlexCell.Grid() Me.Button1 = New System.Windows.Forms.Button() - Me.TextBox3 = New System.Windows.Forms.TextBox() - Me.Label9 = New System.Windows.Forms.Label() - Me.SplitContainer6 = New System.Windows.Forms.SplitContainer() - Me.Button2 = New System.Windows.Forms.Button() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -72,6 +72,10 @@ Partial Class AddPeripherals Me.SplitContainer2.Panel1.SuspendLayout() Me.SplitContainer2.Panel2.SuspendLayout() Me.SplitContainer2.SuspendLayout() + CType(Me.SplitContainer6, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainer6.Panel1.SuspendLayout() + Me.SplitContainer6.Panel2.SuspendLayout() + Me.SplitContainer6.SuspendLayout() CType(Me.SplitContainer4, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer4.Panel1.SuspendLayout() Me.SplitContainer4.Panel2.SuspendLayout() @@ -80,10 +84,6 @@ Partial Class AddPeripherals Me.SplitContainer5.Panel1.SuspendLayout() Me.SplitContainer5.Panel2.SuspendLayout() Me.SplitContainer5.SuspendLayout() - CType(Me.SplitContainer6, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainer6.Panel1.SuspendLayout() - Me.SplitContainer6.Panel2.SuspendLayout() - Me.SplitContainer6.SuspendLayout() Me.SuspendLayout() ' 'SplitContainer1 @@ -171,17 +171,71 @@ Partial Class AddPeripherals Me.SplitContainer2.SplitterDistance = 120 Me.SplitContainer2.TabIndex = 0 ' - 'CheckBox6 + 'SplitContainer6 ' - Me.CheckBox6.AutoSize = True - Me.CheckBox6.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.CheckBox6.Location = New System.Drawing.Point(1263, 67) - Me.CheckBox6.Name = "CheckBox6" - Me.CheckBox6.Size = New System.Drawing.Size(145, 18) - Me.CheckBox6.TabIndex = 24 - Me.CheckBox6.Text = "Valveless machine" - Me.CheckBox6.UseVisualStyleBackColor = True - Me.CheckBox6.Visible = False + Me.SplitContainer6.Location = New System.Drawing.Point(3, 89) + Me.SplitContainer6.Name = "SplitContainer6" + ' + 'SplitContainer6.Panel1 + ' + Me.SplitContainer6.Panel1.Controls.Add(Me.FdevAddr) + Me.SplitContainer6.Panel1.Controls.Add(Me.Fdevtype) + Me.SplitContainer6.Panel1.Controls.Add(Me.FdevPort) + Me.SplitContainer6.Panel1.Controls.Add(Me.FdevPortCom) + Me.SplitContainer6.Panel1.Controls.Add(Me.FdevPortText) + Me.SplitContainer6.Panel1.Controls.Add(Me.FdevtypeCom) + ' + 'SplitContainer6.Panel2 + ' + Me.SplitContainer6.Panel2.Controls.Add(Me.Button2) + Me.SplitContainer6.Size = New System.Drawing.Size(703, 29) + Me.SplitContainer6.SplitterDistance = 656 + Me.SplitContainer6.TabIndex = 30 + ' + 'FdevAddr + ' + Me.FdevAddr.AutoSize = True + Me.FdevAddr.CausesValidation = False + Me.FdevAddr.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.FdevAddr.Location = New System.Drawing.Point(421, 8) + Me.FdevAddr.Name = "FdevAddr" + Me.FdevAddr.Size = New System.Drawing.Size(161, 14) + Me.FdevAddr.TabIndex = 17 + Me.FdevAddr.Text = "Parent device address:" + Me.FdevAddr.Visible = False + ' + 'Fdevtype + ' + Me.Fdevtype.AutoSize = True + Me.Fdevtype.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.Fdevtype.Location = New System.Drawing.Point(7, 8) + Me.Fdevtype.Name = "Fdevtype" + Me.Fdevtype.Size = New System.Drawing.Size(140, 14) + Me.Fdevtype.TabIndex = 20 + Me.Fdevtype.Text = "Parent device type:" + Me.Fdevtype.Visible = False + ' + 'FdevPort + ' + Me.FdevPort.AutoSize = True + Me.FdevPort.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.FdevPort.Location = New System.Drawing.Point(208, 8) + Me.FdevPort.Name = "FdevPort" + Me.FdevPort.Size = New System.Drawing.Size(140, 14) + Me.FdevPort.TabIndex = 22 + Me.FdevPort.Text = "Parent device port:" + Me.FdevPort.Visible = False + ' + 'FdevPortCom + ' + Me.FdevPortCom.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.FdevPortCom.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.FdevPortCom.FormattingEnabled = True + Me.FdevPortCom.Location = New System.Drawing.Point(349, 3) + Me.FdevPortCom.Name = "FdevPortCom" + Me.FdevPortCom.Size = New System.Drawing.Size(68, 24) + Me.FdevPortCom.TabIndex = 21 + Me.FdevPortCom.Visible = False ' 'FdevPortText ' @@ -206,50 +260,49 @@ Partial Class AddPeripherals Me.FdevtypeCom.TabIndex = 19 Me.FdevtypeCom.Visible = False ' - 'FdevPortCom + 'Button2 ' - Me.FdevPortCom.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.FdevPortCom.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.FdevPortCom.FormattingEnabled = True - Me.FdevPortCom.Location = New System.Drawing.Point(349, 3) - Me.FdevPortCom.Name = "FdevPortCom" - Me.FdevPortCom.Size = New System.Drawing.Size(68, 24) - Me.FdevPortCom.TabIndex = 21 - Me.FdevPortCom.Visible = False + Me.Button2.Dock = System.Windows.Forms.DockStyle.Fill + Me.Button2.Font = New System.Drawing.Font("黑体", 5.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.Button2.Location = New System.Drawing.Point(0, 0) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(43, 29) + Me.Button2.TabIndex = 1 + Me.Button2.Text = "···" + Me.Button2.UseVisualStyleBackColor = True ' - 'FdevPort + 'TextBox3 ' - Me.FdevPort.AutoSize = True - Me.FdevPort.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.FdevPort.Location = New System.Drawing.Point(208, 8) - Me.FdevPort.Name = "FdevPort" - Me.FdevPort.Size = New System.Drawing.Size(140, 14) - Me.FdevPort.TabIndex = 22 - Me.FdevPort.Text = "Parent device port:" - Me.FdevPort.Visible = False + Me.TextBox3.Enabled = False + Me.TextBox3.Location = New System.Drawing.Point(1307, 90) + Me.TextBox3.MaxLength = 8 + Me.TextBox3.Name = "TextBox3" + Me.TextBox3.Size = New System.Drawing.Size(92, 21) + Me.TextBox3.TabIndex = 29 + Me.TextBox3.WordWrap = False ' - 'Fdevtype + 'Label9 ' - Me.Fdevtype.AutoSize = True - Me.Fdevtype.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.Fdevtype.Location = New System.Drawing.Point(7, 8) - Me.Fdevtype.Name = "Fdevtype" - Me.Fdevtype.Size = New System.Drawing.Size(140, 14) - Me.Fdevtype.TabIndex = 20 - Me.Fdevtype.Text = "Parent device type:" - Me.Fdevtype.Visible = False + Me.Label9.AutoSize = True + Me.Label9.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.Label9.Location = New System.Drawing.Point(1194, 93) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(112, 14) + Me.Label9.TabIndex = 28 + Me.Label9.Text = "Bluetooth Name:" + Me.Label9.Visible = False ' - 'FdevAddr + 'CheckBox6 ' - Me.FdevAddr.AutoSize = True - Me.FdevAddr.CausesValidation = False - Me.FdevAddr.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.FdevAddr.Location = New System.Drawing.Point(421, 8) - Me.FdevAddr.Name = "FdevAddr" - Me.FdevAddr.Size = New System.Drawing.Size(161, 14) - Me.FdevAddr.TabIndex = 17 - Me.FdevAddr.Text = "Parent device address:" - Me.FdevAddr.Visible = False + Me.CheckBox6.AutoSize = True + Me.CheckBox6.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.CheckBox6.Location = New System.Drawing.Point(1263, 67) + Me.CheckBox6.Name = "CheckBox6" + Me.CheckBox6.Size = New System.Drawing.Size(145, 18) + Me.CheckBox6.TabIndex = 24 + Me.CheckBox6.Text = "Valveless machine" + Me.CheckBox6.UseVisualStyleBackColor = True + Me.CheckBox6.Visible = False ' 'CheckBox5 ' @@ -267,7 +320,7 @@ Partial Class AddPeripherals ' Me.CheckBox4.AutoSize = True Me.CheckBox4.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.CheckBox4.Location = New System.Drawing.Point(966, 91) + Me.CheckBox4.Location = New System.Drawing.Point(926, 93) Me.CheckBox4.Name = "CheckBox4" Me.CheckBox4.Size = New System.Drawing.Size(215, 18) Me.CheckBox4.TabIndex = 15 @@ -288,7 +341,7 @@ Partial Class AddPeripherals ' Me.CheckBox3.AutoSize = True Me.CheckBox3.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.CheckBox3.Location = New System.Drawing.Point(752, 91) + Me.CheckBox3.Location = New System.Drawing.Point(712, 93) Me.CheckBox3.Name = "CheckBox3" Me.CheckBox3.Size = New System.Drawing.Size(208, 18) Me.CheckBox3.TabIndex = 13 @@ -514,59 +567,6 @@ Partial Class AddPeripherals Me.Button1.Text = "OK" Me.Button1.UseVisualStyleBackColor = True ' - 'TextBox3 - ' - Me.TextBox3.Enabled = False - Me.TextBox3.Location = New System.Drawing.Point(1307, 90) - Me.TextBox3.MaxLength = 8 - Me.TextBox3.Name = "TextBox3" - Me.TextBox3.Size = New System.Drawing.Size(92, 21) - Me.TextBox3.TabIndex = 29 - Me.TextBox3.WordWrap = False - ' - 'Label9 - ' - Me.Label9.AutoSize = True - Me.Label9.Font = New System.Drawing.Font("宋体", 10.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.Label9.Location = New System.Drawing.Point(1194, 93) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(112, 14) - Me.Label9.TabIndex = 28 - Me.Label9.Text = "Bluetooth Name:" - Me.Label9.Visible = False - ' - 'SplitContainer6 - ' - Me.SplitContainer6.Location = New System.Drawing.Point(3, 89) - Me.SplitContainer6.Name = "SplitContainer6" - ' - 'SplitContainer6.Panel1 - ' - Me.SplitContainer6.Panel1.Controls.Add(Me.FdevAddr) - Me.SplitContainer6.Panel1.Controls.Add(Me.Fdevtype) - Me.SplitContainer6.Panel1.Controls.Add(Me.FdevPort) - Me.SplitContainer6.Panel1.Controls.Add(Me.FdevPortCom) - Me.SplitContainer6.Panel1.Controls.Add(Me.FdevPortText) - Me.SplitContainer6.Panel1.Controls.Add(Me.FdevtypeCom) - ' - 'SplitContainer6.Panel2 - ' - Me.SplitContainer6.Panel2.Controls.Add(Me.Button2) - Me.SplitContainer6.Size = New System.Drawing.Size(703, 29) - Me.SplitContainer6.SplitterDistance = 656 - Me.SplitContainer6.TabIndex = 30 - ' - 'Button2 - ' - Me.Button2.Dock = System.Windows.Forms.DockStyle.Fill - Me.Button2.Font = New System.Drawing.Font("黑体", 5.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.Button2.Location = New System.Drawing.Point(0, 0) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(43, 29) - Me.Button2.TabIndex = 1 - Me.Button2.Text = "···" - Me.Button2.UseVisualStyleBackColor = True - ' 'AddPeripherals ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!) @@ -590,6 +590,11 @@ Partial Class AddPeripherals Me.SplitContainer2.Panel2.ResumeLayout(False) CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer2.ResumeLayout(False) + Me.SplitContainer6.Panel1.ResumeLayout(False) + Me.SplitContainer6.Panel1.PerformLayout() + Me.SplitContainer6.Panel2.ResumeLayout(False) + CType(Me.SplitContainer6, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainer6.ResumeLayout(False) Me.SplitContainer4.Panel1.ResumeLayout(False) Me.SplitContainer4.Panel2.ResumeLayout(False) CType(Me.SplitContainer4, System.ComponentModel.ISupportInitialize).EndInit() @@ -598,11 +603,6 @@ Partial Class AddPeripherals Me.SplitContainer5.Panel2.ResumeLayout(False) CType(Me.SplitContainer5, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer5.ResumeLayout(False) - Me.SplitContainer6.Panel1.ResumeLayout(False) - Me.SplitContainer6.Panel1.PerformLayout() - Me.SplitContainer6.Panel2.ResumeLayout(False) - CType(Me.SplitContainer6, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainer6.ResumeLayout(False) Me.ResumeLayout(False) End Sub diff --git a/BLV_Studio/Test/GridTest/ReportingScenario.vb b/BLV_Studio/Test/GridTest/ReportingScenario.vb index 4cce31e..4bb08a1 100644 --- a/BLV_Studio/Test/GridTest/ReportingScenario.vb +++ b/BLV_Studio/Test/GridTest/ReportingScenario.vb @@ -127,11 +127,11 @@ Public Class ReportingScenario For k = NCtabRange.fc To NCtabRange.lc '遍历当前节点下属回路集合 If _grd.Column(k).Visible = True Then '过滤隐藏的回路 NodeLoopname = _grd.Cell(TableInteraction.TableRowNumber.FunctionChildNodeAnother, k).Text.Replace(vbLf, "").Replace(vbCr， "").Replace(":"， "").Replace("\"， "").Replace("/"， "").Replace("|"， "").Replace("'", "").Replace("'", "").Replace("?", "").Replace("!", "").Replace("`", "") - If DevNode.Nodes.Count = 1 Then - NodeLoop = 0 - Else - NodeLoop = _grd.Cell(TableInteraction.TableRowNumber.FunctionChildNodeID, k).Text - End If + 'If DevNode.Nodes.Count = 1 Then + ' NodeLoop = 0 + 'Else + NodeLoop = _grd.Cell(TableInteraction.TableRowNumber.FunctionChildNodeID, k).Text + 'End If NodeLoop = $"{DevNode.DEV_TYPE_DATA.PadLeft(3, "0")}{devAddr.PadLeft(3, "0")}{NodeLoop.PadLeft(3, "0")}" If dic.ContainsKey(NodeLoop) Then Continue For diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb index f9ba290..e3812ad 100644 --- a/BLV_Studio/Test/GridTest/TableInteraction.vb +++ b/BLV_Studio/Test/GridTest/TableInteraction.vb @@ -4303,28 +4303,36 @@ Public Class TableInteraction Dbuf = dic.Item(GetDescriptionOriginal（AddPeripherals.Temproweven.互锁)).Trim.Split("*") ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16")) End If - If FVer >67 Then + If FVer =67 Then Dim btxtr As string - Dim bctr As Integer=32 + Dim bctr As Integer=48 If checkbuf(1).Equals("1") Then - bctr=bctr or (1<<2) + bctr=bctr or (1<<2) + bctr=bctr And Not (1 << 4) End If If checkbuf(3).Equals("1") Then bctr=bctr or (1<<3) - End If - + bctr=bctr And Not (1 << 4) + End If + If bctr And (1<<4) Then + bctr=bctr or (1<<2) + bctr=bctr or (1<<3) + Else + + End If btxtr= $"0,2,0,2,1,0,0" dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr) btxli(5) = bctr ncbuf.Add(btxli) + Else If FVer > 67 Then Else If checkbuf(1).Equals("1") Then 'Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*") ncbuf.Add(GetActionData(DeviceModuleDic, hostname, "MUSIC", 1, "0,2,3,1,11,0")) End If - If checkbuf(3).Equals("1") Then + If checkbuf(3).Equals("1") Then ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,2,1,0,0")) Else ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,2,2,0,0")) @@ -4386,33 +4394,44 @@ Public Class TableInteraction ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16")) End If - If FVer >67 Then + If FVer =67 Then Dim btxtr As string Dim bctr As Integer=32 If checkbuf(1).Equals("1") Then - bctr=bctr or (1<<2) + bctr=bctr or (1<<2) + bctr=bctr And Not (1 << 4) End If If checkbuf(3).Equals("1") Then bctr=bctr or (1<<3) - End If + bctr=bctr And Not (1 << 4) + End If + If bctr And (1<<4) Then + bctr=bctr or (1<<2) + bctr=bctr or (1<<3) + Else + + End If + btxtr= $"0,2,0,2,1,0,0" dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr) btxli(5) = bctr ncbuf.Add(btxli) + Else If FVer > 67 Then + Else If checkbuf(1).Equals("1") Then - Dbuf = dic.Item(GetDescriptionOriginal（AddPeripherals.Temproweven.互锁)).Trim.Split("*") + Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*") ncbuf.Add(GetActionData(DeviceModuleDic, hostname, "MUSIC", 1, "0,2,3,1,12,0")) End If - If checkbuf(3).Equals("1") Then ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,2,1,0,0")) Else ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,2,2,0,0")) End If End If + Case 3 '冷阀开 UShort.TryParse(1028, strEventNum) eventNum = BitConverter.GetBytes(strEventNum)