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

BLV_Studio/BLV_Studio.vbproj.user

@@ -9,7 +9,7 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>zh-CN</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>

BLV_Studio/EnergySavingAttribute.vb

@@ -561,8 +561,8 @@ Public Class EnergySavingAttribute
             li.AddRange(Tli)
         End If
 
-
+        API_LoopUpdateToServer(G_roomtypeid， li)
-        '插入数据到数据库
+        ''插入数据到数据库
         Deletetbl_room_type_circuit_powers(G_Hotelid, G_roomtypeid， li)
         GenerateTransactionInsertionStatements(G_Hotelid, G_roomtypeid， li)
         If API_AllocationBarCode(G_Hotelid, G_roomtypeid， li) Then
@@ -572,6 +572,56 @@ Public Class EnergySavingAttribute
         End If
 
     End Sub
+
+    Public Function API_LoopUpdateToServer(roomtypeid As String, insertClunm As List(Of Dictionary(Of String, Object)))
+        If IsNothing(insertClunm) AndAlso insertClunm.Count = 0 Then Return False
+        Dim dic As New Dictionary(Of String， Object)
+        dic.Add("roomtype_id", roomtypeid)
+        Dim li As New List(Of Dictionary(Of String, Object))
+        dic.Add("CarbonVIPList", li)
+        For Each item In insertClunm
+            If item.Values(2).ToString.Equals("1") Then
+                Dim lidic As New Dictionary(Of String, Object)
+                lidic.Add("ModalAddress", item.Values(4))
+                lidic.Add("IsUploadBaoJing", True)
+                li.Add(lidic)
+            End If
+
+        Next
+        Dim jsonString As String = String.Empty
+        Dim jsonDatastr As String = JsonConvert.SerializeObject(dic)
+        Try
+            jsonString = HttpMothod.PostData2("https://www.boonlive-rcu.com/api/SaveRoomTypeModal_CarbonVIP", jsonDatastr)
+        Catch ex As Exception
+            MsgBox($"网络API调用错误，请联系管理员。")
+            Return Nothing
+        End Try
+        'Console.WriteLine(jsonString)
+
+        If jsonString = Nothing Then
+            Return False
+        End If
+
+        Dim login As Dictionary(Of String， String)
+        Try
+            login = JsonConvert.DeserializeObject(Of Dictionary(Of String， String))(jsonString)
+            If Not IsNothing(login) AndAlso login.ContainsKey("IsSuccess") Then
+                If login.Item("IsSuccess").Equals("true") Then
+                    Return True
+                Else
+                    Return False
+                End If
+                Return False
+            Else
+                Return False
+            End If
+        Catch ex As Exception
+            'MsgBox($"Json数据转换错误，请联系管理员。详情 ：Json data to AllocationAPI  error")
+            Return False
+        End Try
+
+    End Function
+
     '插入数据到数据库
     Public Function Deletetbl_room_type_circuit_powers(hotelID As String， roomtypeid As String, insertClunm As List(Of Dictionary(Of String, Object))) As Boolean
         If IsNothing(insertClunm) AndAlso insertClunm.Count = 0 Then Return False

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.TvwMain.CheckBoxes = True
-        Me.ToolStripButton23.Image = CType(resources.GetObject("ToolStripButton23.Image"), System.Drawing.Image)
+        Me.TvwMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.ToolStripButton23.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.TvwMain.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.ToolStripButton23.Name = "ToolStripButton23"
+        Me.TvwMain.ImageKey = "OTHERS"
-        Me.ToolStripButton23.Size = New System.Drawing.Size(60, 37)
+        Me.TvwMain.ImageList = Me.ImgLstMain
-        Me.ToolStripButton23.Text = "上传设备"
+        Me.TvwMain.ItemHeight = 60
-        Me.ToolStripButton23.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.TvwMain.Location = New System.Drawing.Point(3, 3)
-        Me.ToolStripButton23.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        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
         '

BLV_Studio/FrmMain.resx

@@ -179,7 +179,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
-        PgAAAk1TRnQBSQFMAgEBQgEAAYABIwGAASMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        PgAAAk1TRnQBSQFMAgEBQgEAAVABJAFQASQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARABAQIAAQEBAAEIBgABRBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
         AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
         AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
@@ -468,12 +468,6 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>82</value>
   </metadata>
-  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>188, 55</value>
-  </metadata>
-  <metadata name="CustomInstaller2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>361, 55</value>
-  </metadata>
   <data name="PictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAW0AAABbCAYAAAC4VdQmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
@@ -708,9 +702,6 @@
         w4fXohzSfo/RpBT6//AY2YQM5nBRfAMSHREeGw8GSAAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>973, 55</value>
-  </metadata>
   <data name="Label3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -729,21 +720,6 @@
   <metadata name="toopMax.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>868, 55</value>
   </metadata>
-  <metadata name="ToolStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>512, 55</value>
-  </metadata>
-  <metadata name="ToolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>685, 17</value>
-  </metadata>
-  <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>360, 17</value>
-  </metadata>
-  <metadata name="ToolStrip5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>624, 55</value>
-  </metadata>
-  <metadata name="toopMax.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>868, 55</value>
-  </metadata>
   <data name="ToolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -1509,6 +1485,18 @@
         RCgpAQTV7phjDTf3BSWV91b0JLzckyAovPhcbBkiA22mL7Nq28lumPFKCiIJfzK4/mVEyP6b8UiHt0I8
         mW5/G4Ne96I4q0TJgqwXltzzAW2t9JcsLhA9KwuiN2VB9KYsiN6UBdGbsiD6EsBfg8WpfkOxyKEAAAAA
         SUVORK5CYII=
+</value>
+  </data>
+  <data name="ToolStripButton23.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE9SURBVDhPtVKva8NAGI2czL8wt8nJ2sDEBhOLW9wIEZWl
+        svbUqCphIoSKwVUUMncThZspnBlkIhAz6OTJycq3+/JjqcgtndiD4+6+vPe+j9xz/gVyqxCOGXyzwgmD
+        orvZm8/DICGZ0LkSk9n9HwwO0Yq9u18MyjcJsZyDJzPIjbAS83UKGfnVUk9pxyMxoKCLEN7lhdVARgH2
+        yRR67IPdjDoeT1glFotTKqIs8l4TMiAxv/UwOjvvOOpVIDBF58QBX3HrBPkqBbvy4Lou+MOs431pDf25
+        swoHkb+X1ZuXRXmUCXGbYw0q0FNdH/nWvZmg4tAE1EhsZH+ogohh/phh91GbiJcc04k2ZIXsuU5lO2mc
+        9Pxo6k5paxNHYrUF4sUeYRT/GBxyetFOQJ0rsdnN1S6wgcZuOiNb2+LtON/B6OzDMC9GwAAAAABJRU5E
+        rkJggg==
 </value>
   </data>
   <metadata name="ToolStrip5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -1587,21 +1575,6 @@
         SUVORK5CYII=
 </value>
   </data>
-  <data name="ToolStripButton23.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE9SURBVDhPtVKva8NAGI2czL8wt8nJ2sDEBhOLW9wIEZWl
-        svbUqCphIoSKwVUUMncThZspnBlkIhAz6OTJycq3+/JjqcgtndiD4+6+vPe+j9xz/gVyqxCOGXyzwgmD
-        orvZm8/DICGZ0LkSk9n9HwwO0Yq9u18MyjcJsZyDJzPIjbAS83UKGfnVUk9pxyMxoKCLEN7lhdVARgH2
-        yRR67IPdjDoeT1glFotTKqIs8l4TMiAxv/UwOjvvOOpVIDBF58QBX3HrBPkqBbvy4Lou+MOs431pDf25
-        swoHkb+X1ZuXRXmUCXGbYw0q0FNdH/nWvZmg4tAE1EhsZH+ogohh/phh91GbiJcc04k2ZIXsuU5lO2mc
-        9Pxo6k5paxNHYrUF4sUeYRT/GBxyetFOQJ0rsdnN1S6wgcZuOiNb2+LtON/B6OzDMC9GwAAAAABJRU5E
-        rkJggg==
-</value>
-  </data>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>82</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
@@ -1768,4 +1741,10 @@
         AAA=
 </value>
   </data>
+  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>188, 55</value>
+  </metadata>
+  <metadata name="CustomInstaller2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>361, 55</value>
+  </metadata>
 </root>

BLV_Studio/FrmMain.vb

@@ -2197,6 +2197,7 @@ Public Class FrmMain
             If projectCompile(tmp_Local_XmlFullName, False, True, devdic) Then
                 '取当前时间
                 ReleaseConfigXmlToDB(tmpPath, tmpXmlName, cfgVer, newcfgVer, devdic)
+                UploadDeviceList1(cfgVer)
             Else
 
             End If
@@ -4856,6 +4857,8 @@ Public Class FrmMain
 
                     '取当前时间
                     ReleaseConfigBLVToDB(tmpPath, tmpXmlName, cfgVer, newcfgVer, devdic)
+                    UploadDeviceList(cfgVer)
+                    UploadConfigurationLoop()
                 Else
                     Releaseflag = True
                 End If
@@ -4869,6 +4872,206 @@ Public Class FrmMain
             MsgBox("请选择发布节点")
         End If
     End Sub
+    '上传配置回路
+    Public Sub UploadConfigurationLoop()
+
+        Dim mSaveRoomTypeModal As SaveRoomTypeModal
+        Dim mSaveRoomTypeModalList As New List(Of SaveRoomTypeModal)
+        Dim mSaveRoomTypeModalDic As New Dictionary(Of String, SaveRoomTypeModal)
+        'mSaveRoomTypeModalList.AddRange(mSaveRoomTypeModalDic.Values.ToArray)
+        '获取本地配置回路
+        Dim nReportingScenario = _TableInteraction.TestReportingScenario1()
+        Dim li As List(Of MDevNodeMessage) = nReportingScenario.getDateDisposeRuning
+        Dim bdic As Dictionary(Of String, String) = nReportingScenario.getDevloop()
+
+        Dim roomtypeid As Integer = _project.RoomType(g_CurrentTreeNodeRoomTypeItemIndex).structRoomType_ID
+        For Each item In li
+            If mSaveRoomTypeModalDic.ContainsKey(item.ModalAddress) Then
+                Continue For
+            Else
+                mSaveRoomTypeModal = Localconfigurationloopfiltering(roomtypeid, item.ModalAddress, item.Name)
+                If Not IsNothing(mSaveRoomTypeModal) Then
+                    '判断类型为 24 的 名称只取前2个字符
+                    If item.Type.Equals("4") Then
+                        '判断名称长度是否大于2
+                        If item.Name.Length > 2 Then
+                            mSaveRoomTypeModal.name = item.Name.Replace("服务", "")
+                            mSaveRoomTypeModalDic.Add(item.ModalAddress, mSaveRoomTypeModal)
+                        Else
+                            mSaveRoomTypeModalDic.Add(item.ModalAddress, mSaveRoomTypeModal)
+                        End If
+
+                    Else
+                        mSaveRoomTypeModalDic.Add(item.ModalAddress, mSaveRoomTypeModal)
+                    End If
+                End If
+
+
+            End If
+
+        Next
+        For Each item In bdic
+            mSaveRoomTypeModal = Localconfigurationloopfiltering(roomtypeid, item.Key, item.Value)
+            If mSaveRoomTypeModalDic.ContainsKey(item.Key) Then
+                Continue For
+            Else
+                mSaveRoomTypeModalDic.Add(item.Key, mSaveRoomTypeModal)
+            End If
+        Next
+
+
+        '获取服务器回路
+        Dim jsonString As String = HttpMothod.PostData("https://www.boonlive-rcu.com/api/LoadRoomTypeModalsWithPage", $"roomTypeID={roomtypeid}")
+        If String.IsNullOrWhiteSpace(jsonString) Then
+            MsgBox("获取服务器回路信息失败！")
+            Return
+        End If
+
+        Dim login As RoomDeviceResponse = JsonConvert.DeserializeObject(Of RoomDeviceResponse)(jsonString)
+
+        '修正最终上传链表
+        If Not IsNothing(login) AndAlso login.total > 0 Then
+            For Each item In login.rows
+                If mSaveRoomTypeModalDic.ContainsKey(item.ModalAddress) Then
+                    mSaveRoomTypeModal = mSaveRoomTypeModalDic.Item(item.ModalAddress)
+                    mSaveRoomTypeModal.Abnormal = item.Abnormal
+                    mSaveRoomTypeModal.id = 0
+                    mSaveRoomTypeModal.roomTypeID = item.RoomTypeID
+                    mSaveRoomTypeModal.modalAddress = item.ModalAddress
+                    mSaveRoomTypeModal.outlet = item.Outlet
+                    mSaveRoomTypeModal.englishName = item.EnglishName
+                    mSaveRoomTypeModal.power = item.Power
+                    mSaveRoomTypeModal.twName = item.TWName
+                    mSaveRoomTypeModal.aliasName = item.AliasName
+                    mSaveRoomTypeModal.type = item.Type
+                    mSaveRoomTypeModal.sort = item.Sort
+                    mSaveRoomTypeModal.color = item.Color
+                    mSaveRoomTypeModal.ActiveIndicator = item.ActiveIndicator
+                    mSaveRoomTypeModal.LowPower = item.LowPower
+                    mSaveRoomTypeModal.OfflineDisplay = item.OfflineDisplay
+                    mSaveRoomTypeModal.LowPowerDisplay = item.LowPowerDisplay
+                    mSaveRoomTypeModal.Beep = item.Beep
+                    mSaveRoomTypeModal.Abnormal = item.Abnormal
+                    mSaveRoomTypeModal.MultipleGroupID = item.MultipleGroupID
+                    mSaveRoomTypeModal.MultipleTCLName = item.MultipleTCLName
+                    mSaveRoomTypeModal.TCLDeviceName = item.TCLDeviceName
+                    mSaveRoomTypeModal.IsUploadBaoJing = 0
+                Else
+                    mSaveRoomTypeModal = New SaveRoomTypeModal
+                    mSaveRoomTypeModalDic.Add(item.ModalAddress, mSaveRoomTypeModal)
+                    mSaveRoomTypeModal.Abnormal = item.Abnormal
+                    mSaveRoomTypeModal.id = 0
+                    mSaveRoomTypeModal.roomTypeID = item.RoomTypeID
+                    mSaveRoomTypeModal.modalAddress = item.ModalAddress
+                    mSaveRoomTypeModal.outlet = item.Outlet
+                    mSaveRoomTypeModal.name = item.Name
+                    mSaveRoomTypeModal.englishName = item.EnglishName
+                    mSaveRoomTypeModal.power = item.Power
+                    mSaveRoomTypeModal.twName = item.TWName
+                    mSaveRoomTypeModal.aliasName = item.AliasName
+                    mSaveRoomTypeModal.type = item.Type
+                    mSaveRoomTypeModal.sort = item.Sort
+                    mSaveRoomTypeModal.color = item.Color
+                    mSaveRoomTypeModal.ActiveIndicator = item.ActiveIndicator
+                    mSaveRoomTypeModal.LowPower = item.LowPower
+                    mSaveRoomTypeModal.OfflineDisplay = item.OfflineDisplay
+                    mSaveRoomTypeModal.LowPowerDisplay = item.LowPowerDisplay
+                    mSaveRoomTypeModal.Beep = item.Beep
+                    mSaveRoomTypeModal.Abnormal = item.Abnormal
+                    mSaveRoomTypeModal.MultipleGroupID = item.MultipleGroupID
+                    mSaveRoomTypeModal.MultipleTCLName = item.MultipleTCLName
+                    mSaveRoomTypeModal.TCLDeviceName = item.TCLDeviceName
+                    mSaveRoomTypeModal.IsUploadBaoJing = 0
+                End If
+            Next
+        End If
+
+        mSaveRoomTypeModalList.AddRange(mSaveRoomTypeModalDic.Values.ToArray)
+        Dim Data As String = JsonConvert.SerializeObject(mSaveRoomTypeModalList)
+
+        Dim url As String = "http://www.boonlive-rcu.com:7000/api/BaoYi/SaveRoomTypeModal"
+        jsonString = HttpMothod.PostData2(url, Data)
+
+        If String.IsNullOrWhiteSpace(jsonString) OrElse jsonString.ToUpper.Contains("False".ToUpper) Then
+            Console.WriteLine("保存失败！")
+        Else
+            Console.WriteLine("保存成功！")
+        End If
+        'item.Key, item.Value, "", "", "", "", "", "0", "0", "1", "0", "0", "0", "0", "1", "", "0", ""
+
+    End Sub
+    '本地配置回路过滤
+    Public Function Localconfigurationloopfiltering(roomtypeid As Integer, addr As String, name As String) As SaveRoomTypeModal
+        Dim mSaveRoomTypeModal As New SaveRoomTypeModal
+        mSaveRoomTypeModal.id = 0
+        mSaveRoomTypeModal.roomTypeID = roomtypeid
+        mSaveRoomTypeModal.modalAddress = addr
+        mSaveRoomTypeModal.name = name
+        mSaveRoomTypeModal.englishName = ""
+        mSaveRoomTypeModal.twName = ""
+        mSaveRoomTypeModal.aliasName = ""
+        mSaveRoomTypeModal.power = 0
+        mSaveRoomTypeModal.type = SetLoopInformation.GetLoopType1(mSaveRoomTypeModal.modalAddress)
+        mSaveRoomTypeModal.LowPower = 0
+        mSaveRoomTypeModal.ActiveIndicator = 1
+        mSaveRoomTypeModal.OfflineDisplay = 0
+        mSaveRoomTypeModal.LowPowerDisplay = 0
+        mSaveRoomTypeModal.Beep = 0
+        mSaveRoomTypeModal.Abnormal = 0
+        mSaveRoomTypeModal.sort = 1
+        mSaveRoomTypeModal.TCLDeviceName = ""
+        mSaveRoomTypeModal.MultipleGroupID = 0
+        mSaveRoomTypeModal.MultipleTCLName = ""
+        mSaveRoomTypeModal.IsUploadBaoJing = 0
+        mSaveRoomTypeModal.outlet = ""
+        mSaveRoomTypeModal.color = SetLoopInformation.GetColorFromString(mSaveRoomTypeModal.modalAddress)
+        '提取addr字符串中下标3到5的的字符 
+
+        Dim devtype, devloop As String
+        devloop = addr.Substring(6, 3)
+        If devloop.Equals("000") Then
+            Return mSaveRoomTypeModal
+        End If
+        devtype = addr.Substring(0, 3)
+        Select Case devtype
+            Case "001"
+                If name.Contains("继电器") Then
+                    Return Nothing
+                End If
+            Case "006" '开关类
+                mSaveRoomTypeModal.ActiveIndicator = 0
+                mSaveRoomTypeModal.OfflineDisplay = 1
+            Case "004"
+            Case "024"
+                If name.Contains("调光") Then
+                    Return Nothing
+                End If
+            Case "052"
+                If name.Contains("色温调节") Then
+                    Return Nothing
+                End If
+            Case "015"
+                mSaveRoomTypeModal.ActiveIndicator = 0
+                mSaveRoomTypeModal.OfflineDisplay = 1
+            Case "055"
+            Case "051"
+            Case "050"
+            Case "013"
+            Case "005"
+            Case "011"
+            Case "007"
+                mSaveRoomTypeModal.OfflineDisplay = 1
+            Case "054"
+            Case "037"
+                mSaveRoomTypeModal.ActiveIndicator = 0
+                mSaveRoomTypeModal.OfflineDisplay = 1
+            Case "009" '空气质量
+            Case Else
+                Return Nothing
+        End Select
+        Return mSaveRoomTypeModal
+    End Function
+
 
 
     Private Sub ToolStripButton13_Click(sender As Object, e As EventArgs) Handles ToolStripButton13.Click
@@ -5099,6 +5302,7 @@ Public Class FrmMain
     Private Sub ToolStripButton21_Click(sender As Object, e As EventArgs) Handles ToolStripButton21.Click
         Dim tmpXmlName As String = ""
         If Releaseflag And Not IsNothing(TvwMain.SelectedNode) Then
+
         Else
             MsgBox("请选择发布节点")
             Return
@@ -5178,12 +5382,12 @@ Public Class FrmMain
             End If
         End If
 
-        UploadDeviceList(FVer)
+        UploadDeviceList(FVer, True)
     End Sub
 
-    Public Sub UploadDeviceList(pzVer As Integer)
+    Public Sub UploadDeviceList(pzVer As Integer, Optional Releaseflag As Boolean = False)
         ' 1. 参数验证
-        If Not Releaseflag OrElse IsNothing(TvwMain.SelectedNode) Then
+        If IsNothing(TvwMain.SelectedNode) Then
             MsgBox("请选择发布节点")
             Return
         End If
@@ -5240,11 +5444,14 @@ Public Class FrmMain
 
                 db.Close()
 
-                If result > 0 Then
+                If Releaseflag Then
-                    MsgBox("设备列表上传成功")
+                    If result > 0 Then
-                Else
+                        MsgBox("设备列表上传成功")
-                    MsgBox("设备列表上传失败")
+                    Else
+                        MsgBox("设备列表上传失败")
+                    End If
                 End If
+
             End Using
 
         Catch ex As Exception
@@ -5290,12 +5497,12 @@ Public Class FrmMain
                 FVer = Convert.ToInt32(Firbuf(0))
             End If
         End If
-        UploadDeviceList1(FVer)
+        UploadDeviceList1(FVer, True)
 
 
 
     End Sub
-    Public Sub UploadDeviceList1(pzVer As Integer)
+    Public Sub UploadDeviceList1(pzVer As Integer, Optional Releaseflag As Boolean = False)
         Dim headnode As RowNode
         headnode = _grdModel._rootNode
         Dim childnode, D485node, Virtualnode As RowNode
@@ -5377,12 +5584,14 @@ Public Class FrmMain
                 Dim result As Integer = db.ExecuteNonQuery(insertStr)
 
                 db.Close()
-
+                If Releaseflag Then
-                If result > 0 Then
+                    If result > 0 Then
-                    MsgBox("设备列表上传成功")
+                        MsgBox("设备列表上传成功")
-                Else
+                    Else
-                    MsgBox("设备列表上传失败")
+                        MsgBox("设备列表上传失败")
+                    End If
                 End If
+
             End Using
 
         Catch ex As Exception
@@ -5469,6 +5678,22 @@ Public Class FrmMain
         Return updataDevnode
     End Function
 
+    Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged
+
+    End Sub
+
+    Private Sub TabControl3_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl3.SelectedIndexChanged
+
+    End Sub
+
+    Private Sub TabProject_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabProject.SelectedIndexChanged
+
+    End Sub
+
+    Private Sub TabControl2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl2.SelectedIndexChanged
+
+    End Sub
+
 
 
 

BLV_Studio/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("4.4.6.7")>
+<Assembly: AssemblyVersion("4.4.6.8")>
-<Assembly: AssemblyFileVersion("4.4.6.7")>
+<Assembly: AssemblyFileVersion("4.4.6.8")>

BLV_Studio/SetLoopInformation.vb

@@ -129,6 +129,7 @@ Public Class SetLoopInformation
         Grid1.Cell(0， 0).Text = "序号"
         Grid1.Cell(0， 1).Text = "服务器"
         Grid1.Cell(0， 2).Text = "碳达人"
+        Grid1.Column(2).Visible = True
         Grid1.Cell(0， 3).Text = "类型"
         Grid1.Cell(0， 4).Text = "回路地址"
         Grid1.Column(4).Locked = True
@@ -212,7 +213,7 @@ Public Class SetLoopInformation
         End With
     End Sub
 
-    Public Function GetLoopType1(addr As String) As String
+    Public Shared Function GetLoopType1(addr As String) As String
         Dim result As String
         If addr.Length > 2 Then
             Dim typestr As String = addr.Substring(0, 3)
@@ -314,7 +315,7 @@ Public Class SetLoopInformation
 
     End Function
 
-    Public Function GetLoopType(addr As String) As String
+    Public Shared Function GetLoopType(addr As String) As String
         Dim result As String
         If addr.Length > 2 Then
             Dim typestr As String = addr.Substring(0, 3)
@@ -657,7 +658,7 @@ Public Class SetLoopInformation
         End If
 
     End Sub
-    Public Function GetColorFromString(inputString As String) As String
+    Public Shared Function GetColorFromString(inputString As String) As String
         ' 检查输入字符串是否有效
         If String.IsNullOrEmpty(inputString) OrElse inputString.Length < 3 Then
             Throw New ArgumentException("输入字符串必须至少包含3个字符")

BLV_Studio/Test/GridTest/AddPeripherals.Designer.vb

@@ -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

BLV_Studio/Test/GridTest/AddPeripherals.vb

@@ -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

BLV_Studio/Test/GridTest/ReportingScenario.vb

@@ -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
+                                                'If DevNode.Nodes.Count = 1 Then
-                                                    NodeLoop = 0
+                                                '    NodeLoop = 0
-                                                Else
+                                                'Else
-                                                    NodeLoop = _grd.Cell(TableInteraction.TableRowNumber.FunctionChildNodeID, k).Text
+                                                NodeLoop = _grd.Cell(TableInteraction.TableRowNumber.FunctionChildNodeID, k).Text
-                                                End If
+                                                '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

BLV_Studio/Test/GridTest/TableInteraction.vb

@@ -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)