TestPlatfoming.git

			@@ -7,9 +7,7 @@
			using Plugin.TestResult_WPF.Util;
			using System;
			using System.Collections.Generic;
			using System.ComponentModel;
			using System.Linq;
			using System.Runtime.CompilerServices;
			using System.Windows;
			using System.Windows.Controls;

			@@ -20,7 +18,6 @@
			/// </summary>
			public partial class ViewControl : PluginControl
			{

			private CommonCodeParser codeParser = new CommonCodeParser();
			private double TestTemperature = 60;
			private int TestTime = 3600;
			@@ -70,7 +67,6 @@

			private void axApplicationMgr_ExecutionClosed(object sender, _ApplicationMgrEvents_ExecutionClosedEvent e)
			{

			}

			private void axApplicationMgr_UIMessageEvent(object sender, _ApplicationMgrEvents_UIMessageEventEvent e)
			@@ -116,6 +112,7 @@
			LoadProduct();
			testResultView.InitTestStandEngine();
			Start_Click(null, null);
			Loaded -= UserControl_Loaded;
			}

			public void LoadProduct()
			@@ -145,8 +142,6 @@
			//this.Time_Heating_Low = Convert.ToDouble(this.parameterManager.Find("Time_Heat_Low").ParmValue);
			//this.Time_Heating_High = Convert.ToDouble(this.parameterManager.Find("Time_Heat_High").ParmValue);
			testResultView.testSeqFile = parameters.FirstOrDefault(p => p.Name == "TestSequence")?.Value;


			}
			catch (Exception ex)
			{
			@@ -159,7 +154,6 @@
			try
			{
			testResultView.StartTestSequence();

			this.modelSelect.IsEnabled = false;
			this.btnStart.IsEnabled = false;
			this.btnStop.IsEnabled = true;
			@@ -191,7 +185,7 @@
			{
			scannerWindow1 = new Scanner("一区扫码");
			scannerWindow1.FinishBarcode += ScannerWindow_FinishBarcode;
			scannerWindow1.Owner = Window.GetWindow(this);
			//scannerWindow1.Owner = Window.GetWindow(this);
			scannerWindow1.Closed += ScannerWindow1_Closed;
			scannerWindow1.Show();
			}
			@@ -255,7 +249,8 @@

			private void testResultView_Loaded(object sender, RoutedEventArgs e)
			{

			}


			}
			}