From 7385079afe7cc6c5eefd699384acc06b6f875277 Mon Sep 17 00:00:00 2001 From: chenzhihao <1798906853@qq.com> Date: Sat, 28 Mar 2026 16:52:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A6=81=E7=94=A8=E9=A3=8E?= =?UTF-8?q?=E9=80=9F=E8=87=AA=E5=8A=A8=E5=81=9C=E6=AD=A2=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BLV_Studio/BLV_Studio.vbproj | 2 +- BLV_Studio/Control/DHCP/NetworkHelp.vb | 20 ++++++++++-------- BLV_Studio/My Project/AssemblyInfo.vb | 4 ++-- BLV_Studio/Test/GridTest/AddPeripherals.vb | 10 +++++---- BLV_Studio/Test/GridTest/TableInteraction.vb | 6 +++++- ...gnTimeResolveAssemblyReferencesInput.cache | Bin 16198 -> 18136 bytes 6 files changed, 25 insertions(+), 17 deletions(-) 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 997f1fd02751490c7b935e22419ec7a248d00878..a39ff664f1bb15f95f720c7fcf820d141786c7ee 100644 GIT binary patch literal 18136 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 X9{`j>BxNRLDaIg}dpBn&7bpV&$Tnq-