优化

alielie

2025-11-21 3a471ae651b228231bebb3a2d438baa1d4ac0261

 Plugin.TestResult/Scanner.xaml.cs

@@ -1,12 +1,15 @@
using HMI.Core.Util;
using HMI.UI.MDI;
using HMI.UI.Util;
using HMI.Util;
using Panuon.WPF.UI;
using Plugin.TestResult.Model;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO.Ports;
using System.Windows;
using System.Windows.Input;

namespace Plugin.TestResult_WPF
{
@@ -15,12 +18,16 @@
        public string name { get; private set; }
        public string positionCode { get; private set; }
        public string snrCode { get; private set; }
        public string oldPosition { get; private set; }
        public int oldIndex { get; private set; }

        public BarcodeEventArg(string name, string positionCode, string snrCode)
        public BarcodeEventArg(string name, string positionCode, string snrCode, string oldPosition, int oldIndex)
        {
            this.name = name;
            this.positionCode = positionCode;
            this.snrCode = snrCode;
            this.oldPosition = oldPosition;
            this.oldIndex = oldIndex;
        }
    }

@@ -38,6 +45,10 @@
        }

        public event EventHandler<BarcodeEventArg> FinishBarcode;
        public event EventHandler<RoutedEventArgs> ComplateClick;

        private static Dictionary<string, string> snrCache = new Dictionary<string, string>();
        private static Dictionary<string, int> snrIndex = new Dictionary<string, int>();

        private DataTable dataTable;
        SerialPort serialPort;
@@ -142,6 +153,44 @@
            }
        }

        public static void InsertNewCode(string snr, string position, int index)
        {
            snrCache[snr] = position;
            snrIndex[snr] = index;
        }

        public static void RemoveSNR(string snr)
        {
            snrCache.Remove(snr);
            snrIndex.Remove(snr);
        }

        private void SendCode(string tag, string position, string snr)
        {
            if (snrCache.ContainsKey(snr))
            {
                var oldPosition = snrCache[snr];
                if (MsgBoxHelper2.WarnChoose($"条码[{snr}]已放置于[{oldPosition}]中，是否清除？") == MessageBoxResult.OK)
                {
                    try
                    {
                        FinishBarcode.Invoke(this, new BarcodeEventArg(tag, position, null, oldPosition, snrIndex[snr]));
                        snrCache.Remove(snr);
                        snrIndex.Remove(snr);
                        FinishBarcode.Invoke(this, new BarcodeEventArg(tag, position, snr, null, -1));
                    }
                    catch (Exception ex)
                    {
                        ToastHelper.Error(ex.Message);
                    }
                }
            }
            else
            {
                FinishBarcode.Invoke(this, new BarcodeEventArg(tag, position, snr, null, -1));
            }
        }

        private void Con_Click(object sender, RoutedEventArgs e)
        {
            Dispatcher.Invoke(() =>
@@ -154,9 +203,9 @@
                }
                try
                {
                    FinishBarcode.Invoke(this, new BarcodeEventArg(Tag.ToString(), position, snr));
                    //positionText.Text = "";
                    //snrText.Text = "";
                    SendCode(Tag.ToString(), position, snr);
                    positionText.Text = "";
                    snrText.Text = "";
                    positionText.Focus();
                }
                catch (Exception ex)
@@ -167,24 +216,35 @@
            });
        }

        /// <summary>
        /// 原来的完成扫描逻辑
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        //private void Ok_Click(object sender, RoutedEventArgs e)
        //{
        //    string position = positionText.Text, snr = snrText.Text;
        //    if (string.IsNullOrEmpty(position) || string.IsNullOrEmpty(snr))
        //    {
        //        ToastHelper.Warning(this, this.lang("Tr.PleaseInputSnrs"));
        //        return;
        //    }
        //    try
        //    {
        //        SendCode(Tag.ToString(), position, snr);
        //        this.Close();
        //    }
        //    catch (Exception ex)
        //    {
        //        ViewControl.Logger.Error("Con_Click Failed.", ex);
        //        ToastHelper.Warning(this, ex.Message);
        //    }
        //}

        private void Ok_Click(object sender, RoutedEventArgs e)
        {
            string position = positionText.Text, snr = snrText.Text;
            if (string.IsNullOrEmpty(position) || string.IsNullOrEmpty(snr))
            {
                ToastHelper.Warning(this, this.lang("Tr.PleaseInputSnrs"));
                return;
            }
            try
            {
                FinishBarcode.Invoke(this, new BarcodeEventArg(Tag.ToString(), position, snr));
                this.Close();
            }
            catch (Exception ex)
            {
                ViewControl.Logger.Error("Con_Click Failed.", ex);
                ToastHelper.Warning(this, ex.Message);
            }
            ComplateClick?.Invoke(this, e);
            this.Close();
        }

        private string ReadDataFrom(SerialPort sp)
@@ -194,7 +254,7 @@
            {
                byte[] buffer = new byte[sp.BytesToRead];
                sp.Read(buffer, 0, buffer.Length);
                barcode += System.Text.Encoding.UTF8.GetString(buffer);
                barcode += System.Text.Encoding.ASCII.GetString(buffer);
                System.Threading.Thread.Sleep(50);
            }
            return barcode;
@@ -211,5 +271,24 @@
            {
            }
        }

        private void TextBox_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
        {
            if (e.Key == Key.Enter)
            {
                //string barcode = 
                Dispatcher.Invoke(() =>
                {
                    if (snrText.IsFocused)
                    {
                        Con_Click(null, null);
                    }
                    else
                    {
                        snrText.Focus();
                    }
                });
            }
        }
    }
}