修复无卡取电添加最后一个映射回路异常问题

BLV_Studio/BLV_Studio.vbproj

@@ -35,7 +35,7 @@
     <MinimumRequiredVersion>4.0.0.5</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>index.html</WebPage>
-    <ApplicationRevision>101</ApplicationRevision>
+    <ApplicationRevision>106</ApplicationRevision>
     <ApplicationVersion>4.4.3.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

BLV_Studio/Control/DHCP/NetworkHelp.vb

@@ -74,18 +74,20 @@ Public Class NetworkHelp
 
 
     End Function
-    Public Shared Sub SetNetworkAdapterDHCP()
+    Public Shared Sub SetNetworkAdapterDHCP(Optional isetDHCP As Boolean = True)
         Dim mc As ManagementClass = New ManagementClass("Win32_NetworkAdapterConfiguration")
         Dim moc As ManagementObjectCollection = mc.GetInstances()
+        If isetDHCP Then
+            For Each mo As ManagementObject In moc
+                If Not CBool(mo("IPEnabled")) Then Continue For
+                mo.InvokeMethod("SetDNSServerSearchOrder", Nothing)
+                mo.InvokeMethod("EnableStatic", Nothing)
+                mo.InvokeMethod("SetGateways", Nothing)
+                mo.InvokeMethod("EnableDHCP", Nothing)
+                Exit For
+            Next
+        End If
 
-        For Each mo As ManagementObject In moc
-            If Not CBool(mo("IPEnabled")) Then Continue For
-            mo.InvokeMethod("SetDNSServerSearchOrder", Nothing)
-            mo.InvokeMethod("EnableStatic", Nothing)
-            mo.InvokeMethod("SetGateways", Nothing)
-            mo.InvokeMethod("EnableDHCP", Nothing)
-            Exit For
-        Next
     End Sub
 
 End Class

BLV_Studio/Control/FrmCSeriesConfig.vb

@@ -13232,7 +13232,7 @@ Public Class FrmCSeriesConfig
     End Sub
 
     Private Sub FrmCSeriesConfig_FormClosed(sender As Object, e As FormClosedEventArgs) Handles MyBase.FormClosed
-        NetworkHelp.SetNetworkAdapterDHCP()
+        NetworkHelp.SetNetworkAdapterDHCP(False)
         If Not IsNothing(DirectConnection) Then
             threadIsflag = False
             If Not IsNothing（gsocket） Then gsocket.Close()
@@ -13242,7 +13242,7 @@ Public Class FrmCSeriesConfig
     End Sub
 
     Private Sub FrmCSeriesConfig_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
-        NetworkHelp.SetNetworkAdapterDHCP()
+        NetworkHelp.SetNetworkAdapterDHCP(False)
         If Not IsNothing(DirectConnection) Then
             threadIsflag = False
             If Not IsNothing（gsocket） Then gsocket.Close()
@@ -13250,7 +13250,7 @@ Public Class FrmCSeriesConfig
         End If
     End Sub
     Public Sub FrmCSeriesConfig_FormClosing()
-        NetworkHelp.SetNetworkAdapterDHCP()
+        NetworkHelp.SetNetworkAdapterDHCP(False)
         If Not IsNothing(pollThreadclass) Then
             pollThreadclass.PollingThreadClosed()
         End If

BLV_Studio/My Project/AssemblyInfo.vb

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

BLV_Studio/Test/GridTest/AddPeripherals.vb

@@ -291,7 +291,8 @@ Public Class AddPeripherals
                 CheckBox2.Visible = True
                 CheckBox5.Text = "风速模式提示音"
                 CheckBox5.Visible = True
-
+                CheckBox3.Text = "禁用风速自动停止"
+                CheckBox3.Visible = True
                 SplitContainer4.Panel1Collapsed = True
                 SplitContainer4.Panel2Collapsed = False
                 Dim val As String = FindAttributeValueUnderModel(Resultmodel, "设备存在"， "水机无阀")
@@ -766,7 +767,7 @@ Public Class AddPeripherals
         CheckBox4.Visible = False
         CheckBox2.Visible = False
         CheckBox3.Visible = False
-
+        CheckBox6.Visible = False
         FdevPort.Visible = False
         FdevAddr.Visible = False
         FdevPortCom.Visible = False
@@ -811,7 +812,8 @@ Public Class AddPeripherals
                 CheckBox5.Text = "风速模式提示音"
                 CheckBox5.Visible = True
                 CheckBox4.Visible = True
-
+                CheckBox3.Text = "禁用风速自动停止"
+                CheckBox3.Visible = True
                 SplitContainer4.Panel1Collapsed = True
                 SplitContainer4.Panel2Collapsed = False
                 Dim val As String = FindAttributeValueUnderModel(Resultmodel, "设备存在"， "水机无阀")
@@ -3080,7 +3082,7 @@ Public Class AddPeripherals
     End Sub
 
     Private Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox2.CheckedChanged
-        CheckBox3.Checked = CheckBox2.Checked
+        ' CheckBox3.Checked = CheckBox2.Checked
 
     End Sub
 

BLV_Studio/Test/GridTest/PowerSupply.vb

@@ -181,8 +181,10 @@ Public Class PowerSupply
                 crow = j
                 '21,1,0,1,
                 '21,2,10,2,
-                If chname.Contains("CH1") Then
-                    Exit For
+                If chname.Contains("CH10") Then
+                    addserviceData = "40,1,0,1,"
+                    addserviceData1 = "40,2,0,1,"
+
                     'addserviceData = "13,1,0,1,"
                     'addserviceData1 = "13,2,0,1,"
                 ElseIf chname.Contains("CH2") Then
@@ -209,9 +211,8 @@ Public Class PowerSupply
                 ElseIf chname.Contains("CH9") Then
                     addserviceData = "39,1,0,1,"
                     addserviceData1 = "39,2,0,1,"
-                ElseIf chname.Contains("CH10") Then
-                    addserviceData = "40,1,0,1,"
-                    addserviceData1 = "40,2,0,1,"
+                ElseIf chname.Contains("CH1") Then
+                    Exit For
                 Else
                     Exit For
                 End If

BLV_Studio/Test/GridTest/TableInteraction.vb

@@ -6726,7 +6726,11 @@ Public Class TableInteraction
                         Else
                         TemptDevType=TemptDevType+8
                     End If
-                                 
+                     If Curtainbuf(2).Equals("1") Then
+                        keepParam(10) =1
+                        else
+                        keepParam(10) =0
+                     End If
                 End If
 
             End If