From 6bcafc823e836ecd5790f87178a906333699f868 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 10 四月 2025 10:46:47 +0800
Subject: [PATCH] 优化插件结构；

---
 Plugin.TestResult/ViewControl.xaml.cs |   79 +++++++++++++++++++++++++++++++++++----
 1 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/Plugin.TestResult/ViewControl.xaml.cs b/Plugin.TestResult/ViewControl.xaml.cs
index ea740a9..548299e 100644
--- a/Plugin.TestResult/ViewControl.xaml.cs
+++ b/Plugin.TestResult/ViewControl.xaml.cs
@@ -1,7 +1,8 @@
 锘縰sing HMI.Base;
+using HMI.Core.Entity;
+using HMI.Core.Manager;
 using HMI.Core.Util;
-using HMI.ParameterManage.Entity;
-using HMI.ParameterManage.Util;
+using HMI.UI;
 using HMI.UI.Util;
 using log4net;
 using NationalInstruments.TestStand.Interop.API;
@@ -10,6 +11,7 @@
 using Plugin.TestResult_WPF.Util;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -70,6 +72,26 @@
             testResultView.testApp.ExecutionClosed += new _ApplicationMgrEvents_ExecutionClosedEventHandler(this.axApplicationMgr_ExecutionClosed);
         }
 
+        public TestResultView View
+        {
+            get => testResultView;
+        }
+
+        public override void InitFinish()
+        {
+            base.InitFinish();
+            string path = Path.Combine(BaseFolder, "Count.ini");
+            testResultView.SetCountIniPath(path);
+            testResultView.InitMainGrid();
+            testResultView.InitTestStandEngine();
+            LoadProduct();
+        }
+
+        public override void DoClose(object sender, EventArgs e)
+        {
+            testResultView.ReleaseResource();
+        }
+
         private void axApplicationMgr_ExitApplication(object sender, EventArgs e)
         {
         }
@@ -116,25 +138,50 @@
             { }
         }
 
+        private bool isLoaded;
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-            LoadProduct();
-            testResultView.InitTestStandEngine();
-            Start_Click(null, null);
-            Loaded -= UserControl_Loaded;
+            new MaskWindow(Window.GetWindow(this),
+                (win) =>
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        try
+                        {
+                            Start_Click(null, null);
+                            Loaded -= UserControl_Loaded;
+                        }
+                        finally
+                        {
+                            win.Close();
+                        }
+                    });
+                }).Info(LangUtil.Get("Ts.SequenceIsStarting"));
         }
 
         public void LoadProduct()
         {
-            List<ProductData> products = ParameterManager.GetProducts();
+            List<ProductData> products = ProductManager.GetProducts<List<ProductData>>()
+                ?? new List<ProductData>();
             this.modelSelect.Items.Clear();
+            List<string> productSource = new List<string>();
             foreach (var prd in products)
             {
                 this.modelSelect.Items.Add(prd.Name);
+                productSource.Add(prd.Name);
             }
-            if (products.Count > 0)
+            testResultView.SetProductSource(productSource);
+
+            string model = testResultView.engine.Globals.GetValString("ProductModel", 0);
+            if (!string.IsNullOrEmpty(model))
+            {
+                this.modelSelect.SelectedItem = model;
+                testResultView.SetCurrentProduct(model);
+            }
+            else if (products.Count > 0)
             {
                 this.modelSelect.SelectedIndex = 0;
+                testResultView.SetCurrentProduct(products[0].Name);
             }
         }
 
@@ -142,7 +189,8 @@
         {
             try
             {
-                List<ParameterData> parameters = ParameterManager.GetParametersByProductName(this.modelSelect.SelectedItem.ToString());
+                string currentModel = this.modelSelect.SelectedItem.ToString();
+                List<ParameterData> parameters = ProductManager.GetParametersByProductName(currentModel);
                 //MessageBox.Show("ParaFile:" + ParaFile + "ParaCount:" + this.parameterManager.Parameters.Count.ToString());
                 //this.TestTemperature = Convert.ToDouble(this.parameterManager.Find("TestTemperature").ParmValue);
                 //this.TestTime = Convert.ToInt32(this.parameterManager.Find("TestTime").ParmValue);
@@ -151,6 +199,9 @@
                 //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;
+
+                testResultView.engine.Globals.SetValString("ProductModel", 0, currentModel);
+                testResultView.engine.CommitGlobalsToDisk(promptOnSaveConflicts: false);
             }
             catch (Exception ex)
             {
@@ -270,6 +321,16 @@
         {
         }
 
+        /// <summary>
+        /// 璁℃暟娓呴浂鎸夐挳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnClear_Click(object sender, RoutedEventArgs e)
+        {
+            testResultView.ClearNumber();
+        }
+
 
     }
 }

--
Gitblit v1.9.1