diff --git a/BLV_Studio/BLV_Studio.vbproj b/BLV_Studio/BLV_Studio.vbproj
index 7c64a64..22c4643 100644
--- a/BLV_Studio/BLV_Studio.vbproj
+++ b/BLV_Studio/BLV_Studio.vbproj
@@ -35,7 +35,7 @@
4.0.0.5
true
index.html
- 101
+ 106
4.4.3.%2a
false
true
diff --git a/BLV_Studio/Control/DHCP/NetworkHelp.vb b/BLV_Studio/Control/DHCP/NetworkHelp.vb
index 4981b82..e18244c 100644
--- a/BLV_Studio/Control/DHCP/NetworkHelp.vb
+++ b/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
diff --git a/BLV_Studio/My Project/AssemblyInfo.vb b/BLV_Studio/My Project/AssemblyInfo.vb
index 4c1b12b..8e69405 100644
--- a/BLV_Studio/My Project/AssemblyInfo.vb
+++ b/BLV_Studio/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
'通过使用 "*",如下所示:
'
-
-
+
+
diff --git a/BLV_Studio/Test/GridTest/AddPeripherals.vb b/BLV_Studio/Test/GridTest/AddPeripherals.vb
index 66778ac..ee1c35f 100644
--- a/BLV_Studio/Test/GridTest/AddPeripherals.vb
+++ b/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
diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb
index f0b15ad..fc01e1b 100644
--- a/BLV_Studio/Test/GridTest/TableInteraction.vb
+++ b/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
diff --git a/BLV_Studio/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/BLV_Studio/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 997f1fd..a39ff66 100644
Binary files a/BLV_Studio/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/BLV_Studio/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ