Signed-off-by: 3A532035 <pp93189tw@gmail.com>

ETC_App1/ETCBackgroundWorker3.cs

@@ -185,6 +185,7 @@ namespace ETC_App1
                         json.tickoff = true;
                         json.lost1 = false;
                         json.lost2 = false;
+                        json.message1 = data[i]["車牌號碼"];
                         json.message2 = "車牌定位無結果";
                     }
 

ETC_App1/ETCPictureCheckBox.cs

@@ -121,11 +121,9 @@ namespace ETC_App1
 
             Lost = Lost + (json.lost1 ? 1 : 0);
 
-            listBox1.Items.Add((json.lost2 ? "" : json.index + ". ") + (json.success ? json.message1 : "資料異常"));
+            listBox1.Items.Add((json.lost2 ? "" : json.index + ". ") + (json.tickoff ?  (json.content&&json.failed?json.message2:"資料異常"):json.message1 ));
 
-            listBox2.Items.Add((json.lost2 ? json.filename + "，" : json.index + ". ") + (json.success ? json.message1 : (json.lost1?json.filename:json.message2)));
-
-            listBox1.SelectedIndex = listBox1.Items.Count - 1;
+            listBox2.Items.Add((json.lost2 ? json.filename + "，" : json.index + ". ") + (json.tickoff?(json.content?(json.failed?json.message1:json.message2):json.filename):json.message1));
 
             listBox2.SelectedIndex = listBox2.Items.Count - 1;
         }
@@ -135,6 +133,8 @@ namespace ETC_App1
             listBox1.Items.Clear();
 
             listBox2.Items.Clear();
+
+            Data.Clear();
         }
 
         private void EtcStatusStrip1_Resize(object sender, EventArgs e)
@@ -226,7 +226,7 @@ namespace ETC_App1
                 
                 button1.ForeColor = json.lost2 ? ErrorColor : button1.ForeColor;
 
-                button1.Text = json.success && json.failed ? "正確" : button1.Text;
+                button1.Text = json.tickoff&&json.content&&json.failed? "正確" : button1.Text;
 
                 button1.ForeColor = json.success ? Color.Green : button1.ForeColor;
             }
@@ -244,7 +244,7 @@ namespace ETC_App1
 
                 SolidBrush brush = new SolidBrush(listBox1.ForeColor);
 
-                brush = Data[e.Index].failed ? new SolidBrush(WarningColor) : brush;
+                brush = Data[e.Index].tickoff ? new SolidBrush(WarningColor) : brush;
 
                 brush = Data[e.Index].lost1 || Data[e.Index].lost2 ? new SolidBrush(ErrorColor) : brush;
 
@@ -265,10 +265,22 @@ namespace ETC_App1
         {
             if (button1.Text == "正確")
             {
-                Data[listBox1.SelectedIndex].failed = false;
-                Data[listBox1.SelectedIndex].message1 = Data[listBox1.SelectedIndex].message1+"["+UsingID+"]";
-                listBox1.Items[listBox1.SelectedIndex] = listBox1.SelectedIndex + "." + Data[listBox1.SelectedIndex].message1;
-                listBox2.Items[listBox1.SelectedIndex] = listBox2.SelectedIndex + "." + Data[listBox1.SelectedIndex].message1;
+                Data[listBox1.SelectedIndex].tickoff = false;
+                Data[listBox1.SelectedIndex].message1 = Data[listBox1.SelectedIndex].message1 + "["+UsingID+"]";
+                listBox1.Items[listBox1.SelectedIndex] = Data[listBox1.SelectedIndex].index + "." + Data[listBox1.SelectedIndex].message1;
+                listBox2.Items[listBox1.SelectedIndex] = Data[listBox1.SelectedIndex].index + "." + Data[listBox1.SelectedIndex].message1;
+            }
+            if (listBox1.SelectedIndex < listBox1.Items.Count - 1)
+            {
+                for (int i = listBox1.SelectedIndex+1; i < listBox1.Items.Count; i++)
+                {
+                    if (Data[i].tickoff&&Data[i].content&&Data[i].failed)
+                    {
+                        listBox1.SelectedIndex = i;
+                        break;
+
+                    }
+                };
             }
         }
 
@@ -276,9 +288,9 @@ namespace ETC_App1
         {
             if (listBox1.SelectedIndex < listBox1.Items.Count - 1)
             {
-                for (int i = listBox1.SelectedIndex; i < listBox1.Items.Count; i++)
+                for (int i = listBox1.SelectedIndex + 1; i < listBox1.Items.Count; i++)
                 {
-                    if(Data[i].success && Data[i].failed)
+                    if (Data[i].tickoff && Data[i].content && Data[i].failed)
                     {
                         listBox1.SelectedIndex = i;
                         break;
@@ -297,27 +309,38 @@ namespace ETC_App1
             int success = 0;
             int noimg = 0;
             int nodata = 0;
+            int noplate = 0;
             for (int i = 0; i < Data.Count; i++)
             {
                 string msg = "";
+
+
+                if (!Data[i].tickoff)
+                {
+                    msg += Data[i].index+". "+Data[i].message1;
+                    success++;
+                }
+                else if(Data[i].content)
+                {
                     if (Data[i].lost2)
                     {
-                    msg = msg + Data[i].filename + "，"+ Data[i].message2;
                         nodata++;
+                        msg += Data[i].filename + ". " + Data[i].message2;
                     }
-                else if(Data[i].success)
+                    else
                     {
-                    msg = msg + i + "." + Data[i].message1;
-                    success++;
+                        noplate++;
+                        msg += Data[i].index + ". " + Data[i].message2;
                     }
-                else if (Data[i].lost1)
+                }
+                else
                 {
-                    msg = msg + i + "." + Data[i].filename;
+                    msg += Data[i].index + ". " + Data[i].filename;
                     noimg++;
                 }
                 sw.WriteLine(msg);
             }
-            sw.WriteLine("完全正確:"+success+" 找不到圖片:"+noimg+" 缺少比對資料:"+nodata);
+            sw.WriteLine("完全正確:"+success+" 車牌定位無結果"+noplate+" 找不到圖片:"+noimg+" 缺少比對資料:"+nodata);
 
 
             sw.Close();

ETC_App1/Form1.cs

@@ -222,7 +222,7 @@ namespace ETC_App1
 
         private void ToolStripButton4_Click(object sender, EventArgs e)
         {
-            toolStripComboBox1.Items.Clear();
+            etcPictureCheckBox1.Clear();
             if (!etcBackgroundWorker31.IsBusy)
             {
                 etcBackgroundWorker31.RunWorkerAsync(index);

ETC_App1/bin/Debug/server.json

+{
+  "Host": "192.168.6.59",
+  "Port": 80,
+  "Resource": "recognition"
+}
\ No newline at end of file