空调增加自动风勾选框

BLV_Studio/Test/GridTest/AddPeripherals.Designer.vb

@@ -26,6 +26,7 @@ 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.ComboBox2 = New System.Windows.Forms.ComboBox()
         Me.TextBox3 = New System.Windows.Forms.TextBox()
         Me.Label9 = New System.Windows.Forms.Label()
         Me.CheckBox6 = New System.Windows.Forms.CheckBox()
@@ -60,7 +61,7 @@ Partial Class AddPeripherals
         Me.Grid1 = New FlexCell.Grid()
         Me.Temp_Grid = New FlexCell.Grid()
         Me.Button1 = New System.Windows.Forms.Button()
-        Me.ComboBox2 = New System.Windows.Forms.ComboBox()
+        Me.CheckBox7 = New System.Windows.Forms.CheckBox()
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer1.Panel1.SuspendLayout()
         Me.SplitContainer1.Panel2.SuspendLayout()
@@ -143,6 +144,7 @@ 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)
@@ -173,10 +175,21 @@ Partial Class AddPeripherals
         Me.SplitContainer2.SplitterDistance = 116
         Me.SplitContainer2.TabIndex = 0
         '
+        'ComboBox2
+        '
+        Me.ComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.ComboBox2.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
+        Me.ComboBox2.FormattingEnabled = True
+        Me.ComboBox2.Location = New System.Drawing.Point(1230, 87)
+        Me.ComboBox2.Name = "ComboBox2"
+        Me.ComboBox2.Size = New System.Drawing.Size(54, 24)
+        Me.ComboBox2.TabIndex = 28
+        Me.ComboBox2.Visible = False
+        '
         'TextBox3
         '
         Me.TextBox3.Enabled = False
-        Me.TextBox3.Location = New System.Drawing.Point(1036, 88)
+        Me.TextBox3.Location = New System.Drawing.Point(1132, 89)
         Me.TextBox3.MaxLength = 8
         Me.TextBox3.Name = "TextBox3"
         Me.TextBox3.Size = New System.Drawing.Size(92, 21)
@@ -187,7 +200,7 @@ Partial Class AddPeripherals
         '
         Me.Label9.AutoSize = True
         Me.Label9.Font = New System.Drawing.Font("宋体", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.Label9.Location = New System.Drawing.Point(935, 88)
+        Me.Label9.Location = New System.Drawing.Point(1031, 89)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(95, 19)
         Me.Label9.TabIndex = 26
@@ -243,7 +256,7 @@ Partial Class AddPeripherals
         '
         Me.CheckBox3.AutoSize = True
         Me.CheckBox3.Font = New System.Drawing.Font("宋体", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.CheckBox3.Location = New System.Drawing.Point(768, 87)
+        Me.CheckBox3.Location = New System.Drawing.Point(761, 92)
         Me.CheckBox3.Name = "CheckBox3"
         Me.CheckBox3.Size = New System.Drawing.Size(161, 23)
         Me.CheckBox3.TabIndex = 13
@@ -255,7 +268,7 @@ Partial Class AddPeripherals
         '
         Me.CheckBox2.AutoSize = True
         Me.CheckBox2.Font = New System.Drawing.Font("宋体", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.CheckBox2.Location = New System.Drawing.Point(768, 67)
+        Me.CheckBox2.Location = New System.Drawing.Point(761, 67)
         Me.CheckBox2.Name = "CheckBox2"
         Me.CheckBox2.Size = New System.Drawing.Size(142, 23)
         Me.CheckBox2.TabIndex = 12
@@ -569,16 +582,17 @@ Partial Class AddPeripherals
         Me.Button1.Text = "确定"
         Me.Button1.UseVisualStyleBackColor = True
         '
-        'ComboBox2
+        'CheckBox7
         '
-        Me.ComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.ComboBox2.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.ComboBox2.FormattingEnabled = True
-        Me.ComboBox2.Location = New System.Drawing.Point(1134, 86)
-        Me.ComboBox2.Name = "ComboBox2"
-        Me.ComboBox2.Size = New System.Drawing.Size(54, 24)
-        Me.ComboBox2.TabIndex = 28
-        Me.ComboBox2.Visible = False
+        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
         '
@@ -659,4 +673,5 @@ 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

BLV_Studio/Test/GridTest/AddPeripherals.vb

@@ -277,7 +277,12 @@ Public Class AddPeripherals
                     End Select
 
                 Else
-                    Exit For
+                    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
 
@@ -291,6 +296,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, "设备存在"， "水机无阀")
@@ -781,7 +787,7 @@ Public Class AddPeripherals
             Dim Rchenk() As String = Resultmodel.Desc.DevDescription.Split(",")
             Dim ischenk As Integer = 0
             For i = 0 To Rchenk.Length - 1
-                If i < 3 Then
+                If i < 4 Then
                     ischenk = 0
                     Integer.TryParse(Rchenk(i), ischenk)
                     Select Case i
@@ -791,10 +797,17 @@ Public Class AddPeripherals
                             CheckBox2.Checked = ischenk
                         Case 2
                             CheckBox3.Checked = ischenk
+                        Case 3
+                            CheckBox5.Checked = ischenk
                     End Select
 
                 Else
-                    Exit For
+                    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
 
@@ -808,6 +821,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, "设备存在"， "水机无阀")
@@ -1425,6 +1439,11 @@ 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

BLV_Studio/Test/GridTest/TableInteraction.vb

@@ -4573,6 +4573,10 @@ 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)
                     eventNum = BitConverter.GetBytes(strEventNum)
@@ -4592,6 +4596,9 @@ 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)