From 7b15567ec12bffd6d286188fa78ddf68874e61b3 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期一, 19 四月 2021 20:29:20 +0800
Subject: [PATCH] 1.merge

---
 P066.Data/Form1.cs |   89 ++++++++++++++++++++++++--------------------
 1 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index dca5df2..cc78022 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -109,16 +109,16 @@
                var list = GetFileData(fileinfos22[i]);
                 if (fileinfos22[i].Name.Contains("鍒掍激"))
                 {
-                    ScratchI++;
-                    list.ForEach(a => a.Lensnumber = ScratchI);
+                    //ScratchI++;
+                    //list.ForEach(a => a.Lensnumber = ScratchI);
                     GetMaxSize(list);
                     GetBkLocation(list);
                     ListReexaminationSum.AddRange(list);
                 }
                 else if (fileinfos22[i].Name.Contains("闀�鑶滅牬鎹�"))
                 {
-                    ZoomI++;
-                    list.ForEach(a => a.Lensnumber = ZoomI);
+                    //ZoomI++;
+                    //list.ForEach(a => a.Lensnumber = ZoomI);
                     ListReexaminationSum.AddRange(list);
                 }
 
@@ -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(() =>
             {
 
@@ -768,44 +769,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