From c5c5b12e9d2addebe190820375d9f92e3afcc9d7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期五, 16 四月 2021 20:26:48 +0800
Subject: [PATCH] merge
---
P066.Data/Form1.cs | 81 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 1b94c63..f7008a7 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -145,9 +145,9 @@
});
- Task.WaitAll(task2, task3);
+ //Task.WaitAll(task2, task3);
-
+ task2.Wait();
var task5 = Task.Run(() =>
{
@@ -172,6 +172,7 @@
});
+ task3.Wait();
var task6 = Task.Run(() =>
{
@@ -743,44 +744,52 @@
List<ResultData> ListReexaminationSum = new List<ResultData>();
int WhiteI = 0;
int WhiteningI = 0;
+ List<Task> listTask = new List<Task>();
for (int i = 0; i < fileInfo1.Count; i++)
{
- var list = CompareFile(fileInfo1[i], fileInfo2[i], DataTipsor);
- if (fileInfo1[i].Name.Contains("鐧界偣"))
- {
- WhiteI++;
- list.ForEach(a => a.Lensnumber = WhiteI);
- ListReexaminationSum.AddRange(list);
- }
- else if (fileInfo1[i].Name.Contains("鍒櫧"))
- {
- WhiteningI++;
- list.ForEach(a => a.Lensnumber = WhiteningI);
- ListReexaminationSum.AddRange(list);
+ int index = i;
+ Task task = new Task(() => {
+ var list = CompareFile(fileInfo1[index], fileInfo2[index], DataTipsor);
+ if (fileInfo1[index].Name.Contains("鐧界偣"))
+ {
+ WhiteI++;
+ list.ForEach(a => a.Lensnumber = WhiteI);
+ ListReexaminationSum.AddRange(list);
+ }
+ else if (fileInfo1[index].Name.Contains("鍒櫧"))
+ {
+ WhiteningI++;
+ list.ForEach(a => a.Lensnumber = WhiteningI);
+ ListReexaminationSum.AddRange(list);
- }
- if (fileInfo1[i].Name.Contains("鍒濇涓"))
- {
- list = GetMidLocation(list);
- }
- else if (fileInfo1[i].Name.Contains("澶嶆涓") && fileInfo1[i].Name.Contains("鐧界偣"))
- {
- list = GetMidLocation(list);
- }
- else if (fileInfo1[i].Name.Contains("澶嶆涓") && fileInfo1[i].Name.Contains("鍒櫧"))
- {
- list = GetWhiteLocation(list);
- }
- else if (fileInfo1[i].Name.Contains("鍒濇鑳屾澘"))
- {
- //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- list = GetBkLocation(list);
- }
- else if (fileInfo1[i].Name.Contains("澶嶆鑳屾澘") && fileInfo1[i].Name.Contains("鐧界偣"))
- {
- list = GetBkLocation(list);
- }
+ }
+ if (fileInfo1[index].Name.Contains("鍒濇涓"))
+ {
+ list = GetMidLocation(list);
+ }
+ else if (fileInfo1[index].Name.Contains("澶嶆涓") && fileInfo1[index].Name.Contains("鐧界偣"))
+ {
+ list = GetMidLocation(list);
+ }
+ else if (fileInfo1[index].Name.Contains("澶嶆涓") && fileInfo1[index].Name.Contains("鍒櫧"))
+ {
+ list = GetWhiteLocation(list);
+ }
+ else if (fileInfo1[index].Name.Contains("鍒濇鑳屾澘"))
+ {
+ //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
+ list = GetBkLocation(list);
+ }
+ else if (fileInfo1[index].Name.Contains("澶嶆鑳屾澘") && fileInfo1[index].Name.Contains("鐧界偣"))
+ {
+ list = GetBkLocation(list);
+ }
+ });
+ task.Start();
+ listTask.Add(task);
+
}
+ Task.WaitAll(listTask.ToArray());
return ListReexaminationSum;
}
#endregion
--
Gitblit v1.8.0