优化bug；

alielie

2025-10-10 15bbd62b0b24b72c717ae91ab45348a2083ad04e

 Plugin.TestResult/ViewControl.xaml.cs

@@ -1,7 +1,7 @@
using 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;
@@ -11,7 +11,6 @@
using Plugin.TestResult_WPF.Util;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Windows;
@@ -22,7 +21,7 @@
    /// <summary>
    /// ViewControl.xaml 的交互逻辑
    /// </summary>
    public partial class ViewControl : PluginControl
    public partial class ViewControl : PluginMaskControl
    {
        private CommonCodeParser codeParser = new CommonCodeParser();
        private double TestTemperature = 60;
@@ -64,6 +63,20 @@
            Logger = logger;
        }

        private bool isRunning = false;
        public bool IsRunning
        {
            get => isRunning;
            set
            {
                Set(ref isRunning, value);
                testResultView.IsRunning = value;
                this.modelSelect.IsEnabled = !value;
                this.btnStart.IsEnabled = !value;
                this.btnStop.IsEnabled = value;
            }
        }

        public ViewControl()
        {
            DataContext = this;
@@ -73,19 +86,38 @@
            testResultView.testApp.ExecutionClosed += new _ApplicationMgrEvents_ExecutionClosedEventHandler(this.axApplicationMgr_ExecutionClosed);
        }

        public TestResultView View
        {
            get => testResultView;
        }
        public static string SannerIniFile { get; private set; }

        public override void InitFinish()
        {
            base.InitFinish();
            string path = Path.Combine(BaseFolder, "Count.ini");
            testResultView.SetCountIniPath(path);
            testResultView.InitMainGrid();
            LoadProduct();
            testResultView.InitTestStandEngine();

            path = Path.Combine(BaseFolder, "Scanner.ini");
            if (!File.Exists(path))
            {
                File.Create(path).Close();
            }
            SannerIniFile = path;
            LoadProduct();
        }

        public override void DoClose(object sender, EventArgs e)
        {
            testResultView.ReleaseResource();
            try
            {
                testResultView.ReleaseResource();
            }
            catch
            {
            }
        }

        private void axApplicationMgr_ExitApplication(object sender, EventArgs e)
@@ -105,6 +137,15 @@
                string strData;

                if (EventCase != 10014) return;

                try
                {
                    log.Info($"EventCase: {EventCase}, MethodCode: {MethodCode}, StrData: {e.uiMsg.StringData}");
                }
                catch
                {

                }

                if (MethodCode == 0)
                {
@@ -137,36 +178,66 @@
        private bool isLoaded;
        private void UserControl_Loaded(object sender, RoutedEventArgs e)
        {
            new MaskWindow(Window.GetWindow(this),
                (win) =>
            new MaskWindow(Window.GetWindow(this), (win) =>
            {
                try
                {
                    Dispatcher.BeginInvoke(new Action(() =>
                    {
                        Start_Click(null, null);
                        Loaded -= UserControl_Loaded;
                    }));
                }
                finally
                {
                    Dispatcher.Invoke(() =>
                    {
                        try
                        {
                            Start_Click(null, null);
                            Loaded -= UserControl_Loaded;
                        }
                        finally
                        {
                            win.Close();
                        }
                        win.Close();
                    });
                }).Info(LangUtil.Get("Ts.SequenceIsStarting"));
                }
            }).Info(LangUtil.Get("Ts.SequenceIsStarting"), 100);

            //ShowMask(() =>
            //{
            //    Dispatcher.BeginInvoke(new Action(() =>
            //    {
            //        System.Threading.Thread.Sleep(100);
            //        Start_Click(null, null);
            //        Loaded -= UserControl_Loaded;
            //    }));
            //}, (ex) =>
            //{
            //    log.Error("Loaded Error.", ex);
            //    Dispatcher.BeginInvoke(new Action(() =>
            //    {
            //        MsgBoxHelper.Error(Window.GetWindow(this), ex.Message);
            //    }));
            //}, "请稍后", LangUtil.Get("Ts.SequenceIsStarting"));
        }

        public void LoadProduct()
        {
            List<ProductData> products = ParameterManager.GetProducts<List<ProductData>>()
            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", 1);
            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);
            }
        }

@@ -174,7 +245,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);
@@ -183,6 +255,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)
            {
@@ -195,9 +270,7 @@
            try
            {
                testResultView.StartTestSequence();
                this.modelSelect.IsEnabled = false;
                this.btnStart.IsEnabled = false;
                this.btnStop.IsEnabled = true;
                IsRunning = true;
            }
            catch (Exception ex)
            {
@@ -212,9 +285,7 @@
            try
            {
                testResultView.StopTest();
                this.modelSelect.IsEnabled = true;
                this.btnStart.IsEnabled = true;
                this.btnStop.IsEnabled = false;
                IsRunning = false;
            }
            catch (Exception ex)
            {
@@ -312,6 +383,13 @@
            testResultView.ClearNumber();
        }


        private void ScannerSetting_Click(object sender, RoutedEventArgs e)
        {
            Plugin.TestResult.ScannerSetting setting = new Plugin.TestResult.ScannerSetting()
            {
                Owner = Window.GetWindow(this)
            };
            setting.Open(false, "Config");
        }
    }
}