Jelajahi Sumber

延时时间改为等待

ltwork 1 tahun lalu
induk
melakukan
29e89867f9

+ 1 - 1
BlankApp1/BlankApp1/App.config

@@ -5,6 +5,6 @@
 		<add key="MySql" value="Data Source=localhost;Database=plc_point_db2;User Id='root';Password='521125';port=3306;charset=utf8mb4;"/>
 		<add key="PLCIp" value="192.168.0.20"/>
 		<add key="PLCPort" value="9600"/>
-
+		<add key="DelayTime" value="60"/>
 	</appSettings>
 </configuration>

+ 2 - 1
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -13,6 +13,7 @@ using Prism.Services.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Configuration;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -48,7 +49,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private long selctStartDetailId = 0; //当前选择的第一个方案明细id
         private BizTestRecordDtlDto bizTestRecordDtlDto = new BizTestRecordDtlDto(); //测试方案明细表
         private const string TestMode = "自动测试";
-        private int delayTime = 60;
+        private int delayTime= Convert.ToInt32(ConfigurationManager.AppSettings["DelayTime"]);
         ManualResetEvent m = new ManualResetEvent(true); //实例化阻塞事件
         CancellationTokenSource tokensource = new CancellationTokenSource(); //声明令牌
         public AutoTestViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordService iBizTestRecordService, IBizTestRecordDtlService iBizTestRecordDtlService, IMapper mapper, ILogger logger)

+ 1 - 1
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -50,7 +50,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private BizTestRecordDtlDto bizTestRecordDtlDto = new BizTestRecordDtlDto(); //测试方案明细表
         private const string TestMode = "手动测试";
 
-        private int delayTime = 60;
+        private int delayTime = Convert.ToInt32(ConfigurationManager.AppSettings["DelayTime"]);
         public ManualTestViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordService iBizTestRecordService, IBizTestRecordDtlService iBizTestRecordDtlService,IMapper mapper,ILogger logger)
         {
             _dialog = dialog;

+ 3 - 1
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/RetryTestViewModel.cs

@@ -12,6 +12,8 @@ using Prism.Services.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Configuration;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -43,7 +45,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private BizTestRecordDtlDto bizTestRecordDtlDto = new BizTestRecordDtlDto(); //测试方案明细表
         private const string TestMode = "重新测试";
 
-        private int delayTime = 20;
+        private int delayTime =Convert.ToInt32( ConfigurationManager.AppSettings["DelayTime"]);
         public RetryTestViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordService iBizTestRecordService, IBizTestRecordDtlService iBizTestRecordDtlService, IMapper mapper, ILogger logger)
         {
             _dialog = dialog;