diff --git a/.vs/BLV_Studio/v16/.suo b/.vs/BLV_Studio/v16/.suo index 896950b..592b4b5 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 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)