Boonlive_RD_Web/Desktop_BLVStudio
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chenzhihao
2026-03-12 11:31:54 +08:00
parent 4f6a56bf6e
commit fea9bbfc0d
11 changed files with 417 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BLV_Studio/Test/GridTest/AddPeripherals.Designer.vb generated
View File

@@ -61,7 +61,6 @@ Partial Class AddPeripherals
Me.Grid1 = New FlexCell.Grid()
Me.Temp_Grid = New FlexCell.Grid()
Me.Button1 = New System.Windows.Forms.Button()
Me.CheckBox7 = New System.Windows.Forms.CheckBox()
CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer1.Panel1.SuspendLayout()
Me.SplitContainer1.Panel2.SuspendLayout()
@@ -144,7 +143,6 @@ Partial Class AddPeripherals
'
'SplitContainer2.Panel1
'
Me.SplitContainer2.Panel1.Controls.Add(Me.CheckBox7)
Me.SplitContainer2.Panel1.Controls.Add(Me.ComboBox2)
Me.SplitContainer2.Panel1.Controls.Add(Me.TextBox3)
Me.SplitContainer2.Panel1.Controls.Add(Me.Label9)
@@ -582,18 +580,6 @@ Partial Class AddPeripherals
Me.Button1.Text = "确定"
Me.Button1.UseVisualStyleBackColor = True
'
'CheckBox7
'
Me.CheckBox7.AutoSize = True
Me.CheckBox7.Font = New System.Drawing.Font("宋体", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
Me.CheckBox7.Location = New System.Drawing.Point(921, 89)
Me.CheckBox7.Name = "CheckBox7"
Me.CheckBox7.Size = New System.Drawing.Size(85, 23)
Me.CheckBox7.TabIndex = 29
Me.CheckBox7.Text = "自动风"
Me.CheckBox7.UseVisualStyleBackColor = True
Me.CheckBox7.Visible = False
'
'AddPeripherals
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
@@ -673,5 +659,4 @@ Partial Class AddPeripherals
Friend WithEvents Label9 As Label
Friend WithEvents TextBox3 As TextBox
Friend WithEvents ComboBox2 As ComboBox
Friend WithEvents CheckBox7 As CheckBox
End Class

23
BLV_Studio/Test/GridTest/AddPeripherals.vb
View File

@@ -277,12 +277,7 @@ Public Class AddPeripherals
End Select
Else
If g_DevType = FromDevType.Temp Then
If i = 4 Then
Integer.TryParse(Rchenk(i), ischenk)
CheckBox7.Checked = ischenk
End If
End If
End If
Next
@@ -296,7 +291,7 @@ Public Class AddPeripherals
CheckBox2.Visible = True
CheckBox5.Text = "风速模式提示音"
CheckBox5.Visible = True
CheckBox7.Visible = True
SplitContainer4.Panel1Collapsed = True
SplitContainer4.Panel2Collapsed = False
Dim val As String = FindAttributeValueUnderModel(Resultmodel, "设备存在"， "水机无阀")
@@ -802,12 +797,7 @@ Public Class AddPeripherals
End Select
Else
If g_DevType = FromDevType.Temp Then
If i = 4 Then
Integer.TryParse(Rchenk(i), ischenk)
CheckBox7.Checked = ischenk
End If
End If
End If
Next
@@ -821,7 +811,7 @@ Public Class AddPeripherals
CheckBox5.Text = "风速模式提示音"
CheckBox5.Visible = True
CheckBox4.Visible = True
CheckBox7.Visible = True
SplitContainer4.Panel1Collapsed = True
SplitContainer4.Panel2Collapsed = False
Dim val As String = FindAttributeValueUnderModel(Resultmodel, "设备存在"， "水机无阀")
@@ -1439,11 +1429,6 @@ Public Class AddPeripherals
Else
Resultmodel.Desc.DevDescription = $"{ Resultmodel.Desc.DevDescription},0"
End If
If CheckBox7.Checked Then
Resultmodel.Desc.DevDescription = $"{ Resultmodel.Desc.DevDescription},1"
Else
Resultmodel.Desc.DevDescription = $"{ Resultmodel.Desc.DevDescription},0"
End If
Else

10
BLV_Studio/Test/GridTest/ReportingScenario.vb
View File

@@ -158,11 +158,11 @@ Public Class ReportingScenario
If _grd.Column(k).Visible = True OrElse hide 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

17
BLV_Studio/Test/GridTest/TableInteraction.vb
View File

@@ -4270,10 +4270,12 @@ Public Class TableInteraction
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 or (1<<4)
End If
If checkbuf(3).Equals("1") Then
bctr=bctr or (1<<3)
bctr=bctr or (1<<4)
End If
btxtr= $"0,2,0,2,1,0,0"
@@ -4353,10 +4355,12 @@ Public Class TableInteraction
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 or (1<<4)
End If
If checkbuf(3).Equals("1") Then
bctr=bctr or (1<<3)
bctr=bctr or (1<<4)
End If
btxtr= $"0,2,0,2,1,0,0"
@@ -4573,9 +4577,8 @@ Public Class TableInteraction
Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.风高)).Trim.Split("*")
ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), Dbuf(2), Dbuf(1), Chr(TableColSwitchKeyDate.TurnDrown).ToString))
End Select
If checkbuf.Length>3 AndAlso checkbuf(4).Equals("1") Then 'czh 260110 在高风速时增加设置为自动风
ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,0,0,0,0"))
End If
Case 10 '风速高
UShort.TryParse(6152, strEventNum)
@@ -4596,9 +4599,7 @@ Public Class TableInteraction
Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.风高)).Trim.Split("*")
ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), Dbuf(2), Dbuf(1), Chr(TableColSwitchKeyDate.TurnOn).ToString))
End Select
If checkbuf.Length>3 AndAlso checkbuf(4).Equals("1") Then 'czh 260110 在高风速时增加设置为自动风
ncbuf.Add(GetActionData(DeviceModuleDic, DevName, "Temp", 1, "0,2,0,0,0,0,0"))
End If
Case 11 '控制
UShort.TryParse(30, strEventNum)
eventNum = BitConverter.GetBytes(strEventNum)