同步无卡取电功能

.gitignore

@@ -0,0 +1,7 @@
+packages
+BLV_Studio/bin
+BLV_Studio/bin
+BLV_Studio/bin/Debug
+BLV_Studio/bin/Debug/app.publish
+*.application
+BLV_Studio/obj

BLV_Studio/My Project/AssemblyInfo.vb

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

BLV_Studio/Test/GridTest/PowerSupply.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class PowerSupply
     Inherits System.Windows.Forms.Form
 
     'Form 重写 Dispose，以清理组件列表。
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,34 +20,33 @@ Partial Class PowerSupply
     '注意: 以下过程是 Windows 窗体设计器所必需的
     '可以使用 Windows 窗体设计器修改它。  
     '不要使用代码编辑器修改它。
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.CheckBox5 = New System.Windows.Forms.CheckBox()
+        Me.Label3 = New System.Windows.Forms.Label()
         Me.Button4 = New System.Windows.Forms.Button()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.TextBox1 = New System.Windows.Forms.TextBox()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.CheckBox3 = New System.Windows.Forms.CheckBox()
         Me.Button1 = New System.Windows.Forms.Button()
-        Me.CheckBox2 = New System.Windows.Forms.CheckBox()
-        Me.CheckBox1 = New System.Windows.Forms.CheckBox()
         Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
         Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
         Me.PortTable = New FlexCell.Grid()
-        Me.Button5 = New System.Windows.Forms.Button()
+        Me.CheckBox6 = New System.Windows.Forms.CheckBox()
-        Me.Button6 = New System.Windows.Forms.Button()
+        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
-        Me.Button3 = New System.Windows.Forms.Button()
+        Me.TextBox2 = New System.Windows.Forms.TextBox()
-        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Label5 = New System.Windows.Forms.Label()
         Me.NR_ComboBox1 = New System.Windows.Forms.ComboBox()
         Me.NR_TextBox2 = New System.Windows.Forms.TextBox()
         Me.NR_label3 = New System.Windows.Forms.Label()
         Me.CheckBox4 = New System.Windows.Forms.CheckBox()
-        Me.Button7 = New System.Windows.Forms.Button()
+        Me.Button5 = New System.Windows.Forms.Button()
-        Me.Button8 = New System.Windows.Forms.Button()
+        Me.Button6 = New System.Windows.Forms.Button()
-        Me.Button9 = New System.Windows.Forms.Button()
+        Me.Button3 = New System.Windows.Forms.Button()
-        Me.Button10 = New System.Windows.Forms.Button()
+        Me.Button2 = New System.Windows.Forms.Button()
         Me.IfGrid = New FlexCell.Grid()
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer1.Panel1.SuspendLayout()
@@ -74,48 +73,57 @@ Partial Class PowerSupply
         '
         Me.SplitContainer1.Panel1.Controls.Add(Me.Label4)
         Me.SplitContainer1.Panel1.Controls.Add(Me.CheckBox5)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.Label3)
         Me.SplitContainer1.Panel1.Controls.Add(Me.Button4)
         Me.SplitContainer1.Panel1.Controls.Add(Me.Label2)
         Me.SplitContainer1.Panel1.Controls.Add(Me.TextBox1)
         Me.SplitContainer1.Panel1.Controls.Add(Me.Label1)
         Me.SplitContainer1.Panel1.Controls.Add(Me.CheckBox3)
         Me.SplitContainer1.Panel1.Controls.Add(Me.Button1)
-        Me.SplitContainer1.Panel1.Controls.Add(Me.CheckBox2)
-        Me.SplitContainer1.Panel1.Controls.Add(Me.CheckBox1)
         '
         'SplitContainer1.Panel2
         '
         Me.SplitContainer1.Panel2.Controls.Add(Me.SplitContainer2)
-        Me.SplitContainer1.Size = New System.Drawing.Size(1260, 739)
+        Me.SplitContainer1.Size = New System.Drawing.Size(1177, 735)
-        Me.SplitContainer1.SplitterDistance = 78
+        Me.SplitContainer1.SplitterDistance = 77
         Me.SplitContainer1.TabIndex = 1
         '
         'Label4
         '
         Me.Label4.Font = New System.Drawing.Font("宋体", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
         Me.Label4.ForeColor = System.Drawing.Color.Red
-        Me.Label4.Location = New System.Drawing.Point(12, 10)
+        Me.Label4.Location = New System.Drawing.Point(3, 9)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(895, 23)
+        Me.Label4.Size = New System.Drawing.Size(385, 23)
-        Me.Label4.TabIndex = 53
+        Me.Label4.TabIndex = 51
-        Me.Label4.Text = "Note: The door magnet must be selected in the configuration of the door magnet lo" &
+        Me.Label4.Text = "Note: The door magnet must be selected in the configuration of the door magnet loop" 
-    "op"
         '
         'CheckBox5
         '
         Me.CheckBox5.AutoSize = True
         Me.CheckBox5.Font = New System.Drawing.Font("宋体", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.CheckBox5.Location = New System.Drawing.Point(16, 43)
+        Me.CheckBox5.Location = New System.Drawing.Point(453, 43)
         Me.CheckBox5.Name = "CheckBox5"
-        Me.CheckBox5.Size = New System.Drawing.Size(359, 25)
+        Me.CheckBox5.Size = New System.Drawing.Size(155, 25)
-        Me.CheckBox5.TabIndex = 52
+        Me.CheckBox5.TabIndex = 51
         Me.CheckBox5.Text = "Enable the power supply button"
         Me.CheckBox5.UseVisualStyleBackColor = True
+        Me.CheckBox5.Visible = False
+        '
+        'Label3
+        '
+        Me.Label3.Font = New System.Drawing.Font("宋体", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
+        Me.Label3.ForeColor = System.Drawing.Color.Red
+        Me.Label3.Location = New System.Drawing.Point(348, 27)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(8, 8)
+        Me.Label3.TabIndex = 50
+        Me.Label3.Text = "Requires a configured magnetic/radar loop"
         '
         'Button4
         '
         Me.Button4.Font = New System.Drawing.Font("宋体", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.Button4.Location = New System.Drawing.Point(636, 34)
+        Me.Button4.Location = New System.Drawing.Point(911, 31)
         Me.Button4.Name = "Button4"
         Me.Button4.Size = New System.Drawing.Size(125, 37)
         Me.Button4.TabIndex = 6
@@ -157,7 +165,7 @@ Partial Class PowerSupply
         Me.CheckBox3.AutoSize = True
         Me.CheckBox3.Enabled = False
         Me.CheckBox3.Font = New System.Drawing.Font("宋体", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.CheckBox3.Location = New System.Drawing.Point(36, 43)
+        Me.CheckBox3.Location = New System.Drawing.Point(7, 43)
         Me.CheckBox3.Name = "CheckBox3"
         Me.CheckBox3.Size = New System.Drawing.Size(440, 25)
         Me.CheckBox3.TabIndex = 3
@@ -168,35 +176,13 @@ Partial Class PowerSupply
         'Button1
         '
         Me.Button1.Font = New System.Drawing.Font("宋体", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.Button1.Location = New System.Drawing.Point(770, 35)
+        Me.Button1.Location = New System.Drawing.Point(1045, 32)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(125, 37)
         Me.Button1.TabIndex = 2
         Me.Button1.Text = "OK"
         Me.Button1.UseVisualStyleBackColor = True
         '
-        'CheckBox2
-        '
-        Me.CheckBox2.AutoSize = True
-        Me.CheckBox2.Font = New System.Drawing.Font("宋体", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.CheckBox2.Location = New System.Drawing.Point(194, 12)
-        Me.CheckBox2.Name = "CheckBox2"
-        Me.CheckBox2.Size = New System.Drawing.Size(113, 25)
-        Me.CheckBox2.TabIndex = 1
-        Me.CheckBox2.Text = "有卡取电"
-        Me.CheckBox2.UseVisualStyleBackColor = True
-        '
-        'CheckBox1
-        '
-        Me.CheckBox1.AutoSize = True
-        Me.CheckBox1.Font = New System.Drawing.Font("宋体", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.CheckBox1.Location = New System.Drawing.Point(36, 12)
-        Me.CheckBox1.Name = "CheckBox1"
-        Me.CheckBox1.Size = New System.Drawing.Size(113, 25)
-        Me.CheckBox1.TabIndex = 0
-        Me.CheckBox1.Text = "无卡取电"
-        Me.CheckBox1.UseVisualStyleBackColor = True
-        '
         'SplitContainer2
         '
         Me.SplitContainer2.Dock = System.Windows.Forms.DockStyle.Fill
@@ -211,8 +197,8 @@ Partial Class PowerSupply
         'SplitContainer2.Panel2
         '
         Me.SplitContainer2.Panel2.Controls.Add(Me.IfGrid)
-        Me.SplitContainer2.Size = New System.Drawing.Size(1260, 657)
+        Me.SplitContainer2.Size = New System.Drawing.Size(1177, 654)
-        Me.SplitContainer2.SplitterDistance = 216
+        Me.SplitContainer2.SplitterDistance = 259
         Me.SplitContainer2.TabIndex = 0
         '
         'SplitContainer3
@@ -227,172 +213,183 @@ Partial Class PowerSupply
         '
         'SplitContainer3.Panel2
         '
-        Me.SplitContainer3.Panel2.Controls.Add(Me.Button5)
+        Me.SplitContainer3.Panel2.Controls.Add(Me.CheckBox6)
-        Me.SplitContainer3.Panel2.Controls.Add(Me.Button6)
+        Me.SplitContainer3.Panel2.Controls.Add(Me.ComboBox1)
-        Me.SplitContainer3.Panel2.Controls.Add(Me.Button3)
+        Me.SplitContainer3.Panel2.Controls.Add(Me.TextBox2)
-        Me.SplitContainer3.Panel2.Controls.Add(Me.Button2)
+        Me.SplitContainer3.Panel2.Controls.Add(Me.Label5)
         Me.SplitContainer3.Panel2.Controls.Add(Me.NR_ComboBox1)
         Me.SplitContainer3.Panel2.Controls.Add(Me.NR_TextBox2)
         Me.SplitContainer3.Panel2.Controls.Add(Me.NR_label3)
         Me.SplitContainer3.Panel2.Controls.Add(Me.CheckBox4)
-        Me.SplitContainer3.Panel2.Controls.Add(Me.Button7)
+        Me.SplitContainer3.Panel2.Controls.Add(Me.Button5)
-        Me.SplitContainer3.Panel2.Controls.Add(Me.Button8)
+        Me.SplitContainer3.Panel2.Controls.Add(Me.Button6)
-        Me.SplitContainer3.Panel2.Controls.Add(Me.Button9)
+        Me.SplitContainer3.Panel2.Controls.Add(Me.Button3)
-        Me.SplitContainer3.Panel2.Controls.Add(Me.Button10)
+        Me.SplitContainer3.Panel2.Controls.Add(Me.Button2)
-        Me.SplitContainer3.Size = New System.Drawing.Size(1260, 216)
+        Me.SplitContainer3.Size = New System.Drawing.Size(1177, 259)
-        Me.SplitContainer3.SplitterDistance = 754
+        Me.SplitContainer3.SplitterDistance = 922
         Me.SplitContainer3.TabIndex = 0
         '
         'PortTable
         '
-        Me.PortTable.CheckedImage = Nothing
         Me.PortTable.DefaultFont = New System.Drawing.Font("宋体", 9.0!)
         Me.PortTable.Dock = System.Windows.Forms.DockStyle.Fill
         Me.PortTable.ExtendLastCol = True
-        Me.PortTable.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
         Me.PortTable.GridColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.PortTable.Location = New System.Drawing.Point(0, 0)
+        Me.PortTable.MouseWheelSpeed = CType(3, Short)
         Me.PortTable.Name = "PortTable"
-        Me.PortTable.Size = New System.Drawing.Size(754, 216)
+        Me.PortTable.Size = New System.Drawing.Size(922, 259)
         Me.PortTable.TabIndex = 1
-        Me.PortTable.UncheckedImage = Nothing
         '
-        'Button5
+        'CheckBox6
         '
-        Me.Button5.Location = New System.Drawing.Point(287, 114)
+        Me.CheckBox6.Font = New System.Drawing.Font("宋体", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.Button5.Name = "Button5"
+        Me.CheckBox6.Location = New System.Drawing.Point(5, 74)
-        Me.Button5.Size = New System.Drawing.Size(171, 46)
+        Me.CheckBox6.Name = "CheckBox6"
-        Me.Button5.TabIndex = 3
+        Me.CheckBox6.Size = New System.Drawing.Size(227, 20)
-        Me.Button5.Text = "Add condition group"
+        Me.CheckBox6.TabIndex = 11
-        Me.Button5.UseVisualStyleBackColor = True
+        Me.CheckBox6.Text = "Key-triggered occupancy reset"
+        Me.CheckBox6.UseVisualStyleBackColor = True
+        Me.CheckBox6.Visible = False
         '
-        'Button6
+        'ComboBox1
         '
-        Me.Button6.Location = New System.Drawing.Point(21, 114)
+        Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.Button6.Name = "Button6"
+        Me.ComboBox1.FormattingEnabled = True
-        Me.Button6.Size = New System.Drawing.Size(187, 46)
+        Me.ComboBox1.Items.AddRange(New Object() {"s", "m", "h"})
-        Me.Button6.TabIndex = 2
+        Me.ComboBox1.Location = New System.Drawing.Point(204, 124)
-        Me.Button6.Text = "Delete condition group" & Global.Microsoft.VisualBasic.ChrW(10)
+        Me.ComboBox1.Name = "ComboBox1"
-        Me.Button6.UseVisualStyleBackColor = True
+        Me.ComboBox1.Size = New System.Drawing.Size(41, 20)
+        Me.ComboBox1.TabIndex = 10
+        Me.ComboBox1.Visible = False
         '
-        'Button3
+        'TextBox2
         '
-        Me.Button3.Location = New System.Drawing.Point(287, 166)
+        Me.TextBox2.Location = New System.Drawing.Point(98, 123)
-        Me.Button3.Name = "Button3"
+        Me.TextBox2.MaxLength = 3
-        Me.Button3.Size = New System.Drawing.Size(171, 38)
+        Me.TextBox2.Name = "TextBox2"
-        Me.Button3.TabIndex = 1
+        Me.TextBox2.Size = New System.Drawing.Size(100, 21)
-        Me.Button3.Text = "Add condition"
+        Me.TextBox2.TabIndex = 9
-        Me.Button3.UseVisualStyleBackColor = True
+        Me.TextBox2.Text = "10"
+        Me.TextBox2.Visible = False
         '
-        'Button2
+        'Label5
         '
-        Me.Button2.Location = New System.Drawing.Point(21, 166)
+        Me.Label5.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.Button2.Name = "Button2"
+        Me.Label5.Location = New System.Drawing.Point(3, 97)
-        Me.Button2.Size = New System.Drawing.Size(187, 38)
+        Me.Label5.Name = "Label5"
-        Me.Button2.TabIndex = 0
+        Me.Label5.Size = New System.Drawing.Size(167, 23)
-        Me.Button2.Text = "Delete condition"
+        Me.Label5.TabIndex = 8
-        Me.Button2.UseVisualStyleBackColor = True
+        Me.Label5.Text = "Timeout for the final step of Occupied→Unoccupied transition:"
+        Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Label5.Visible = False
         '
         'NR_ComboBox1
         '
         Me.NR_ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.NR_ComboBox1.Enabled = False
         Me.NR_ComboBox1.FormattingEnabled = True
-        Me.NR_ComboBox1.Items.AddRange(New Object() {"秒", "分", "时"})
+        Me.NR_ComboBox1.Items.AddRange(New Object() {"s", "m", "h"})
-        Me.NR_ComboBox1.Location = New System.Drawing.Point(239, 42)
+        Me.NR_ComboBox1.Location = New System.Drawing.Point(204, 39)
         Me.NR_ComboBox1.Name = "NR_ComboBox1"
         Me.NR_ComboBox1.Size = New System.Drawing.Size(41, 20)
         Me.NR_ComboBox1.TabIndex = 7
+        Me.NR_ComboBox1.Visible = False
         '
         'NR_TextBox2
         '
         Me.NR_TextBox2.Enabled = False
-        Me.NR_TextBox2.Location = New System.Drawing.Point(133, 41)
+        Me.NR_TextBox2.Location = New System.Drawing.Point(98, 38)
         Me.NR_TextBox2.MaxLength = 3
         Me.NR_TextBox2.Name = "NR_TextBox2"
         Me.NR_TextBox2.Size = New System.Drawing.Size(100, 21)
         Me.NR_TextBox2.TabIndex = 6
         Me.NR_TextBox2.Text = "30"
+        Me.NR_TextBox2.Visible = False
         '
         'NR_label3
         '
         Me.NR_label3.Enabled = False
         Me.NR_label3.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.NR_label3.Location = New System.Drawing.Point(3, 39)
+        Me.NR_label3.Location = New System.Drawing.Point(3, 38)
         Me.NR_label3.Name = "NR_label3"
-        Me.NR_label3.Size = New System.Drawing.Size(137, 23)
+        Me.NR_label3.Size = New System.Drawing.Size(100, 23)
         Me.NR_label3.TabIndex = 5
-        Me.NR_label3.Text = "Unmanned duration"
+        Me.NR_label3.Text = "Sustained Unoccupied Time:"
         Me.NR_label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.NR_label3.Visible = False
         '
         'CheckBox4
         '
         Me.CheckBox4.Font = New System.Drawing.Font("宋体", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.CheckBox4.Location = New System.Drawing.Point(2, 15)
+        Me.CheckBox4.Location = New System.Drawing.Point(3, 15)
         Me.CheckBox4.Name = "CheckBox4"
-        Me.CheckBox4.Size = New System.Drawing.Size(355, 20)
+        Me.CheckBox4.Size = New System.Drawing.Size(187, 20)
         Me.CheckBox4.TabIndex = 4
-        Me.CheckBox4.Text = "Whether continuous is enabled is unknown"
+        Me.CheckBox4.Text = "Sustain Unoccupied Judgment"
         Me.CheckBox4.UseVisualStyleBackColor = True
+        Me.CheckBox4.Visible = False
         '
-        'Button7
+        'Button5
         '
-        Me.Button7.Location = New System.Drawing.Point(133, 137)
+        Me.Button5.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.Button7.Name = "Button7"
+        Me.Button5.Location = New System.Drawing.Point(139, 150)
-        Me.Button7.Size = New System.Drawing.Size(75, 23)
+        Me.Button5.Name = "Button5"
-        Me.Button7.TabIndex = 3
+        Me.Button5.Size = New System.Drawing.Size(102, 45)
-        Me.Button7.Text = "添加条件组"
+        Me.Button5.TabIndex = 3
-        Me.Button7.UseVisualStyleBackColor = True
+        Me.Button5.Text = "Add Condition Group"
+        Me.Button5.UseVisualStyleBackColor = True
         '
-        'Button8
+        'Button6
         '
-        Me.Button8.Location = New System.Drawing.Point(21, 137)
+        Me.Button6.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.Button8.Name = "Button8"
+        Me.Button6.Location = New System.Drawing.Point(18, 150)
-        Me.Button8.Size = New System.Drawing.Size(75, 23)
+        Me.Button6.Name = "Button6"
-        Me.Button8.TabIndex = 2
+        Me.Button6.Size = New System.Drawing.Size(102, 45)
-        Me.Button8.Text = "删除条件组"
+        Me.Button6.TabIndex = 2
-        Me.Button8.UseVisualStyleBackColor = True
+        Me.Button6.Text = "Delete Condition Group"
+        Me.Button6.UseVisualStyleBackColor = True
         '
-        'Button9
+        'Button3
         '
-        Me.Button9.Location = New System.Drawing.Point(133, 171)
+        Me.Button3.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.Button9.Name = "Button9"
+        Me.Button3.Location = New System.Drawing.Point(139, 201)
-        Me.Button9.Size = New System.Drawing.Size(75, 23)
+        Me.Button3.Name = "Button3"
-        Me.Button9.TabIndex = 1
+        Me.Button3.Size = New System.Drawing.Size(102, 45)
-        Me.Button9.Text = "添加条件"
+        Me.Button3.TabIndex = 1
-        Me.Button9.UseVisualStyleBackColor = True
+        Me.Button3.Text = "Add Condition"
+        Me.Button3.UseVisualStyleBackColor = True
         '
-        'Button10
+        'Button2
         '
-        Me.Button10.Location = New System.Drawing.Point(21, 171)
+        Me.Button2.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.Button10.Name = "Button10"
+        Me.Button2.Location = New System.Drawing.Point(18, 201)
-        Me.Button10.Size = New System.Drawing.Size(75, 23)
+        Me.Button2.Name = "Button2"
-        Me.Button10.TabIndex = 0
+        Me.Button2.Size = New System.Drawing.Size(102, 45)
-        Me.Button10.Text = "删除条件"
+        Me.Button2.TabIndex = 0
-        Me.Button10.UseVisualStyleBackColor = True
+        Me.Button2.Text = "Delete Condition"
+        Me.Button2.UseVisualStyleBackColor = True
         '
         'IfGrid
         '
-        Me.IfGrid.CheckedImage = Nothing
         Me.IfGrid.DefaultFont = New System.Drawing.Font("宋体", 9.0!)
         Me.IfGrid.Dock = System.Windows.Forms.DockStyle.Fill
         Me.IfGrid.ExtendLastCol = True
-        Me.IfGrid.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
         Me.IfGrid.GridColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.IfGrid.Location = New System.Drawing.Point(0, 0)
+        Me.IfGrid.MouseWheelSpeed = CType(3, Short)
         Me.IfGrid.Name = "IfGrid"
-        Me.IfGrid.Size = New System.Drawing.Size(1260, 437)
+        Me.IfGrid.Size = New System.Drawing.Size(1177, 391)
         Me.IfGrid.TabIndex = 1
-        Me.IfGrid.UncheckedImage = Nothing
         '
         'PowerSupply
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1260, 739)
+        Me.ClientSize = New System.Drawing.Size(1177, 735)
         Me.Controls.Add(Me.SplitContainer1)
         Me.Name = "PowerSupply"
-        Me.Text = "无卡取电"
+        Me.Text = "Keycard-Free"
         Me.SplitContainer1.Panel1.ResumeLayout(False)
         Me.SplitContainer1.Panel1.PerformLayout()
         Me.SplitContainer1.Panel2.ResumeLayout(False)
@@ -411,8 +408,6 @@ Partial Class PowerSupply
 
     End Sub
     Friend WithEvents SplitContainer1 As SplitContainer
-    Friend WithEvents CheckBox2 As CheckBox
-    Friend WithEvents CheckBox1 As CheckBox
     Friend WithEvents Button1 As Button
     Friend WithEvents CheckBox3 As CheckBox
     Friend WithEvents TextBox1 As TextBox
@@ -427,14 +422,15 @@ Partial Class PowerSupply
     Friend WithEvents Button4 As Button
     Protected WithEvents Button5 As Button
     Friend WithEvents Button6 As Button
-    Friend WithEvents Label4 As Label
+    Friend WithEvents CheckBox4 As CheckBox
-    Friend WithEvents CheckBox5 As CheckBox
+    Friend WithEvents NR_label3 As Label
     Friend WithEvents NR_ComboBox1 As ComboBox
     Friend WithEvents NR_TextBox2 As TextBox
-    Friend WithEvents NR_label3 As Label
+    Friend WithEvents Label4 As Label
-    Friend WithEvents CheckBox4 As CheckBox
+    Friend WithEvents Label3 As Label
-    Protected WithEvents Button7 As Button
+    Friend WithEvents CheckBox5 As CheckBox
-    Friend WithEvents Button8 As Button
+    Friend WithEvents ComboBox1 As ComboBox
-    Protected WithEvents Button9 As Button
+    Friend WithEvents TextBox2 As TextBox
-    Friend WithEvents Button10 As Button
+    Friend WithEvents Label5 As Label
+    Friend WithEvents CheckBox6 As CheckBox
 End Class

BLV_Studio/Test/GridTest/TableInteraction.vb

@@ -2823,7 +2823,8 @@ Public Class TableInteraction
             For Each node In index.Nodes
                 If node.Name.Equals("Virtual_Card") Then
                     UniqueDevice = index
-                    NoCardNode = node
+                     NoCardNode = node
+                    If UniqueDevice.Desc.DevDataModelVer.Contains("1.0") Then
                     vli = PortInformation(NoCardNode)
                     nli = ConditionalInformation(UniqueDevice)
                     mli = EquipmentCommonStats(UniqueDevice)
@@ -2834,6 +2835,18 @@ Public Class TableInteraction
                             result.Add(mli)
                         End If
                     End If
+                        else
+                      vli = PortInformation1(NoCardNode)
+                        nli = ConditionalInformation1(UniqueDevice)
+                            If Not IsNothing(vli) AndAlso vli.Count > 0 AndAlso Not IsNothing(vli) AndAlso vli.Count > 0 Then
+                        result.AddRange(vli)
+                        result.AddRange(nli)
+                       
+                    End If
+                    End If
+                    
+                   
+                  
 
                 End If
             Next
@@ -2864,6 +2877,7 @@ Public Class TableInteraction
         Dim sbuf() As String
         Dim isport As Boolean
         For Each node In NoCardNode.Nodes
+            'If node.LoopAddr.Equals("1") Then Continue For '增加了跳过端口1的判断
             sbuf = node.Description.Split(",")
             isport = True
             For i = 0 To sbuf.Length - 1
@@ -2873,7 +2887,28 @@ Public Class TableInteraction
             Next
             If isport AndAlso sbuf.Length > 4 Then
                 result.Add(GetPortInformation(node.LoopAddr, node.Description))
+            Else
+                Continue For
+            End If
 
+        Next
+        Return result
+    End Function
+        Public Function PortInformation1(NoCardNode As DeviceChildNodeClass) As List(Of Byte())
+        Dim result As New List(Of Byte())
+        Dim sbuf() As String
+        Dim isport As Boolean
+        For Each node In NoCardNode.Nodes
+            'If node.LoopAddr.Equals("1") Then Continue For '增加了跳过端口1的判断
+            sbuf = node.Description.Split(",")
+            isport = True
+            For i = 0 To sbuf.Length - 1
+                If String.IsNullOrEmpty(sbuf(i)) AndAlso (i <> 2 AndAlso i <> 3) Then
+                    isport = False
+                End If
+            Next
+            If isport AndAlso sbuf.Length > 4 Then
+                result.Add(GetPortInformation1(node.LoopAddr, node.Description))
             Else
                 Continue For
             End If
@@ -2901,6 +2936,38 @@ Public Class TableInteraction
             Data.Add(1)
         End If
         Return Data.ToArray
+    End Function
+        Public Function GetPortInformation1(LoopAddr As String， nStr As String) As Byte()
+        Dim cmd As Byte = &H9
+        Dim Data = New List(Of Byte)
+        Dim strbuf() As String = nStr.Split(",")
+        Data.Add(cmd)
+        Data.Add(CInt(strbuf(8)))
+        Data.Add(CInt(strbuf(9)))
+        Data.AddRange(BitConverter.GetBytes(CShort(CInt(strbuf(7)))))
+        If String.IsNullOrEmpty(strbuf(2)) Then
+            Data.Add(0)
+        Else
+            Data.Add(CInt(strbuf(2)))
+        End If
+        Data.Add(CInt(LoopAddr)) '- 1) '增加了减1
+        If String.IsNullOrEmpty(strbuf(4)) OrElse strbuf(4).Equals("0") Then
+            Data.Add(0)
+        Else
+            Data.Add(1)
+        End If
+        if String.IsNullOrEmpty(strbuf(5)) OrElse strbuf(5).Equals("0") Then
+            Data.AddRange(BitConverter.GetBytes(CShort(0)))
+        Else
+             Data.AddRange(BitConverter.GetBytes(CShort(CInt(strbuf(5)))))
+        End If
+        Data.Add(GetGlossary8(strbuf(6)))
+       If String.IsNullOrEmpty(strbuf(3)) Then
+            Data.Add(0)
+        Else
+            Data.Add(CInt(strbuf(3)))
+        End If
+        Return Data.ToArray
     End Function
     Public Function ConditionalInformation(UniqueDevice As DeviceModel) As List(Of Byte())
         Dim result As New List(Of Byte())
@@ -2931,6 +2998,56 @@ Public Class TableInteraction
             Next
         Next
         Return result
+    End Function
+        Public Function ConditionalInformation1(UniqueDevice As DeviceModel) As List(Of Byte())
+        Dim result As New List(Of Byte())
+        Dim sbuf() As String
+        Dim isport As Boolean
+        Dim IfGridRowdic As Dictionary(Of String, List(Of String))
+        Try
+            IfGridRowdic = JsonConvert.DeserializeObject(Of Dictionary(Of String, List(Of String)))(UniqueDevice.Desc.DevDescription)
+        Catch ex As Exception
+            Return Nothing
+        End Try
+
+        If IsNothing(IfGridRowdic) Then Return result
+        For Each index In IfGridRowdic
+            For Each node In index.Value
+                sbuf = node.Split(",")
+                isport = True
+                For Each nStr In sbuf
+                    If String.IsNullOrEmpty(nStr) Then
+                        isport = False
+                    End If
+                Next
+                If isport AndAlso sbuf.Length > 3 Then
+                    result.Add(GetConditionalInformation1(index.Key, node))
+                Else
+                    Continue For
+                End If
+            Next
+        Next
+        Return result
+    End Function
+        Public Function GetConditionalInformation1(key As String, nStr As String) As Byte()
+        Dim cmd As Byte = &H8
+        Dim Data = New List(Of Byte)
+        Dim strbuf() As String = nStr.Split(",")
+        Dim nbbuf() As String
+        Data.Add(cmd)
+        nbbuf = strbuf(1).Split(":")
+        Data.Add(PowerSupply.GetNoCarDataKeyVal(nbbuf(0)))
+        Data.Add(CInt(key))
+        Data.Add(strbuf(0))
+        Data.AddRange(BitConverter.GetBytes(CShort(CInt(strbuf(14)))))
+        Data.Add(GetGlossary8(strbuf(15)))
+        For i = 1 To 11  '11变成10
+            'nbbuf = strbuf(i + 1).Split(":")
+            Data.Add(PowerSupply.GetNoCarDataKeyVal(strbuf(i + 1)))  'i 加 1 编程 i+2
+        Next
+              Data.AddRange(BitConverter.GetBytes(CShort(CInt(strbuf(16)))))
+        Data.Add(GetGlossary8(strbuf(17)))
+        Return Data.ToArray
     End Function
     '条件信息
     Public Function GetConditionalInformation(key As String, nStr As String) As Byte()
@@ -2955,7 +3072,7 @@ Public Class TableInteraction
     Public Function GetGlossary8(sb As String) As Byte
         Dim result As Byte = 0
         Select Case sb
-            Case "S"
+            Case "S","s"
                 result = 1
             Case "m"
                 result = 2
@@ -3358,7 +3475,7 @@ Public Class TableInteraction
 
                                 End If
 
-                                If String.IsNullOrEmpty(partime) AndAlso String.IsNullOrEmpty(partime1) Then Continue For
+                                'If String.IsNullOrEmpty(partime) AndAlso String.IsNullOrEmpty(partime1) Then Continue For
                                 If Rdic.ContainsKey("Dimming".ToUpper) OrElse Rdic.ContainsKey("PB_LINE_CONTROL".ToUpper) Then
                                     For Each devRKEYnode In devRKEY
                                         If Not String.IsNullOrEmpty(partime2) Then
@@ -5980,7 +6097,7 @@ Public Class TableInteraction
                         Air485ment.Add(Fnode)
                     Case "485FloorHeat", "CLEDFLOORHEAT"
                         Heat485ment.Add(Fnode)
-                    Case "语音"
+                    Case "Voice"
                         Voicement.Add(Fnode)
                     Case "Virtual_Card"
                         VirtualCard.Add(Fnode)
@@ -6245,6 +6362,7 @@ Public Class TableInteraction
         If outputGroupNode Is Nothing Then
             outputCount = 0
         Else
+                If  not outputGroupNode.DEV_TYPE_DATA.Equals("4") Then
             For Each node In outputGroupNode.Nodes
                 'If node.RowType <> RowNode.RowTypeEnum.DeviceObject Then Continue For
                 'If node.Compile = False Then Continue For
@@ -6259,7 +6377,10 @@ Public Class TableInteraction
                 Console.WriteLine($"{node.DefaultAliasName}{vbCrLf}")
             Next
             Console.WriteLine($"{outputGroupNode.Name}:{outputGroupNode.Nodes.Count }:{outputAliases.Count }{vbCrLf}")
-        End If
+       End If
+            End If
+
+
 
         buf.AddRange(BitConverter.GetBytes(inputCount)) '输入回路数(2字节)
         buf.AddRange(BitConverter.GetBytes(outputCount)) '输出回路数(2字节)

BLV_Studio/bin/Debug/BLV_Studio.application

@@ -21,7 +21,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>1QCuL4trDDTEHx++/S6B3ui9dhzsEzVYKrSDjs39M7o=</dsig:DigestValue>
+        <dsig:DigestValue>JD39f/8+6QKEuUrfwG9KiYR2X1RY06nTXdxdv7PT5zk=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BLV_Studio/bin/Debug/BLV_Studio.exe.manifest

@@ -4,7 +4,7 @@
   <description asmv2:iconFile="favicon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="BLV_Studio" version="4.4.2.12" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="BLV_Studio" version="4.4.2.13" language="neutral" processorArchitecture="msil" />
     <commandLine file="BLV_Studio.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -102,14 +102,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="BLV_Studio.exe" size="2455040">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="BLV_Studio.exe" size="2475520">
-      <assemblyIdentity name="BLV_Studio" version="4.4.2.12" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="BLV_Studio" version="4.4.2.13" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>XfU2WQyz1e09VeoK1z61/izFX4HR0m/J4SHsaDP/LYQ=</dsig:DigestValue>
+        <dsig:DigestValue>PNSVXYV+QIryQii/zE88QcgDqSapXCDokv701XojbHI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -677,15 +677,6 @@
       <dsig:DigestValue>pQWNFlScWo2PxMj/9/6h8MJeCjpUtDa0islXYxkQAEw=</dsig:DigestValue>
     </hash>
   </file>
-  <file name="宝易\favicon.ico" size="9662">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>+7X+tBYM4Whn1mJvI9Gmy6s+HcFVDtx9i+uAFSaoeH8=</dsig:DigestValue>
-    </hash>
-  </file>
   <file name="版本说明.txt" size="13674">
     <hash>
       <dsig:Transforms>
@@ -695,6 +686,15 @@
       <dsig:DigestValue>Yy1FAI5LiI9l95Et3ouEPka5K5WomLBs1RCnIgysfAo=</dsig:DigestValue>
     </hash>
   </file>
+  <file name="宝易\favicon.ico" size="9662">
+    <hash>
+      <dsig:Transforms>
+        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+      </dsig:Transforms>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>+7X+tBYM4Whn1mJvI9Gmy6s+HcFVDtx9i+uAFSaoeH8=</dsig:DigestValue>
+    </hash>
+  </file>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的

BLV_Studio/bin/Debug/BLV_Studio.xml

@@ -9028,28 +9028,28 @@ BLV_Studio
  <summary>当前选择的酒店组</summary>
 </member>
 <member name="F:BLV_Studio.BFrmLogin._isRecordPassWord">
- <summary>ÊÇ·ñ¼ÇסÃÜÂë</summary>
+ <summary>是否记住密码</summary>
 </member>
 <member name="F:BLV_Studio.BFrmLogin._isAutoLogin">
- <summary>ÊÇ·ñ×Ô¶¯µÇ¼</summary>
+ <summary>是否自动登录</summary>
 </member>
 <member name="F:BLV_Studio.BFrmLogin._isLogging">
- <summary>ÊÇ·ñÕýÔڵǼÖÐ</summary>
+ <summary>是否正在登录中</summary>
 </member>
 <member name="F:BLV_Studio.BFrmLogin._appid">
- <summary>²úÆ·Ë÷Òý</summary>
+ <summary>产品索引</summary>
 </member>
 <member name="M:BLV_Studio.BFrmLogin.ChkKeepPwd_CheckedChanged(System.Object,System.EventArgs)">
- <summary>¼ÇסÃÜÂ븴ѡ¿ò״̬Ð޸Ĵ¥·¢Ê¼þ</summary>
+ <summary>记住密码复选框状态修改触发事件</summary>
 </member>
 <member name="M:BLV_Studio.BFrmLogin.Chk_AutoLogin_CheckedChanged(System.Object,System.EventArgs)">
- <summary>×Ô¶¯µÇ¼¸´Ñ¡¿ò״̬Ð޸Ĵ¥·¢Ê¼þ</summary>
+ <summary>自动登录复选框状态修改触发事件</summary>
 </member>
 <member name="M:BLV_Studio.BFrmLogin.LoadSettings">
- <summary>¶ÁÈ¡SettingÖеĻº´æÁ¿</summary>
+ <summary>读取Setting中的缓存量</summary>
 </member>
 <member name="M:BLV_Studio.BFrmLogin.SaveSettings">
- <summary>±£´æSettingÖеĻº´æÁ¿</summary>
+ <summary>保存Setting中的缓存量</summary>
 </member>
 <member name="F:BLV_Studio.FrmMain._ConfigInfo">
  <summary>

BLV_Studio/obj/Debug/BLV_Studio.application

@@ -21,7 +21,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>1QCuL4trDDTEHx++/S6B3ui9dhzsEzVYKrSDjs39M7o=</dsig:DigestValue>
+        <dsig:DigestValue>JD39f/8+6QKEuUrfwG9KiYR2X1RY06nTXdxdv7PT5zk=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BLV_Studio/obj/Debug/BLV_Studio.exe.manifest

@@ -4,7 +4,7 @@
   <description asmv2:iconFile="favicon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="BLV_Studio" version="4.4.2.12" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="BLV_Studio" version="4.4.2.13" language="neutral" processorArchitecture="msil" />
     <commandLine file="BLV_Studio.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -102,14 +102,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="BLV_Studio.exe" size="2455040">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="BLV_Studio.exe" size="2475520">
-      <assemblyIdentity name="BLV_Studio" version="4.4.2.12" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="BLV_Studio" version="4.4.2.13" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>XfU2WQyz1e09VeoK1z61/izFX4HR0m/J4SHsaDP/LYQ=</dsig:DigestValue>
+        <dsig:DigestValue>PNSVXYV+QIryQii/zE88QcgDqSapXCDokv701XojbHI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -677,15 +677,6 @@
       <dsig:DigestValue>pQWNFlScWo2PxMj/9/6h8MJeCjpUtDa0islXYxkQAEw=</dsig:DigestValue>
     </hash>
   </file>
-  <file name="宝易\favicon.ico" size="9662">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>+7X+tBYM4Whn1mJvI9Gmy6s+HcFVDtx9i+uAFSaoeH8=</dsig:DigestValue>
-    </hash>
-  </file>
   <file name="版本说明.txt" size="13674">
     <hash>
       <dsig:Transforms>
@@ -695,6 +686,15 @@
       <dsig:DigestValue>Yy1FAI5LiI9l95Et3ouEPka5K5WomLBs1RCnIgysfAo=</dsig:DigestValue>
     </hash>
   </file>
+  <file name="宝易\favicon.ico" size="9662">
+    <hash>
+      <dsig:Transforms>
+        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+      </dsig:Transforms>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>+7X+tBYM4Whn1mJvI9Gmy6s+HcFVDtx9i+uAFSaoeH8=</dsig:DigestValue>
+    </hash>
+  </file>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的

BLV_Studio/obj/Debug/BLV_Studio.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-9e7e62ed9e89f0a1a3a898dc525509cfbbfcc57f
+750802bc34d15b849ec5babdd4691a117e260112

BLV_Studio/obj/Debug/BLV_Studio.vbproj.FileListAbsolute.txt

@@ -1261,3 +1261,114 @@ E:\Sync\BLV_Studio_20240129_合并配置下发工具_EN\SourceCode\BLV_Studio\ob
 E:\Sync\BLV_Studio_20240129_合并配置下发工具_EN\SourceCode\BLV_Studio\obj\Debug\BLV_Studio.exe
 E:\Sync\BLV_Studio_20240129_合并配置下发工具_EN\SourceCode\BLV_Studio\obj\Debug\BLV_Studio.xml
 E:\Sync\BLV_Studio_20240129_合并配置下发工具_EN\SourceCode\BLV_Studio\obj\Debug\BLV_Studio.pdb
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\BLV_Studio.exe.config
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\BLV_Studio.exe.manifest
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\BLV_Studio.application
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\BLV_Studio.exe
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\BLV_Studio.pdb
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\BLV_Studio.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\ARSoft.Tools.Net.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\AutoFixture.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\BouncyCastle.Crypto.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\DnsClient.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\DotNetProjects.DhcpServer.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\EntityFramework.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\EntityFramework.SqlServer.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Fare.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\FlexCell.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\FluentFTP.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Google.Protobuf.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\K4os.Compression.LZ4.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\K4os.Compression.LZ4.Streams.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\K4os.Hash.xxHash.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\MD5.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Microsoft.Win32.Registry.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\MySql.Data.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Newtonsoft.Json.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Buffers.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Data.SQLite.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Data.SQLite.EF6.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Data.SQLite.Linq.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Memory.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Numerics.Vectors.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Security.AccessControl.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Security.Principal.Windows.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Ubiety.Dns.Core.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Ubiety.Logging.Core.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\ZstdNet.dll
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\AutoFixture.pdb
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\AutoFixture.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\BouncyCastle.Crypto.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\DnsClient.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\EntityFramework.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\EntityFramework.SqlServer.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Fare.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Google.Protobuf.pdb
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Google.Protobuf.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\K4os.Compression.LZ4.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\K4os.Compression.LZ4.Streams.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\K4os.Hash.xxHash.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Microsoft.Win32.Registry.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\MySql.Data.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Newtonsoft.Json.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Buffers.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Data.SQLite.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Memory.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Numerics.Vectors.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Security.AccessControl.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\System.Security.Principal.Windows.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Ubiety.Dns.Core.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\bin\Debug\Ubiety.Logging.Core.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.vbproj.AssemblyReference.cache
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.ColorCelect.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmAboutDialog.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmAddDevice.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmCSeriesConfig.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmHotelList.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmMACBindingResults.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmMACDialog.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmSerialportSetting.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmTest_BLV_V9.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmTest_C12.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmTest_C12_Dimming.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmTest_C5.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmTest_C8.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.Downoading.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.AddMember_frm.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.Form2.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.link_frm.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.ActionParameter.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.NormalDev.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.AddPeripherals.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.DeviceListFrom.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.ExecutionCondition.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.PowerSupply.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.MusicConfigt.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.ServiceAttribute.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.MusicArrangement.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.TestForm1.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.UserControl1.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.CreateProject.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmReleaseFirmware2.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.HotelConfigurationLogic.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.UCreatelabel.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.VersionHistory.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmChangeHotel.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.BFrmLogin.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.FrmMain.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.frm_ProjectSync.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.Resources.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.BLV_UartMdule.Blv_Uart.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.UartForm1.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.ReleaseControl_frn.resources
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.vbproj.GenerateResource.cache
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.exe.licenses
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.vbproj.CoreCompileInputs.cache
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.exe.manifest
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.application
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.vbproj.CopyComplete
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.exe
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.xml
+E:\ForkSync\Desktop_BLVStudio_EN\BLV_Studio\obj\Debug\BLV_Studio.pdb

BLV_Studio/obj/Debug/BLV_Studio.xml

@@ -9028,28 +9028,28 @@ BLV_Studio
  <summary>当前选择的酒店组</summary>
 </member>
 <member name="F:BLV_Studio.BFrmLogin._isRecordPassWord">
- <summary>ÊÇ·ñ¼ÇסÃÜÂë</summary>
+ <summary>是否记住密码</summary>
 </member>
 <member name="F:BLV_Studio.BFrmLogin._isAutoLogin">
- <summary>ÊÇ·ñ×Ô¶¯µÇ¼</summary>
+ <summary>是否自动登录</summary>
 </member>
 <member name="F:BLV_Studio.BFrmLogin._isLogging">
- <summary>ÊÇ·ñÕýÔڵǼÖÐ</summary>
+ <summary>是否正在登录中</summary>
 </member>
 <member name="F:BLV_Studio.BFrmLogin._appid">
- <summary>²úÆ·Ë÷Òý</summary>
+ <summary>产品索引</summary>
 </member>
 <member name="M:BLV_Studio.BFrmLogin.ChkKeepPwd_CheckedChanged(System.Object,System.EventArgs)">
- <summary>¼ÇסÃÜÂ븴ѡ¿ò״̬Ð޸Ĵ¥·¢Ê¼þ</summary>
+ <summary>记住密码复选框状态修改触发事件</summary>
 </member>
 <member name="M:BLV_Studio.BFrmLogin.Chk_AutoLogin_CheckedChanged(System.Object,System.EventArgs)">
- <summary>×Ô¶¯µÇ¼¸´Ñ¡¿ò״̬Ð޸Ĵ¥·¢Ê¼þ</summary>
+ <summary>自动登录复选框状态修改触发事件</summary>
 </member>
 <member name="M:BLV_Studio.BFrmLogin.LoadSettings">
- <summary>¶ÁÈ¡SettingÖеĻº´æÁ¿</summary>
+ <summary>读取Setting中的缓存量</summary>
 </member>
 <member name="M:BLV_Studio.BFrmLogin.SaveSettings">
- <summary>±£´æSettingÖеĻº´æÁ¿</summary>
+ <summary>保存Setting中的缓存量</summary>
 </member>
 <member name="F:BLV_Studio.FrmMain._ConfigInfo">
  <summary>