去掉频繁提示

GK-HTRB-C16P.Upgradation/GK-HTRB-C16P.Upgradation.csproj

 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Obfuscar.2.2.40\build\obfuscar.props" Condition="Exists('..\packages\Obfuscar.2.2.40\build\obfuscar.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -24,9 +26,10 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,7 +39,7 @@
     <OutputPath>bin\Upgradation\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>0</WarningLevel>
+    <WarningLevel>2</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
@@ -162,4 +165,10 @@
 xcopy "$(SolutionDir)$(SolutionName)\bin\Debug\Languages\*.*" "$(TargetDir)\Languages" /d /y
 xcopy "$(SolutionDir)$(SolutionName)\bin\Debug\Resources\*.*" "$(TargetDir)\Resources" /d /y</PostBuildEvent>
   </PropertyGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Obfuscar.2.2.40\build\obfuscar.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Obfuscar.2.2.40\build\obfuscar.props'))" />
+  </Target>
 </Project>
\ No newline at end of file

GK-HTRB-C16P.Upgradation/bin/Upgradation/Languages/ChineseSimplified.xml

@@ -152,9 +152,9 @@
 			<Control name="uiLabel4" text="小数长度:"/>
 			<Control name="uiLabel5" text="电压设置:"/>
 			<Control name="uiLabel6" text="设备编号:"/>
+      <Control name="uiLabel7" text="烘箱Id:"/>
 			<Control name="uiSymbolButton2" text="灯光控制"/>
 			<Control name="uiSymbolButton1" text="对应关系"/>
-			<Control name="uiSymbolButton4" text="通道类型"/>
 			<Control name="uiSymbolButton3" text="保存设置"/>
 			<Control name="Com_DevTypeId" text="0"/>
 			<Control name="Com_PowerId" text="0"/>
@@ -223,6 +223,7 @@
 			<Control name="CommunicationSetting" text="通讯口设置"/>
 			<Control name="uiGroupBox1" text="通讯设置："/>
 			<Control name="uiGroupBox2" text="记录保存间隔时间(分钟)："/>
+      <Control name="uiSymbolButton4" text="通道类型"/>
 			<Control name="uiLabel1" text="驱动检测板："/>
 			<Control name="uiLabel2" text="试验电源："/>
 			<Control name="uiLabel3" text="高温试验箱："/>
@@ -633,7 +634,7 @@
 			<DataGridViewCell name="GridExceedElectric" HeaderText="过流设置值"/>
 			<DataGridViewCell name="GridSetupVoltage" HeaderText="设定电压值"/>
 			<DataGridViewCell name="GridStageVoltage" HeaderText="阶段加压值"/>
-			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长值"/>
+			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长"/>
 			<DataGridViewCell name="GridControlBtn" HeaderText="控制"/>
 		</DataGridViewCells>
 	</Form>
@@ -666,7 +667,7 @@
 			<DataGridViewCell name="GridExceedElectric" HeaderText="过流设置值"/>
 			<DataGridViewCell name="GridSetupVoltage" HeaderText="设定电压值"/>
 			<DataGridViewCell name="GridStageVoltage" HeaderText="阶段降压值"/>
-			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长值"/>
+			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长"/>
 			<DataGridViewCell name="GridControlBtn" HeaderText="控制"/>
 		</DataGridViewCells>
 	</Form>

GK-HTRB-C16P.Upgradation/bin/Upgradation/Languages/English.xml

@@ -147,9 +147,9 @@
 			<Control name="uiLabel4" text="Decimal length:"/>
 			<Control name="uiLabel5" text="Voltage setting:"/>
 			<Control name="uiLabel6" text="Equipment number:"/>
+      <Control name="uiLabel7" text="Oven Id:"/>
 			<Control name="uiSymbolButton2" text="Light control"/>
 			<Control name="uiSymbolButton1" text="Correspondence"/>
-			<Control name="uiSymbolButton4" text="Slot Type"/>
 			<Control name="uiSymbolButton3" text="Save Settings"/>
 			<Control name="Com_DevTypeId" text="0"/>
 			<Control name="Com_PowerId" text="0"/>
@@ -218,6 +218,7 @@
 			<Control name="CommunicationSetting" text="Communication Port Setting"/>
 			<Control name="uiGroupBox1" text="Communication Settings："/>
 			<Control name="uiGroupBox2" text="Record Saving Interval (m)："/>
+      <Control name="uiSymbolButton4" text="Slot Type"/>
 			<Control name="uiLabel1" text="Drive Detection BIB："/>
 			<Control name="uiLabel2" text="Test PS Supply："/>
 			<Control name="uiLabel3" text="Oven1："/>

GK-HTRB-C16P.Upgradation/obj/Debug/GK-HTRB-C16P.Upgradation.csproj.FileListAbsolute.txt

@@ -45,13 +45,14 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgr
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\SunnyUI.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\Dapper.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\System.Data.SQLite.dll
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\Newtonsoft.Json.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\HTICOLClient.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\MQTTnet.dll
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\Newtonsoft.Json.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\GKHTRBC16P.Bll.pdb
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\GKHTRBC16P.Model.pdb
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\GKHTRBC16P.Toolbox.pdb
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\log4net.xml
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\Newtonsoft.Json.xml
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debug\GK-HTRB-C16P.Upgradation.csproj.AssemblyReference.cache
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debug\GK_HTRB_C16P.Upgradation.FrmUpgradation.resources
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debug\GK_HTRB_C16P.Upgradation.Properties.Resources.resources
@@ -60,4 +61,3 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debu
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debug\GK-HTRB-.862196FD.Up2Date
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debug\GK-HTRB-C16P.Upgradation.exe
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debug\GK-HTRB-C16P.Upgradation.pdb
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\Newtonsoft.Json.xml

GK-HTRB-C16P.Upgradation/packages.config

 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.15" targetFramework="net46" />
+  <package id="Obfuscar" version="2.2.40" targetFramework="net46" developmentDependency="true" />
   <package id="SunnyUI" version="3.2.2" targetFramework="net46" />
   <package id="SunnyUI.Common" version="3.2.0" targetFramework="net46" />
 </packages>
\ No newline at end of file

GKHTRBC16P.Bll/obj/Debug/GKHTRBC16P.Bll.csproj.FileListAbsolute.txt

@@ -31,15 +31,15 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\GKHTRBC1
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\GKHTRBC16P.Toolbox.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\System.Data.SQLite.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\Newtonsoft.Json.dll
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\log4net.dll
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\HTICOLClient.dll
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\MQTTnet.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\GKHTRBC16P.Model.pdb
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\GKHTRBC16P.Toolbox.pdb
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\Newtonsoft.Json.xml
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\log4net.xml
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.csproj.AssemblyReference.cache
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.csproj.CoreCompileInputs.cache
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC1.DFBB4EF2.Up2Date
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.pdb
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\Newtonsoft.Json.xml
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\log4net.dll
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\HTICOLClient.dll
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\MQTTnet.dll
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\log4net.xml

GKHTRBC16P.Calibrationfm/obj/Debug/GKHTRBC16P.Calibrationfm.csproj.FileListAbsolute.txt

@@ -55,14 +55,15 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debu
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\SunnyUI.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\Dapper.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\System.Data.SQLite.dll
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\Newtonsoft.Json.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\log4net.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\HTICOLClient.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\MQTTnet.dll
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\Newtonsoft.Json.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\GKHTRBC16P.Bll.pdb
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\GKHTRBC16P.Model.pdb
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\GKHTRBC16P.Protocol.pdb
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\GKHTRBC16P.Toolbox.pdb
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\Newtonsoft.Json.xml
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\log4net.xml
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\obj\Debug\GKHTRBC16P.Calibrationfm.csproj.AssemblyReference.cache
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\obj\Debug\GKHTRBC16P.Calibrationfm.FCalGk.resources
@@ -80,4 +81,3 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\obj\Debu
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\obj\Debug\GKHTRBC1.82067B27.Up2Date
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\obj\Debug\GKHTRBC16P.Calibrationfm.exe
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\obj\Debug\GKHTRBC16P.Calibrationfm.pdb
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\Newtonsoft.Json.xml

GKHTRBC16P.Model/obj/Debug/GKHTRBC16P.Model.csproj.FileListAbsolute.txt

@@ -4,12 +4,12 @@ E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Mod
 E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.csproj.CoreCompileInputs.cache
 E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.dll
 E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.pdb
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\bin\Debug\GKHTRBC16P.Model.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\bin\Debug\GKHTRBC16P.Model.pdb
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.csproj.AssemblyReference.cache
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.csproj.CoreCompileInputs.cache
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.pdb
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\bin\Debug\Newtonsoft.Json.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\bin\Debug\Newtonsoft.Json.xml
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.csproj.AssemblyReference.cache
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.csproj.CoreCompileInputs.cache
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC1.4C7FFEC7.Up2Date
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.dll
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.pdb

GKHTRBC16P.Protocol/obj/Debug/GKHTRBC16P.Protocol.csproj.FileListAbsolute.txt

@@ -31,17 +31,17 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\GKH
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\GKHTRBC16P.Toolbox.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\SunnyUI.Common.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\SunnyUI.dll
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\Newtonsoft.Json.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\log4net.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\System.Data.SQLite.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\HTICOLClient.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\MQTTnet.dll
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\Newtonsoft.Json.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\GKHTRBC16P.Model.pdb
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\GKHTRBC16P.Toolbox.pdb
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\Newtonsoft.Json.xml
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\log4net.xml
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\obj\Debug\GKHTRBC16P.Protocol.csproj.AssemblyReference.cache
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\obj\Debug\GKHTRBC16P.Protocol.csproj.CoreCompileInputs.cache
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\obj\Debug\GKHTRBC1.CA66D6C3.Up2Date
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\obj\Debug\GKHTRBC16P.Protocol.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\obj\Debug\GKHTRBC16P.Protocol.pdb
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\Newtonsoft.Json.xml

GKHTRBC16P.Toolbox/CalculationAo.cs

@@ -54,7 +54,6 @@ namespace GKHTRBC16P.Toolbox
         public static int BoardSS { get; set; } = 0;//显示当前界面的板号
         public static int RunLEDState = 0;
         public static int[] OnOffFre = new int[36];//通断次数
-        public static Dictionary<int, int> TitTimeBoard { get; set; }
         public static Dictionary<int, DateTime> DateTimeBoard { get; set; }
         public static Dictionary<int, DateTime> PowerTime { get; set; }
         public static Dictionary<int, DateTime> OvenTime { get; set; }

GKHTRBC16P.Toolbox/obj/Debug/GKHTRBC16P.Toolbox.csproj.FileListAbsolute.txt

@@ -29,10 +29,11 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\GKHT
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\HTICOLClient.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\log4net.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\System.Data.SQLite.dll
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\MQTTnet.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\Newtonsoft.Json.dll
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\MQTTnet.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\GKHTRBC16P.Model.pdb
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\log4net.xml
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\Newtonsoft.Json.xml
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\GKHTRBC16P.Toolbox.csproj.AssemblyReference.cache
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\Interop.IWshRuntimeLibrary.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\GKHTRBC16P.Toolbox.csproj.ResolveComReference.cache
@@ -40,4 +41,3 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\GKHT
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\GKHTRBC1.0B3BAC72.Up2Date
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\GKHTRBC16P.Toolbox.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\GKHTRBC16P.Toolbox.pdb
-E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\Newtonsoft.Json.xml

GKHTRBC16P/FrmMain.cs

@@ -69,6 +69,7 @@ namespace GKHTRBC16P
         {
             ShowWaitForm(MultiLanguage.Prompt("rstart"));
             InitializeComponent();
+            
             SetWaitFormDescription(UILocalize.SystemProcessing);
             mainForm = this;
             SerialManager.Defirst();
@@ -946,7 +947,7 @@ namespace GKHTRBC16P
                                 if (result == 0)
                                 {
                                     uPublic.WriteLog("温度设置成功" + ten.Temp.ToString("000.0"));
-                                    ShowSuccessTip("温度设置成功" + ten.Temp.ToString("000.0"));
+                                    ShowSuccessTip("温度设置成功" + ten.Temp.ToString("000.0"), 1000);
                                 }
                                 Thread.Sleep(500);
                                 if (ten.HumIs == 'Y')
@@ -971,7 +972,7 @@ namespace GKHTRBC16P
                                     if (result == 0)
                                     {
                                         uPublic.WriteLog("湿度设置成功" + ten.Hum.ToString("000.0"));
-                                        ShowSuccessTip("湿度设置成功" + ten.Hum.ToString("000.0"));
+                                        ShowSuccessTip("湿度设置成功" + ten.Hum.ToString("000.0"), 1000);
                                     }
                                 }
                                 ten.ExTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -1007,7 +1008,7 @@ namespace GKHTRBC16P
                                 if (result == 0)
                                 {
                                     uPublic.WriteLog("定值运行设置");
-                                    ShowSuccessTip("定值运行设置");
+                                    ShowSuccessTip("定值运行设置", 1000);
                                 }
                             }
                             ten.TempIs = 'E';

GKHTRBC16P/FrmMainTbrido.cs

@@ -423,7 +423,7 @@ namespace GKHTRBC16P
                                 if (result == 0)
                                 {
                                     uPublic.WriteLog("温度设置成功" + ten.Temp.ToString("000.0"));
-                                    ShowSuccessTip("温度设置成功" + ten.Temp.ToString("000.0"));
+                                    ShowSuccessTip("温度设置成功" + ten.Temp.ToString("000.0"), 1000);
                                 }
                                 Thread.Sleep(500);
                                 if (ten.HumIs == 'Y')
@@ -434,7 +434,7 @@ namespace GKHTRBC16P
                                     if (result == 0)
                                     {
                                         uPublic.WriteLog("湿度设置成功" + ten.Hum.ToString("000.0"));
-                                        ShowSuccessTip("湿度设置成功" + ten.Hum.ToString("000.0"));
+                                        ShowSuccessTip("湿度设置成功" + ten.Hum.ToString("000.0"), 1000);
                                     }
                                 }
                                 ten.ExTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -444,7 +444,7 @@ namespace GKHTRBC16P
                                     result = Gws.Instance.ComTemperature(this, TemperaSign - 1, CalculationAo.ThisDevConfig.TestBoxNo+",MODE,CONSTANT");
                                 if (result == 0)
                                 {
-                                    ShowSuccessTip("定值运行设置");
+                                    ShowSuccessTip("定值运行设置", 1000);
                                 }
                             }
                             ten.TempIs = 'E';

GKHTRBC16P/FunMov/CommunicationSetting.cs

@@ -225,7 +225,7 @@ namespace GKHTRBC16P.FunMov
             if (testp != null)
             {
                 ShowErrorTip(MultiLanguage.Prompt("editcontit"));
-                uPublic.WriteLog((sender as UISymbolButton).Text + ":" + MultiLanguage.Prompt("editcontit"));
+                uPublic.WriteLog("Txt_AutoSavePath_Click:" + MultiLanguage.Prompt("editcontit"));
                 return;
             }
             string dir = "";
@@ -270,6 +270,18 @@ namespace GKHTRBC16P.FunMov
             //}
         }
 
+        private void uiSymbolButton4_Click(object sender, EventArgs e)
+        {
+            ThorouType frm = new ThorouType();
+            frm.Render();
+            frm.ShowDialog();
+            if (frm.DialogResult == DialogResult.OK)
+            {
+                UIMessageTip.ShowOk("ok！");
+                frm.Dispose();
+            }
+        }
+
 
         //public static void Drive_DataReceived(object sender, SerialDataReceivedEventArgs e)
         //{ 

GKHTRBC16P/FunMov/FrmPowerSet.cs

@@ -566,7 +566,7 @@ namespace GKHTRBC16P.FunMov
                         }
                     }
                 }
-                var devlist = deviceBll.GetList();
+                var devlist = deviceBll.GetListNotStatus();
                 decimal VolMax = devlist.Count > 0 ? devlist.Max(x => x.BackVol) : 0;
                 if (VolMax > 0 && (decimal)Vx > VolMax)
                 {

GKHTRBC16P/FunMov/FrmPowerTab.cs

@@ -88,7 +88,7 @@ namespace GKHTRBC16P.FunMov
         }
         private void LocadMain()
         {
-            dev_Devices = deviceBll.GetList();//CalculationAo.parametersList
+            dev_Devices = deviceBll.GetListNotStatus();//CalculationAo.parametersList
             slotvsPowertems = new List<SlotvsPowertem>();
             bool Ismltpow = false;
             foreach (var curr in CalculationAo.CorrPowerDic.Values)

GKHTRBC16P/FunMov/FunPowerSet.cs

@@ -47,7 +47,7 @@ namespace GKHTRBC16P.FunMov
             {
                 powernum = Convert.ToInt16(SEPowerAdd.Text.Trim());
                 DeviceBll deviceBll = new DeviceBll();
-                var devlist = deviceBll.GetList();
+                var devlist = deviceBll.GetListNotStatus();
                 decimal VolMax = devlist.Count > 0 ? devlist.Max(x => x.BackVol) : 0;
                 if (VolMax > 0)
                     EditVSet.Maximum = (double)VolMax;

GKHTRBC16P/FunMov/Home_Status.cs

@@ -75,7 +75,6 @@ namespace GKHTRBC16P.FunMov
             stationalarm = stationAlarmBll.GetList();
             CalculationAo.parametersList = new List<Test_Parameter>();
             CalculationAo.DateTimeBoard = new Dictionary<int, DateTime>();
-            CalculationAo.TitTimeBoard = new Dictionary<int, int>();
             foreach (var dbr in devBrList)
             {
                 if (dbr != null)
@@ -90,7 +89,6 @@ namespace GKHTRBC16P.FunMov
             int[] Vtype = { 2, 3, 5,8 };
             for (int i = 1; i <= CalculationAo.ThisDevConfig.Passageway; i++)
             {
-                CalculationAo.TitTimeBoard[i] = 0;
                 //CalculationAo.DicBoardInfo[i] =  
                 if (!Vtype.Contains(CalculationAo.Thorous[i].Waytype))
                     CalculationAo.DicBoardInfo[i] = stationDataBll.DicHeaderStationFun(CalculationAo.ThisDevConfig.ReportDisTemp, CalculationAo.Thorous[i].Snum, i);
@@ -161,7 +159,7 @@ namespace GKHTRBC16P.FunMov
                 {
 
                     model.IsCkeckAlarm = Array.ConvertAll<string, int>(ischeckalarm.IsCheck.Split(","), s => Convert.ToInt16(s));
-                    if (model.IsCkeckAlarm.Length != CalculationAo.Thorous[i].Snum)
+                    if (model.IsCkeckAlarm.Length < CalculationAo.Thorous[i].Snum)
                     {
                         model.IsCkeckAlarm = new int[CalculationAo.Thorous[i].Snum];
                         ShowErrorTip("Station Alarm Configuration Error!");
@@ -250,7 +248,7 @@ namespace GKHTRBC16P.FunMov
             {
 
                 model.IsCkeckAlarm = Array.ConvertAll<string, int>(ischeckalarm.IsCheck.Split(","), s => Convert.ToInt16(s));
-                if (model.IsCkeckAlarm.Length != CalculationAo.Thorous[slot].Snum)
+                if (model.IsCkeckAlarm.Length < CalculationAo.Thorous[slot].Snum)
                 {
                     model.IsCkeckAlarm = new int[CalculationAo.Thorous[slot].Snum];
                     ShowErrorTip("Station Alarm Configuration Error!");

GKHTRBC16P/FunMov/SystemConfig.Designer.cs

@@ -32,7 +32,6 @@
             this.uiGroupBox6 = new Sunny.UI.UIGroupBox();
             this.uiSymbolButton5 = new Sunny.UI.UISymbolButton();
             this.uiSymbolButton2 = new Sunny.UI.UISymbolButton();
-            this.uiSymbolButton4 = new Sunny.UI.UISymbolButton();
             this.Txt_ComPowerNum = new Sunny.UI.UITextBox();
             this.uiLabel20 = new Sunny.UI.UILabel();
             this.Com_PowerId = new Sunny.UI.UIComboBox();
@@ -97,7 +96,6 @@
             // 
             this.uiGroupBox6.Controls.Add(this.uiSymbolButton5);
             this.uiGroupBox6.Controls.Add(this.uiSymbolButton2);
-            this.uiGroupBox6.Controls.Add(this.uiSymbolButton4);
             this.uiGroupBox6.Controls.Add(this.Txt_ComPowerNum);
             this.uiGroupBox6.Controls.Add(this.uiLabel20);
             this.uiGroupBox6.Controls.Add(this.Com_PowerId);
@@ -135,10 +133,10 @@
             // 
             this.uiSymbolButton2.Cursor = System.Windows.Forms.Cursors.Hand;
             this.uiSymbolButton2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiSymbolButton2.Location = new System.Drawing.Point(542, 70);
+            this.uiSymbolButton2.Location = new System.Drawing.Point(360, 70);
             this.uiSymbolButton2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiSymbolButton2.Name = "uiSymbolButton2";
-            this.uiSymbolButton2.Size = new System.Drawing.Size(152, 35);
+            this.uiSymbolButton2.Size = new System.Drawing.Size(159, 35);
             this.uiSymbolButton2.Symbol = 57509;
             this.uiSymbolButton2.TabIndex = 24;
             this.uiSymbolButton2.Text = "灯光控制";
@@ -146,21 +144,6 @@
             this.uiSymbolButton2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.uiSymbolButton2.Click += new System.EventHandler(this.uiSymbolButton2_Click);
             // 
-            // uiSymbolButton4
-            // 
-            this.uiSymbolButton4.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.uiSymbolButton4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiSymbolButton4.Location = new System.Drawing.Point(360, 70);
-            this.uiSymbolButton4.MinimumSize = new System.Drawing.Size(1, 1);
-            this.uiSymbolButton4.Name = "uiSymbolButton4";
-            this.uiSymbolButton4.Size = new System.Drawing.Size(159, 35);
-            this.uiSymbolButton4.Symbol = 62009;
-            this.uiSymbolButton4.TabIndex = 11;
-            this.uiSymbolButton4.Text = "通道类型";
-            this.uiSymbolButton4.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiSymbolButton4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.uiSymbolButton4.Click += new System.EventHandler(this.uiSymbolButton4_Click_1);
-            // 
             // Txt_ComPowerNum
             // 
             this.Txt_ComPowerNum.Cursor = System.Windows.Forms.Cursors.IBeam;
@@ -816,7 +799,6 @@
         private Sunny.UI.UIIntegerUpDown Txt_DataLength;
         private Sunny.UI.UILabel uiLabel1;
         private Sunny.UI.UILabel uiLabel13;
-        private Sunny.UI.UISymbolButton uiSymbolButton4;
         private Sunny.UI.UIComboBox txt_SaveVoltage;
         private Sunny.UI.UILabel uiLabel5;
         private Sunny.UI.UITextBox uiTextBox1;

GKHTRBC16P/FunMov/SystemConfig.cs

@@ -308,14 +308,14 @@ namespace GKHTRBC16P.FunMov
         {
             CalculationAo.ThisDevConfig.Isbridge = index;
             var dtype = devprolist.Max(x => x.Dtype) + 1;
-            if (index == dtype)
-            {
-                uiSymbolButton4.Visible = true;
-            }
-            else
-            {
-                uiSymbolButton4.Visible = false;
-            }
+            //if (index == dtype)
+            //{
+            //    uiSymbolButton4.Visible = true;
+            //}
+            //else
+            //{
+            //    uiSymbolButton4.Visible = false;
+            //}
         }
 
         private void uiSymbolButton4_Click(object sender, EventArgs e)

GKHTRBC16P/Jurisdiction/FrmResisCali.cs

@@ -205,7 +205,7 @@ namespace GKHTRBC16P.Jurisdiction
                 if (comrx == 0)
                 {
                     int[] ComdData = CalculationAo.ComdData[WayId];
-                    if (ComdData[2] != 0xff && new int[2] { 0, 2 }.Contains(thor.Waytype))
+                    if (!new int[2] { 0, 2 }.Contains(thor.Waytype))//ComdData[2] != 0xff && 
                         return;
                     worksheet["A1"] = "Standard resistance Test      NO." + uiComboBox1.Text;
                     worksheet["I3"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

GKHTRBC16P/Jurisdiction/FrmStagePress.Designer.cs

@@ -36,7 +36,6 @@
             this.uiLabel1 = new Sunny.UI.UILabel();
             this.uiLedBulb1 = new Sunny.UI.UILedBulb();
             this.uiDataGridView1 = new Sunny.UI.UIDataGridView();
-            this.Column1_Check = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.Txt_ExceedVoltage = new Sunny.UI.UITextBox();
             this.Txt_ExceedElectric = new Sunny.UI.UITextBox();
             this.Txt_SetupVoltage = new Sunny.UI.UITextBox();
@@ -64,6 +63,8 @@
             this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1_Check = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.GridPs = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column1_Slot = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GridVoltageSpec = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -75,7 +76,6 @@
             this.GridSetupVoltage = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GridStageVoltage = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GridStageTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.uiDataGridView1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -173,15 +173,6 @@
             this.uiDataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.uiDataGridView1_CellClick);
             this.uiDataGridView1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.uiDataGridView1_CellEndEdit);
             // 
-            // Column1_Check
-            // 
-            this.Column1_Check.FalseValue = "0";
-            this.Column1_Check.HeaderText = "选择";
-            this.Column1_Check.Name = "Column1_Check";
-            this.Column1_Check.TrueValue = "1";
-            this.Column1_Check.Visible = false;
-            this.Column1_Check.Width = 50;
-            // 
             // Txt_ExceedVoltage
             // 
             this.Txt_ExceedVoltage.Cursor = System.Windows.Forms.Cursors.IBeam;
@@ -520,6 +511,22 @@
             this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
             this.dataGridViewTextBoxColumn11.Width = 80;
             // 
+            // dataGridViewTextBoxColumn12
+            // 
+            this.dataGridViewTextBoxColumn12.HeaderText = "停止加压";
+            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            this.dataGridViewTextBoxColumn12.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewTextBoxColumn12.Width = 80;
+            // 
+            // Column1_Check
+            // 
+            this.Column1_Check.FalseValue = "0";
+            this.Column1_Check.HeaderText = "选择";
+            this.Column1_Check.Name = "Column1_Check";
+            this.Column1_Check.TrueValue = "1";
+            this.Column1_Check.Visible = false;
+            this.Column1_Check.Width = 50;
+            // 
             // GridPs
             // 
             this.GridPs.DataPropertyName = "PS";
@@ -593,17 +600,10 @@
             // GridStageTime
             // 
             this.GridStageTime.DataPropertyName = "StageTime";
-            this.GridStageTime.HeaderText = "阶段时长值";
+            this.GridStageTime.HeaderText = "阶段频率";
             this.GridStageTime.Name = "GridStageTime";
             this.GridStageTime.Width = 120;
             // 
-            // dataGridViewTextBoxColumn12
-            // 
-            this.dataGridViewTextBoxColumn12.HeaderText = "停止加压";
-            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
-            this.dataGridViewTextBoxColumn12.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridViewTextBoxColumn12.Width = 80;
-            // 
             // FrmStagePress
             // 
             this.AllowShowTitle = true;

GKHTRBC16P/Jurisdiction/FrmStagePress.cs

@@ -46,7 +46,7 @@ namespace GKHTRBC16P.Jurisdiction
                 stageCompressionbll = new StageCompressionBll();
                 Stage_Compression = stageCompressionbll.GetList(0);
                 deviceBll = new DeviceBll();
-                var devlist = deviceBll.GetList();
+                var devlist = deviceBll.GetListNotStatus();
                 List<Stage_Compression> BdStage = new List<Stage_Compression>();
                 for (int i = 1; i <= CalculationAo.ThisDevConfig.ComPowerNum; i++)
                 {
@@ -75,6 +75,9 @@ namespace GKHTRBC16P.Jurisdiction
                     }
                     var corm = CalculationAo.CorrPowerDic.Values.Where(x => (x.PowerId+",").Contains("PS" + i+",")).Select(a => a.PassagewayId).ToArray();
                     model.Slot = string.Join(",", corm);
+                    model.ExceedVoltage = 0;
+                    model.SetupVoltage = 0;
+                    model.StageVoltage = 0;
                     BdStage.Add(model);
                 }
                 uiDataGridView1.DataSource = BdStage;
@@ -203,6 +206,7 @@ namespace GKHTRBC16P.Jurisdiction
                 List<Stage_Compression> stagelist = uiDataGridView1.DataSource as List<Stage_Compression>;
                 foreach (var model in stagelist)
                 {
+                    model.StageTime = 3;
                     model.StageType = 0;
                     model.UserId = CalculationAo.ThisUser.Id;
                     model.CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -315,11 +319,11 @@ namespace GKHTRBC16P.Jurisdiction
                                 {
                                     case 1://TDK电源协议
                                         string aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "TDK暂不支持" : "TDK Not supported yet";
-                                        ShowSuccessTip(aa);
+                                        ShowSuccessTip(aa, 1000);
                                         break;
                                     case 2://
                                         aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "GK暂不支持" : "GK Not supported yet";
-                                        ShowSuccessTip(aa);
+                                        ShowSuccessTip(aa, 1000);
                                         break;
                                     case 3:
                                         aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "命令发送中" : "Command sending";
@@ -397,11 +401,11 @@ namespace GKHTRBC16P.Jurisdiction
                             {
                                 case 1://TDK电源协议
                                     string aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "TDK暂不支持" : "TDK Not supported yet";
-                                    ShowSuccessTip(aa);
+                                    ShowSuccessTip(aa, 1000);
                                     break;
                                 case 2://
                                     aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "GK暂不支持" : "GK Not supported yet";
-                                    ShowSuccessTip(aa);
+                                    ShowSuccessTip(aa, 1000);
                                     break;
                                 case 3:
                                     aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "命令发送中" : "Command sending";
@@ -657,6 +661,32 @@ namespace GKHTRBC16P.Jurisdiction
                                     }
                                 }
                             }
+                            var corrl = CalculationAo.CorrPowerDic.Values.Where(x => x.PowerId == GridPs).ToList();
+                            if (corrl.Count() > 0)
+                            {
+                                foreach (var corr1 in corrl)
+                                {
+                                    var tdn = corr1.PassagewayId;
+                                    if (CalculationAo.Thorous[tdn].Waytype == 7 && CalculationAo.Thorous[tdn].Vg == 1)
+                                    {
+                                        var ComRxdData = CalculationAo.ComdData[tdn - 1];
+                                        double Vg = (double)Convert.ToUInt32(ComRxdData[345].ToString("X2") + ComRxdData[344].ToString("X2") + ComRxdData[343].ToString("X2") + ComRxdData[342].ToString("X2"), 16) / 100;
+                                        if (Vg < 0.5)
+                                        {
+                                            //FrmMain.mainForm.Prompt("powervolgate");
+                                            if (ShowAskDialog(MultiLanguage.Prompt("powervolgate")))
+                                            {
+                                                LogisTrac.WriteLog(this.GetType(), "有通道没有设置Vg，确定继续设置电压?Yes");
+                                            }
+                                            else
+                                            {
+                                                LogisTrac.WriteLog(this.GetType(), "有通道没有设置Vg，确定继续设置电压?No");
+                                                return;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                             if (SetupVoltage > ExceedVoltage)
                             {
                                 string aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "设置电压应小于等于过压设定值" : "The setting voltage should be less than or equal to the overvoltage setting value";
@@ -675,11 +705,11 @@ namespace GKHTRBC16P.Jurisdiction
                             {
                                 case 1://TDK电源协议
                                     string aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "TDK暂不支持" : "TDK Not supported yet";
-                                    ShowSuccessTip(aa);
+                                    ShowSuccessTip(aa, 1000);
                                     break;
                                 case 2://
                                     aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "GK暂不支持" : "GK Not supported yet";
-                                    ShowSuccessTip(aa);
+                                    ShowSuccessTip(aa, 1000);
                                     break;
                                 case 3:
                                     aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "命令发送中" : "Command sending";
@@ -750,11 +780,11 @@ namespace GKHTRBC16P.Jurisdiction
                         {
                             case 1://TDK电源协议
                                 string aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "TDK暂不支持" : "TDK Not supported yet";
-                                ShowSuccessTip(aa);
+                                ShowSuccessTip(aa, 1000);
                                 break;
                             case 2://
                                 aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "GK暂不支持" : "GK Not supported yet";
-                                ShowSuccessTip(aa);
+                                ShowSuccessTip(aa, 1000);
                                 break;
                             case 3:
                                 aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "命令发送中" : "Command sending";
@@ -794,10 +824,16 @@ namespace GKHTRBC16P.Jurisdiction
                 {
                     DataGridViewRow row = uiDataGridView1.Rows[e.RowIndex];
                     int quantity = Convert.ToInt32(row.Cells["GridSetupVoltage"].Value ?? 0);
-                    if (quantity > 100)
-                        quantity = quantity / 3;
-                    else
+                    if (quantity > 1000)
+                    {
                         quantity = quantity / 4;
+                        row.Cells["GridStageTime"].Value = 4;
+                    }
+                    else
+                    {
+                        quantity = quantity / 3;
+                        row.Cells["GridStageTime"].Value = 3;
+                    }
                     row.Cells["GridStageVoltage"].Value = quantity;
                 }
             }

GKHTRBC16P/Jurisdiction/FrmStageTemp.cs

@@ -60,7 +60,7 @@ namespace GKHTRBC16P.Jurisdiction
             var dev = deviceBll.GetList();
             if (dev == null)
             {
-                ShowSuccessTip("请添加器件！");
+                ShowSuccessTip("请添加器件！", 1000);
             }
             else
             {
@@ -252,7 +252,7 @@ namespace GKHTRBC16P.Jurisdiction
                 Stage_Heating thisheat = this.uiDataGridView1.CurrentRow.DataBoundItem as Stage_Heating;
                 if (thisheat.TempIs == 'Y' || thisheat.TempIs == 'E')
                 {
-                    ShowSuccessTip(uPublic.Prompt("Tips6", "FrmStageTemp"));
+                    ShowSuccessTip(uPublic.Prompt("Tips6", "FrmStageTemp"), 1000);
                     return;
                 }
                 thisheat.OvenId = uiComboBox1.Text;
@@ -298,7 +298,7 @@ namespace GKHTRBC16P.Jurisdiction
                 var et = eheatlist.Where(x => x.TempIs == 'Y' || x.TempIs == 'E').ToList();
                 if (et.Count > 0)
                 {
-                    ShowSuccessTip(uPublic.Prompt("Tips6", "FrmStageTemp"));
+                    ShowSuccessTip(uPublic.Prompt("Tips6", "FrmStageTemp"), 1000);
                     return;
                 }
                 foreach (var sheat in eheatlist)
@@ -363,7 +363,7 @@ namespace GKHTRBC16P.Jurisdiction
                 var et = eheatlist.Where(x => x.TempIs == 'Y' || x.TempIs == 'E').ToList();
                 if (et.Count > 0)
                 {
-                    ShowSuccessTip(uPublic.Prompt("Tips6", "FrmStageTemp"));
+                    ShowSuccessTip(uPublic.Prompt("Tips6", "FrmStageTemp"), 1000);
                     return;
                 }
                 else

GKHTRBC16P/Jurisdiction/FrmStepDown.cs

@@ -41,7 +41,7 @@ namespace GKHTRBC16P.Jurisdiction
                 stageCompressionbll = new StageCompressionBll();
                 Stage_Compression = stageCompressionbll.GetList(1);
                 deviceBll = new DeviceBll();
-                var devlist = deviceBll.GetList();
+                var devlist = deviceBll.GetListNotStatus();
                 List<Stage_Compression> BdStage = new List<Stage_Compression>();
                 for (int i = 1; i <= CalculationAo.ThisDevConfig.ComPowerNum; i++)
                 {
@@ -70,6 +70,10 @@ namespace GKHTRBC16P.Jurisdiction
                     }
                     var corm = CalculationAo.CorrPowerDic.Values.Where(x => (x.PowerId + ",").Contains("PS" + i + ",")).Select(a => a.PassagewayId).ToArray();
                     model.Slot = string.Join(",", corm);
+                    model.ExceedVoltage = 0;
+                    model.SetupVoltage = 0;
+                    model.StageVoltage = 0;
+                    model.StageTime = 3;
                     BdStage.Add(model);
                 }
                 uiDataGridView1.DataSource = BdStage;
@@ -190,6 +194,7 @@ namespace GKHTRBC16P.Jurisdiction
                 List<Stage_Compression> stagelist = uiDataGridView1.DataSource as List<Stage_Compression>;
                 foreach (var model in stagelist)
                 {
+                    model.StageTime = 3;
                     model.StageType = 1;
                     model.UserId = CalculationAo.ThisUser.Id;
                     model.CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -254,11 +259,11 @@ namespace GKHTRBC16P.Jurisdiction
                                 {
                                     case 1://TDK电源协议
                                         string aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "TDK暂不支持" : "TDK Not supported yet";
-                                        ShowSuccessTip(aa);
+                                        ShowSuccessTip(aa, 1000);
                                         break;
                                     case 2://
                                         aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "GK暂不支持" : "GK Not supported yet";
-                                        ShowSuccessTip(aa);
+                                        ShowSuccessTip(aa, 1000);
                                         break;
                                     case 3:
                                         aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "命令发送中" : "Command sending";
@@ -336,11 +341,11 @@ namespace GKHTRBC16P.Jurisdiction
                             {
                                 case 1://TDK电源协议
                                     string aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "TDK暂不支持" : "TDK Not supported yet";
-                                    ShowSuccessTip(aa);
+                                    ShowSuccessTip(aa, 1000);
                                     break;
                                 case 2://
                                     aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "GK暂不支持" : "GK Not supported yet";
-                                    ShowSuccessTip(aa);
+                                    ShowSuccessTip(aa, 1000);
                                     break;
                                 case 3:
                                     aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "命令发送中" : "Command sending";
@@ -555,11 +560,11 @@ namespace GKHTRBC16P.Jurisdiction
                             {
                                 case 1://TDK电源协议
                                     string aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "TDK暂不支持" : "TDK Not supported yet";
-                                    ShowSuccessTip(aa);
+                                    ShowSuccessTip(aa, 1000);
                                     break;
                                 case 2://
                                     aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "GK暂不支持" : "GK Not supported yet";
-                                    ShowSuccessTip(aa);
+                                    ShowSuccessTip(aa, 1000);
                                     break;
                                 case 3:
                                     aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "命令发送中" : "Command sending";
@@ -641,11 +646,11 @@ namespace GKHTRBC16P.Jurisdiction
                         {
                             case 1://TDK电源协议
                                 string aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "TDK暂不支持" : "TDK Not supported yet";
-                                ShowSuccessTip(aa);
+                                ShowSuccessTip(aa, 1000);
                                 break;
                             case 2://
                                 aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "GK暂不支持" : "GK Not supported yet";
-                                ShowSuccessTip(aa);
+                                ShowSuccessTip(aa, 1000);
                                 break;
                             case 3:
                                 aa = CalculationAo.ThisDevConfig.Language == "ChineseSimplified" ? "命令发送中" : "Command sending";

GKHTRBC16P/Jurisdiction/Frm_Correspondence.Designer.cs

@@ -35,14 +35,14 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Correspondence));
             this.uiDataGridView1 = new Sunny.UI.UIDataGridView();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewComboBoxColumn();
             this.uiSymbolButton1 = new Sunny.UI.UISymbolButton();
             this.uiSymbolButton2 = new Sunny.UI.UISymbolButton();
             this.uiLabel1 = new Sunny.UI.UILabel();
-            this.Column3 = new System.Windows.Forms.DataGridViewComboBoxColumn();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.uiDataGridView1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -103,6 +103,28 @@
             this.uiDataGridView1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.uiDataGridView1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.uiDataGridView1_DataError);
             // 
+            // Column1
+            // 
+            this.Column1.DataPropertyName = "PassagewayId";
+            this.Column1.HeaderText = "通道";
+            this.Column1.Name = "Column1";
+            // 
+            // Column2
+            // 
+            this.Column2.DataPropertyName = "PowerId";
+            this.Column2.HeaderText = "电源";
+            this.Column2.Name = "Column2";
+            this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column2.Width = 150;
+            // 
+            // Column3
+            // 
+            this.Column3.DataPropertyName = "OvenId";
+            this.Column3.HeaderText = "烘箱";
+            this.Column3.Name = "Column3";
+            this.Column3.Width = 130;
+            // 
             // uiSymbolButton1
             // 
             this.uiSymbolButton1.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -140,17 +162,10 @@
             this.uiLabel1.Name = "uiLabel1";
             this.uiLabel1.Size = new System.Drawing.Size(385, 29);
             this.uiLabel1.TabIndex = 3;
-            this.uiLabel1.Text = "注意：多个通道以逗号分隔,如:PS1,PS2";
+            this.uiLabel1.Text = "注意：多个通道以逗号(半角)分隔,如:PS1,PS2";
             this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.uiLabel1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // Column3
-            // 
-            this.Column3.DataPropertyName = "OvenId";
-            this.Column3.HeaderText = "烘箱";
-            this.Column3.Name = "Column3";
-            this.Column3.Width = 130;
-            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.DataPropertyName = "PassagewayId";
@@ -166,21 +181,6 @@
             this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.dataGridViewTextBoxColumn2.Width = 130;
             // 
-            // Column1
-            // 
-            this.Column1.DataPropertyName = "PassagewayId";
-            this.Column1.HeaderText = "通道";
-            this.Column1.Name = "Column1";
-            // 
-            // Column2
-            // 
-            this.Column2.DataPropertyName = "PowerId";
-            this.Column2.HeaderText = "电源";
-            this.Column2.Name = "Column2";
-            this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column2.Width = 150;
-            // 
             // Frm_Correspondence
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

GKHTRBC16P/Jurisdiction/Frm_Refult.cs

@@ -75,7 +75,7 @@ namespace GKHTRBC16P.Jurisdiction
                 //uiComboBox2//
                 if (CalculationAo.Thorous.Count <= 0)
                 {
-                    ShowSuccessTip(MultiLanguage.Prompt("Thorouesinfo"));
+                    ShowSuccessTip(MultiLanguage.Prompt("Thorouesinfo"), 1000);
                     return;
                 }
                 for (int j = 0; j < CalculationAo.Thorous.Count; j++)

GKHTRBC16P/Languages/ChineseSimplified.xml

@@ -152,9 +152,9 @@
 			<Control name="uiLabel4" text="小数长度:"/>
 			<Control name="uiLabel5" text="电压设置:"/>
 			<Control name="uiLabel6" text="设备编号:"/>
+      <Control name="uiLabel7" text="烘箱Id:"/>
 			<Control name="uiSymbolButton2" text="灯光控制"/>
 			<Control name="uiSymbolButton1" text="对应关系"/>
-			<Control name="uiSymbolButton4" text="通道类型"/>
 			<Control name="uiSymbolButton3" text="保存设置"/>
 			<Control name="Com_DevTypeId" text="0"/>
 			<Control name="Com_PowerId" text="0"/>
@@ -223,6 +223,7 @@
 			<Control name="CommunicationSetting" text="通讯口设置"/>
 			<Control name="uiGroupBox1" text="通讯设置："/>
 			<Control name="uiGroupBox2" text="记录保存间隔时间(分钟)："/>
+      <Control name="uiSymbolButton4" text="通道类型"/>
 			<Control name="uiLabel1" text="驱动检测板："/>
 			<Control name="uiLabel2" text="试验电源："/>
 			<Control name="uiLabel3" text="高温试验箱："/>
@@ -633,7 +634,7 @@
 			<DataGridViewCell name="GridExceedElectric" HeaderText="过流设置值"/>
 			<DataGridViewCell name="GridSetupVoltage" HeaderText="设定电压值"/>
 			<DataGridViewCell name="GridStageVoltage" HeaderText="阶段加压值"/>
-			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长值"/>
+			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长"/>
 			<DataGridViewCell name="GridControlBtn" HeaderText="控制"/>
 		</DataGridViewCells>
 	</Form>
@@ -666,7 +667,7 @@
 			<DataGridViewCell name="GridExceedElectric" HeaderText="过流设置值"/>
 			<DataGridViewCell name="GridSetupVoltage" HeaderText="设定电压值"/>
 			<DataGridViewCell name="GridStageVoltage" HeaderText="阶段降压值"/>
-			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长值"/>
+			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长"/>
 			<DataGridViewCell name="GridControlBtn" HeaderText="控制"/>
 		</DataGridViewCells>
 	</Form>

GKHTRBC16P/Languages/English.xml

@@ -147,9 +147,9 @@
 			<Control name="uiLabel4" text="Decimal length:"/>
 			<Control name="uiLabel5" text="Voltage setting:"/>
 			<Control name="uiLabel6" text="Equipment number:"/>
+      <Control name="uiLabel7" text="Oven Id:"/>
 			<Control name="uiSymbolButton2" text="Light control"/>
 			<Control name="uiSymbolButton1" text="Correspondence"/>
-			<Control name="uiSymbolButton4" text="Slot Type"/>
 			<Control name="uiSymbolButton3" text="Save Settings"/>
 			<Control name="Com_DevTypeId" text="0"/>
 			<Control name="Com_PowerId" text="0"/>
@@ -218,6 +218,7 @@
 			<Control name="CommunicationSetting" text="Communication Port Setting"/>
 			<Control name="uiGroupBox1" text="Communication Settings："/>
 			<Control name="uiGroupBox2" text="Record Saving Interval (m)："/>
+      <Control name="uiSymbolButton4" text="Slot Type"/>
 			<Control name="uiLabel1" text="Drive Detection BIB："/>
 			<Control name="uiLabel2" text="Test PS Supply："/>
 			<Control name="uiLabel3" text="Oven1："/>

GKHTRBC16P/RunLibrary/BackupSqliteTim.cs

@@ -71,11 +71,11 @@ namespace GKHTRBC16P.RunLibrary
                                 }
                                 if (CopyFile(uIForm, FormerFile, toFile, 1024000) == 0)
                                 {
-                                    uIForm.ShowSuccessTip($"Backup " + toFile + " Success");
+                                    uIForm.ShowSuccessTip($"Backup " + toFile + " Success", 1000);
                                 }
                                 else
                                 {
-                                    uIForm.ShowErrorTip($"Backup " + toFile + " Success");
+                                    uIForm.ShowErrorTip($"Backup " + toFile + " Success", 1000);
                                 }
                             }
                             var wParam = CalculationAo.parametersList.Where(x => x.Id > 0).ToList();//.Where(x => x.Id > 0).ToList()

GKHTRBC16P/RunLibrary/DriverBoardCom.cs

@@ -54,6 +54,10 @@ namespace GKHTRBC16P.RunLibrary
                             Home_Status.home_Status.inVokeLight(Home_Status.home_Status.Sha1, UILightState.On);
                     }
                 }
+                else
+                {
+                    LogisTrac.WriteLog(uIForm.GetType(), "not read data");
+                }
             }
             catch (Exception ex)
             {
@@ -108,6 +112,10 @@ namespace GKHTRBC16P.RunLibrary
                             Home_Status.home_Status.inVokeLight(Home_Status.home_Status.Sha1, UILightState.On);
                     }
                 }
+                else
+                {
+                    LogisTrac.WriteLog(uIForm.GetType(), "not read data");
+                }
             }
             catch (Exception ex)
             {
@@ -145,6 +153,10 @@ namespace GKHTRBC16P.RunLibrary
                     }
                     //uiDataGridView1.Rows[BoardX -1].Selected = true;
                 }
+                else
+                {
+                    LogisTrac.WriteLog(uIForm.GetType(), "not read data");
+                }
             }
             catch (Exception ex)
             {
@@ -188,6 +200,10 @@ namespace GKHTRBC16P.RunLibrary
                     }
                     //uiDataGridView1.Rows[BoardX -1].Selected = true;
                 }
+                else
+                {
+                    LogisTrac.WriteLog(uIForm.GetType(), "not read data");
+                }
             }
             catch (Exception ex)
             {
@@ -230,6 +246,10 @@ namespace GKHTRBC16P.RunLibrary
                             Home_Status.home_Status.inVokeLight(Home_Status.home_Status.Sha1, UILightState.On);
                     }
                 }
+                else
+                {
+                    LogisTrac.WriteLog(uIForm.GetType(), "not read data");
+                }
                 //uiDataGridView1.Rows[BoardX -1].Selected = true;
             }
             catch (Exception ex)
@@ -274,6 +294,10 @@ namespace GKHTRBC16P.RunLibrary
                     }
                     //uiDataGridView1.Rows[BoardX -1].Selected = true;
                 }
+                else
+                {
+                    LogisTrac.WriteLog(uIForm.GetType(), "not read data");
+                }
             }
             catch (Exception ex)
             {
@@ -331,6 +355,10 @@ namespace GKHTRBC16P.RunLibrary
                     }
                     //uiDataGridView1.Rows[BoardX -1].Selected = true;
                 }
+                else
+                {
+                    LogisTrac.WriteLog(uIForm.GetType(), "not read data");
+                }
             }
             catch (Exception ex)
             {
@@ -376,6 +404,10 @@ namespace GKHTRBC16P.RunLibrary
                     }
                     //uiDataGridView1.Rows[BoardX -1].Selected = true;
                 }
+                else
+                {
+                    LogisTrac.WriteLog(uIForm.GetType(), "not read data");
+                }
             }
             catch (Exception ex)
             {
@@ -417,6 +449,10 @@ namespace GKHTRBC16P.RunLibrary
                             Home_Status.home_Status.inVokeLight(Home_Status.home_Status.Sha1, UILightState.On);
                     }
                 }
+                else
+                {
+                    LogisTrac.WriteLog(uIForm.GetType(), "not read data");
+                }
                 //uiDataGridView1.Rows[BoardX -1].Selected = true;
             }
             catch (Exception ex)

GKHTRBC16P/RunLibrary/DriverBoardRefresh.cs

@@ -63,7 +63,7 @@ namespace GKHTRBC16P.RunLibrary
                             }
                         }
                     }
-                    else if (CalculationAo.Thorous[WayId + 1].Snum == 80 || CalculationAo.Thorous[WayId + 1].Snum == 40 || CalculationAo.Thorous[WayId + 1].Snum == 20)
+                    else if ((new int[]{ 20,40,80,24}).Contains(CalculationAo.Thorous[WayId + 1].Snum))
                     {
                         Home_Status.home_Status.Invoke((EventHandler)(delegate
                         {
@@ -1522,12 +1522,7 @@ namespace GKHTRBC16P.RunLibrary
                             var allpower = CalculationAo.PowerList[pot];
                             if (allpower.Voltage > 1 && thor.Vg == 1)
                             {
-                                CalculationAo.TitTimeBoard[WayId + 1]++;
-                                if (CalculationAo.TitTimeBoard[WayId + 1] > 4)
-                                {
-                                    UIMessageTip.ShowOk((WayId + 1) + uPublic.Prompt("Tips20", "RunSetting") + pow);
-                                    CalculationAo.TitTimeBoard[WayId + 1] = 0;
-                                }
+                                //uIForm.ShowSuccessTip((WayId + 1) + "slot," + uPublic.Prompt("Tips20", "RunSetting") + pow, 1000);//提示下电
                                 //AutoPowerCon.Instaion.SetVolDown(uIForm, pot, 0, Convert.ToDecimal(allpower.Voltage) / 5);
                             }
                             else

GKHTRBC16P/RunLibrary/DriverboardData.cs

@@ -59,7 +59,7 @@ namespace GKHTRBC16P.RunLibrary
                             {
                                 power_Data = ConvertDataOpear.GetPower(tes.PowerNo, CalculationAo.PowerList);
                             }
-                            if (tes.SupplyRGPW != 1)
+                            if (tes.SupplyRGPW != 1 && power_Data.Voltage > 0)
                                 power_Data.Voltage = power_Data.Voltage * -1;
                             int[] cureeint = tes.Summary.TransfiniteSum;
                             int Sinvalid = 0;
@@ -128,7 +128,7 @@ namespace GKHTRBC16P.RunLibrary
                         {
                             power_Data = ConvertDataOpear.GetPower(tes.PowerNo, CalculationAo.PowerList);
                         }
-                        if (tes.SupplyRGPW != 1)
+                        if (tes.SupplyRGPW != 1 && power_Data.Voltage > 0)
                             power_Data.Voltage = power_Data.Voltage * -1;
                         //stationDataBl.Addto(SaveStation, tes.ParmId, tes.BatchName, tes.TotalTime, CurrTime, oven_Data, power_Data);
                         int[] cureeint = tes.Summary.TransfiniteSum;
@@ -374,10 +374,8 @@ namespace GKHTRBC16P.RunLibrary
                         {
                             power_Data = ConvertDataOpear.GetPower(tes.PowerNo, CalculationAo.PowerList);
                         }
-                        if (tes.SupplyRGPW != 1)
-                        {
+                        if (tes.SupplyRGPW != 1 && power_Data.Voltage > 0)
                             power_Data.Voltage = power_Data.Voltage * -1;
-                        }
                         int[] cureeint = tes.Summary.TransfiniteSum;
                         int Sinvalid = 0;
                         double[] additional = new double[10];
@@ -611,7 +609,7 @@ namespace GKHTRBC16P.RunLibrary
                             power_Data = ConvertDataOpear.GetPower(tes.PowerNo, CalculationAo.PowerList);
                         }
                         double Vg = (double)Convert.ToUInt32(ComRxdData[345].ToString("X2") + ComRxdData[344].ToString("X2") + ComRxdData[343].ToString("X2") + ComRxdData[342].ToString("X2"), 16) / 100;
-                        if (tes.SupplyRGPW != 1)
+                        if (tes.SupplyRGPW != 1 && power_Data.Voltage > 0)
                             power_Data.Voltage = power_Data.Voltage * -1;
                         if (!ComRxdData[11].ToString("X2").Equals("D1") && Vg > 0)
                             Vg = -Vg;

GKHTRBC16P/RunLibrary/DriverboardHandle.cs

@@ -42,9 +42,9 @@ namespace GKHTRBC16P.RunLibrary
                 var result = HttpUitls.HttpApi(CalculationAo.ThisDevConfig.InterMap,jsonstr,"post");
                 var xresult = JsonHelper.JsonToObject<InterResult>(result);
                 if (xresult.success)
-                    uIForm.ShowSuccessTip("Send data Success!");
+                    uIForm.ShowSuccessTip("Send data Success!", 1000);
                 else
-                    uIForm.ShowErrorTip("Send data Error!");
+                    uIForm.ShowErrorTip("Send data Error!", 1000);
             }
             catch (Exception ex)
             {

GKHTRBC16P/ToolLibrary/AutoTemper.cs

@@ -595,7 +595,7 @@ namespace GKHTRBC16P.ToolLibrary
                 if (result == 0)
                 {
                     uPublic.WriteLog("设置试验箱温度为：" + uPublic.Prompt("Tips5", "AutoTemper") + Settemp.ToString("000.0"));
-                    ShowSuccessTip("温度设置成功" + Settemp.ToString("000.0"));
+                    ShowSuccessTip("温度设置成功" + Settemp.ToString("000.0"), 1000);
                 }
             }
             catch (Exception ex)
@@ -651,7 +651,7 @@ namespace GKHTRBC16P.ToolLibrary
                 }
                 if (result == 0)
                 {
-                    ShowSuccessTip("定值运行设置成功");
+                    ShowSuccessTip("定值运行设置成功", 1000);
                     uPublic.WriteLog("试验箱定时运行设置成功");
                 }
             }
@@ -708,7 +708,7 @@ namespace GKHTRBC16P.ToolLibrary
                 }
                 if (result == 0)
                 {
-                    ShowSuccessTip("停止加热设置成功");
+                    ShowSuccessTip("停止加热设置成功", 1000);
                     uPublic.WriteLog("试验箱停止加热设置成功");
                 }
             }
@@ -770,7 +770,7 @@ namespace GKHTRBC16P.ToolLibrary
                 if (result == 0)
                 {
                     uPublic.WriteLog((sender as UISymbolButton).Text + ":" + uPublic.Prompt("Tips13", "AutoTemper") + Settemp.ToString("000.0"));
-                    ShowSuccessTip("降温运行设置成功" + Settemp.ToString("000.0"));
+                    ShowSuccessTip("降温运行设置成功" + Settemp.ToString("000.0"), 1000);
                 }
             }
             catch (Exception ex)
@@ -851,7 +851,7 @@ namespace GKHTRBC16P.ToolLibrary
                 if (result == 0)
                 {
                     uPublic.WriteLog(uPublic.Prompt("Tips12", "AutoTemper") + Settemp);
-                    ShowSuccessTip("湿度设置成功" + Settemp);
+                    ShowSuccessTip("湿度设置成功" + Settemp, 1000);
                 }
             }
             catch (Exception ex)

GKHTRBC16P/ToolLibrary/BatchManagement.cs

@@ -188,7 +188,7 @@ namespace GKHTRBC16P.ToolLibrary
                         var result = testParmBll.Update(thiscum);
                         result = paramterTimeBll.Updatestatus(thiscum.ParmId);
                         uPublic.WriteLog("删除:" + JsonConvert.SerializeObject(thiscum));
-                        ShowSuccessTip(uPublic.Prompt("Tips3", "BatchManagement") + mparid);
+                        ShowSuccessTip(uPublic.Prompt("Tips3", "BatchManagement") + mparid, 1000);
                         Test_Parm_Initialize(false);
                         FunMov.Home_Status.home_Status.FirstCTDDok(mparid);
                     }
@@ -353,7 +353,7 @@ namespace GKHTRBC16P.ToolLibrary
                 }
                 if (CalculationAo.Thorous.Count <= 0)
                 {
-                    ShowSuccessTip(MultiLanguage.Prompt("Thorouesinfo"));
+                    ShowSuccessTip(MultiLanguage.Prompt("Thorouesinfo"), 1000);
                     return;
                 }
                 var thiscum = test_ParametersList.Where(x => x.Id == mparid).FirstOrDefault();
@@ -450,7 +450,7 @@ namespace GKHTRBC16P.ToolLibrary
                     SetAlarmStation(thiscum);
                     uPublic.WriteLog((sender as UISymbolButton).Text + ",添加:" + JsonConvert.SerializeObject(thiscum));
                 }
-                ShowSuccessTip(uPublic.Prompt("Tips10", "BatchManagement") + result);
+                ShowSuccessTip(uPublic.Prompt("Tips10", "BatchManagement") + result, 1000);
                 CalculationAo.ThisDevConfig.Editions--;
                 devConfigBll.Update(CalculationAo.ThisDevConfig);
                 Test_Parm_Initialize(false);
@@ -496,9 +496,9 @@ namespace GKHTRBC16P.ToolLibrary
                     result = station_Alarmbll.Update(model);
                 }
                 if (result > 0)
-                    this.ShowSuccessTip("OK");
+                    this.ShowSuccessTip("OK", 1000);
                 else
-                    this.ShowSuccessTip("Error");
+                    this.ShowSuccessTip("Error", 1000);
                 //var testm = CalculationAo.parametersList.FirstOrDefault(x => x.Ids == tid.ToString("00"));
                 //testm.IsCkeckAlarm = ints;
                 uPublic.WriteLog("工位报警开关初始化," + JsonConvert.SerializeObject(model));

GKHTRBC16P/ToolLibrary/Devicelibrary.Designer.cs

@@ -43,6 +43,8 @@
             this.uiSymbolButton1 = new Sunny.UI.UISymbolButton();
             this.uiSymbolButton2 = new Sunny.UI.UISymbolButton();
             this.uiGroupBox3 = new Sunny.UI.UIGroupBox();
+            this.c = new Sunny.UI.UIComboBox();
+            this.uiLabel24 = new Sunny.UI.UILabel();
             this.Txt_Rqaw = new Sunny.UI.UITextBox();
             this.Rqaw = new Sunny.UI.UILabel();
             this.Txt_Vg = new Sunny.UI.UITextBox();
@@ -91,8 +93,6 @@
             this.uiLabel4 = new Sunny.UI.UILabel();
             this.Txt_Dev_Name = new Sunny.UI.UITextBox();
             this.uiLabel2 = new Sunny.UI.UILabel();
-            this.uiLabel24 = new Sunny.UI.UILabel();
-            this.Com_SupplyRGPW = new Sunny.UI.UIComboBox();
             this.uiPanel1.SuspendLayout();
             this.uiGroupBox1.SuspendLayout();
             this.uiGroupBox3.SuspendLayout();
@@ -346,7 +346,7 @@
             // 
             // uiGroupBox3
             // 
-            this.uiGroupBox3.Controls.Add(this.Com_SupplyRGPW);
+            this.uiGroupBox3.Controls.Add(this.c);
             this.uiGroupBox3.Controls.Add(this.uiLabel24);
             this.uiGroupBox3.Controls.Add(this.Txt_Rqaw);
             this.uiGroupBox3.Controls.Add(this.Rqaw);
@@ -381,9 +381,40 @@
             this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
             this.uiGroupBox3.Size = new System.Drawing.Size(684, 499);
             this.uiGroupBox3.TabIndex = 5;
+            this.uiGroupBox3.Text = null;
             this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.uiGroupBox3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // c
+            // 
+            this.c.DataSource = null;
+            this.c.FillColor = System.Drawing.Color.White;
+            this.c.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c.Items.AddRange(new object[] {
+            "正向",
+            "反向"});
+            this.c.Location = new System.Drawing.Point(417, 141);
+            this.c.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.c.MinimumSize = new System.Drawing.Size(63, 0);
+            this.c.Name = "c";
+            this.c.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.c.Size = new System.Drawing.Size(79, 29);
+            this.c.TabIndex = 37;
+            this.c.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.c.Watermark = "";
+            this.c.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiLabel24
+            // 
+            this.uiLabel24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel24.Location = new System.Drawing.Point(274, 148);
+            this.uiLabel24.Name = "uiLabel24";
+            this.uiLabel24.Size = new System.Drawing.Size(139, 23);
+            this.uiLabel24.TabIndex = 36;
+            this.uiLabel24.Text = "Gb电压方向：";
+            this.uiLabel24.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiLabel24.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // Txt_Rqaw
             // 
             this.Txt_Rqaw.Cursor = System.Windows.Forms.Cursors.IBeam;
@@ -1113,36 +1144,6 @@
             this.uiLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.uiLabel2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // uiLabel24
-            // 
-            this.uiLabel24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel24.Location = new System.Drawing.Point(274, 148);
-            this.uiLabel24.Name = "uiLabel24";
-            this.uiLabel24.Size = new System.Drawing.Size(139, 23);
-            this.uiLabel24.TabIndex = 36;
-            this.uiLabel24.Text = "Gb电压方向：";
-            this.uiLabel24.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiLabel24.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // Com_SupplyRGPW
-            // 
-            this.Com_SupplyRGPW.DataSource = null;
-            this.Com_SupplyRGPW.FillColor = System.Drawing.Color.White;
-            this.Com_SupplyRGPW.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Com_SupplyRGPW.Items.AddRange(new object[] {
-            "正向",
-            "反向"});
-            this.Com_SupplyRGPW.Location = new System.Drawing.Point(417, 141);
-            this.Com_SupplyRGPW.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.Com_SupplyRGPW.MinimumSize = new System.Drawing.Size(63, 0);
-            this.Com_SupplyRGPW.Name = "Com_SupplyRGPW";
-            this.Com_SupplyRGPW.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.Com_SupplyRGPW.Size = new System.Drawing.Size(79, 29);
-            this.Com_SupplyRGPW.TabIndex = 37;
-            this.Com_SupplyRGPW.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.Com_SupplyRGPW.Watermark = "";
-            this.Com_SupplyRGPW.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
             // Devicelibrary
             // 
             this.AllowShowTitle = true;
@@ -1234,7 +1235,7 @@
         private Sunny.UI.UILabel uiLabel23;
         private Sunny.UI.UITextBox Txt_Rqaw;
         private Sunny.UI.UILabel Rqaw;
-        private Sunny.UI.UIComboBox Com_SupplyRGPW;
+        private Sunny.UI.UIComboBox c;
         private Sunny.UI.UILabel uiLabel24;
     }
 }
\ No newline at end of file

GKHTRBC16P/ToolLibrary/Devicelibrary.cs

@@ -193,7 +193,7 @@ namespace GKHTRBC16P.ToolLibrary
                     Dev_Device sdev_device = new Dev_Device();
                     sdev_device.Id = CurrPageindex - 100000;
                     sdev_device.MainId = Convert.ToInt32(Com_Main_List.SelectedValue);
-                    sdev_device.SupplyRGPW = Convert.ToInt32(Com_SupplyRGPW.SelectedValue);
+                    sdev_device.SupplyRGPW = Convert.ToInt32(c.SelectedValue);
                     sdev_device.TestId = 0;//Convert.ToInt32(Com_Text_Type.SelectedValue);
                     sdev_device.DevName = Txt_Dev_Name.Text.Trim();
                     sdev_device.AgingNo = "Plate No";
@@ -290,11 +290,11 @@ namespace GKHTRBC16P.ToolLibrary
                 Com_Main_List.DisplayMember = "DevName";
                 Com_Main_List.DataSource = imainlist;
 
-                Com_SupplyRGPW.Clear();
+                c.Clear();
                 IList<Dev_DevDir> devdevdir = devdrBll.GetList();
-                Com_SupplyRGPW.ValueMember = "Id";
-                Com_SupplyRGPW.DisplayMember = "ModelName";
-                Com_SupplyRGPW.DataSource = devdevdir;
+                c.ValueMember = "Id";
+                c.DisplayMember = "ModelName";
+                c.DataSource = devdevdir;
 
                 //TestTypeBll testTypeBll = new TestTypeBll();
                 //IList<Test_Type> itestTypes = testTypeBll.GetList();
@@ -365,7 +365,7 @@ namespace GKHTRBC16P.ToolLibrary
                     Dev_Device sdev_device = new Dev_Device();
                     sdev_device.Id = 0;
                     sdev_device.MainId = Convert.ToInt32(Com_Main_List.SelectedValue);
-                    sdev_device.SupplyRGPW = Convert.ToInt32(Com_SupplyRGPW.SelectedValue);
+                    sdev_device.SupplyRGPW = Convert.ToInt32(c.SelectedValue);
                     sdev_device.TestId = 0;//                    Convert.ToInt32(Com_Text_Type.SelectedValue);
                     sdev_device.DevName = Txt_Dev_Name.Text.Trim();
                     sdev_device.AgingNo = "Plate No";
@@ -427,7 +427,7 @@ namespace GKHTRBC16P.ToolLibrary
                     Dev_Device sdev_device = new Dev_Device();
                     sdev_device.Id = CurrPageindex - 100000;
                     sdev_device.MainId = Convert.ToInt32(Com_Main_List.SelectedValue);
-                    sdev_device.SupplyRGPW = Convert.ToInt32(Com_SupplyRGPW.SelectedValue);
+                    sdev_device.SupplyRGPW = Convert.ToInt32(c.SelectedValue);
 
                     sdev_device.TestId = 0;// Convert.ToInt32(Com_Text_Type.SelectedValue);
                     sdev_device.DevName = Txt_Dev_Name.Text.Trim();
@@ -522,7 +522,7 @@ namespace GKHTRBC16P.ToolLibrary
                     {
                         Txt_Dev_Name.ReadOnly = true;
                         Com_Main_List.SelectedValue = curenode.MainId;
-                        Com_SupplyRGPW.SelectedValue = curenode.SupplyRGPW;
+                        c.SelectedValue = curenode.SupplyRGPW;
                         //Com_Text_Type.SelectedValue = curenode.TestId;
 
                         Txt_Dev_Name.Text = curenode.DevName;

GKHTRBC16P/ToolLibrary/PlugBoard.cs

@@ -334,6 +334,7 @@ namespace GKHTRBC16P.ToolLibrary
                         }
                         Thread.Sleep(50);
                     }
+                    CalculationAo.DreoubGetBool = true;
                     uPublic.WriteLog("执行插板检测命令完成！");
                 }
                 catch (Exception ex)

GKHTRBC16P/ToolLibrary/RunSetting.cs

@@ -341,7 +341,7 @@ namespace GKHTRBC16P.ToolLibrary
                 tparm.PolarityRG = 0;
                 testParmBll.Update(tparm);
                 //FrmMain.mainForm.uiTabControl1.SelectPage(1001);
-                ShowSuccessTip("OK");
+                ShowSuccessTip("OK", 1000);
                 uPublic.WriteLog((sender as UISymbolButton).Text + ":"+ JsonConvert.SerializeObject(tparm));
             }
             catch (Exception ex)
@@ -504,7 +504,7 @@ namespace GKHTRBC16P.ToolLibrary
                     else if (tparm.Ishtrb == 5)
                     {
                         CalculationAo.HTRBOT[iChangeId, 5] = 0X4000 + Txt_SrefEnd.Value;   //标志位为2
-                        bResult = Htgb.Instance.FboarddataTestParm(this, thor.ComId - 1, iChangeId + 1, 0x03, 0xA5, 3, CalculationAo.Thorous[iChangeId + 1].Snum / 2, 0x01, Convert.ToInt32(Txt_EleUpper.DoubleValue), dBackVol / 10, 120, tparm.SupplyRGPW, 39);
+                        bResult = Htgb.Instance.FboarddataTestParm(this, thor.ComId - 1, iChangeId + 1, 0x03, 0xA5, 3, CalculationAo.Thorous[iChangeId + 1].Snum / 2, 0x01, Convert.ToInt32(Txt_EleUpper.DoubleValue), dBackVol / 10, 120, tparm.SupplyRGPW -1, 39);
                         Thread.Sleep(200);
                         bResult = Htgb.Instance.FboarddataTestStatus(this, thor.ComId - 1, iChangeId + 1, 0x04, 0xA5, 0x02, 20);
                     }
@@ -1315,7 +1315,7 @@ namespace GKHTRBC16P.ToolLibrary
                                 if (reslut2 == 0)
                                 {
 
-                                    ShowSuccessTip("栅压降压命令发送成功。");
+                                    ShowSuccessTip("栅压降压命令发送成功。", 1000);
                                 }
                                 else
                                 {
@@ -1324,7 +1324,7 @@ namespace GKHTRBC16P.ToolLibrary
                                 tparm.VgsP = (decimal)f_VgsP;
                                 tparm.VgsN = (decimal)f_VgsN;
                                 testParmBll.Update(tparm);
-                                ShowSuccessTip("OK");
+                                ShowSuccessTip("OK", 1000);
                                 uPublic.WriteLog((sender as UISymbolButton).Text +"设置vgs成功!");
                             }
                         }
@@ -1355,7 +1355,7 @@ namespace GKHTRBC16P.ToolLibrary
                         tparm.VgsP = (decimal)f_VgsP;
                         tparm.VgsN = (decimal)f_VgsN;
                         testParmBll.Update(tparm);
-                        ShowSuccessTip("OK");
+                        ShowSuccessTip("OK", 1000);
                         uPublic.WriteLog((sender as UISymbolButton).Text +"设置vgs成功!");
                     }
                 }

GKHTRBC16P/bin/Debug/Languages/ChineseSimplified.xml

@@ -152,9 +152,9 @@
 			<Control name="uiLabel4" text="小数长度:"/>
 			<Control name="uiLabel5" text="电压设置:"/>
 			<Control name="uiLabel6" text="设备编号:"/>
+      <Control name="uiLabel7" text="烘箱Id:"/>
 			<Control name="uiSymbolButton2" text="灯光控制"/>
 			<Control name="uiSymbolButton1" text="对应关系"/>
-			<Control name="uiSymbolButton4" text="通道类型"/>
 			<Control name="uiSymbolButton3" text="保存设置"/>
 			<Control name="Com_DevTypeId" text="0"/>
 			<Control name="Com_PowerId" text="0"/>
@@ -223,6 +223,7 @@
 			<Control name="CommunicationSetting" text="通讯口设置"/>
 			<Control name="uiGroupBox1" text="通讯设置："/>
 			<Control name="uiGroupBox2" text="记录保存间隔时间(分钟)："/>
+      <Control name="uiSymbolButton4" text="通道类型"/>
 			<Control name="uiLabel1" text="驱动检测板："/>
 			<Control name="uiLabel2" text="试验电源："/>
 			<Control name="uiLabel3" text="高温试验箱："/>
@@ -633,7 +634,7 @@
 			<DataGridViewCell name="GridExceedElectric" HeaderText="过流设置值"/>
 			<DataGridViewCell name="GridSetupVoltage" HeaderText="设定电压值"/>
 			<DataGridViewCell name="GridStageVoltage" HeaderText="阶段加压值"/>
-			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长值"/>
+			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长"/>
 			<DataGridViewCell name="GridControlBtn" HeaderText="控制"/>
 		</DataGridViewCells>
 	</Form>
@@ -666,7 +667,7 @@
 			<DataGridViewCell name="GridExceedElectric" HeaderText="过流设置值"/>
 			<DataGridViewCell name="GridSetupVoltage" HeaderText="设定电压值"/>
 			<DataGridViewCell name="GridStageVoltage" HeaderText="阶段降压值"/>
-			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长值"/>
+			<DataGridViewCell name="GridStageTime" HeaderText="阶段时长"/>
 			<DataGridViewCell name="GridControlBtn" HeaderText="控制"/>
 		</DataGridViewCells>
 	</Form>

GKHTRBC16P/bin/Debug/Languages/English.xml

@@ -147,9 +147,9 @@
 			<Control name="uiLabel4" text="Decimal length:"/>
 			<Control name="uiLabel5" text="Voltage setting:"/>
 			<Control name="uiLabel6" text="Equipment number:"/>
+      <Control name="uiLabel7" text="Oven Id:"/>
 			<Control name="uiSymbolButton2" text="Light control"/>
 			<Control name="uiSymbolButton1" text="Correspondence"/>
-			<Control name="uiSymbolButton4" text="Slot Type"/>
 			<Control name="uiSymbolButton3" text="Save Settings"/>
 			<Control name="Com_DevTypeId" text="0"/>
 			<Control name="Com_PowerId" text="0"/>
@@ -218,6 +218,7 @@
 			<Control name="CommunicationSetting" text="Communication Port Setting"/>
 			<Control name="uiGroupBox1" text="Communication Settings："/>
 			<Control name="uiGroupBox2" text="Record Saving Interval (m)："/>
+      <Control name="uiSymbolButton4" text="Slot Type"/>
 			<Control name="uiLabel1" text="Drive Detection BIB："/>
 			<Control name="uiLabel2" text="Test PS Supply："/>
 			<Control name="uiLabel3" text="Oven1："/>

packages/Obfuscar.2.2.40/build/obfuscar.props

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Obfuscar>$(MSBuildThisFileDirectory)..\tools\Obfuscar.Console.exe</Obfuscar>
+  </PropertyGroup>
+</Project>