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/Scanner.xaml.cs | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/Plugin.TestResult/Scanner.xaml.cs b/Plugin.TestResult/Scanner.xaml.cs
index 929b47a..72c0bd4 100644
--- a/Plugin.TestResult/Scanner.xaml.cs
+++ b/Plugin.TestResult/Scanner.xaml.cs
@@ -1,4 +1,5 @@
-锘縰sing HMI.UI.Util;
+锘縰sing HMI.Core.Util;
+using HMI.UI.Util;
using Panuon.WPF.UI;
using System;
using System.ComponentModel;
@@ -59,7 +60,7 @@
{
string comStr = "";
if (serialPort != null) return;
- if (this.title == "涓�鍖烘壂鐮�")
+ if (this.Tag == "Zone1")
{
comStr = "COM1";
}
@@ -93,7 +94,8 @@
}
catch (Exception ex)
{
- MsgBoxHelper.Error(this, $"鍒濆鍖栨壂鐮佹灙澶辫触锛亄ex.StackTrace}");
+ ViewControl.Logger.Error("Init Scan Gun Failed.", ex);
+ MsgBoxHelper.Error(this, $"{this.lang("Tr.InitGunFailed")}: {ex.StackTrace}");
}
}
@@ -123,7 +125,8 @@
}
catch (Exception ex)
{
- MessageBox.Show($"鑾峰彇鎵爜鏋暟鎹け璐ワ紒{ex.StackTrace}");
+ ViewControl.Logger.Error("Get Scan Gun Data Failed.", ex);
+ MessageBox.Show($"{this.lang("Tr.GetGunData")}: {ex.StackTrace}");
}
}
@@ -134,19 +137,20 @@
string position = positionText.Text, snr = snrText.Text;
if (string.IsNullOrEmpty(position) || string.IsNullOrEmpty(snr))
{
- MessageBox.Show("璇疯緭鍏ュ偍浣嶆潯鐮佸拰浜у搧鏉＄爜");
+ ToastHelper.Warning(this, this.lang("Tr.PleaseInputSnrs"));
return;
}
try
{
- FinishBarcode.Invoke(this, new BarcodeEventArg(title, position, snr));
+ FinishBarcode.Invoke(this, new BarcodeEventArg(Tag.ToString(), position, snr));
//positionText.Text = "";
//snrText.Text = "";
positionText.Focus();
}
catch (Exception ex)
{
- MessageBox.Show(ex.Message);
+ ViewControl.Logger.Error("Con_Click Failed.", ex);
+ ToastHelper.Warning(this, ex.Message);
}
});
}
@@ -156,17 +160,18 @@
string position = positionText.Text, snr = snrText.Text;
if (string.IsNullOrEmpty(position) || string.IsNullOrEmpty(snr))
{
- MessageBox.Show("璇疯緭鍏ュ偍浣嶆潯鐮佸拰浜у搧鏉＄爜");
+ ToastHelper.Warning(this, this.lang("Tr.PleaseInputSnrs"));
return;
}
try
{
- FinishBarcode.Invoke(this, new BarcodeEventArg(title, position, snr));
+ FinishBarcode.Invoke(this, new BarcodeEventArg(Tag.ToString(), position, snr));
this.Close();
}
catch (Exception ex)
{
- MessageBox.Show(ex.Message);
+ ViewControl.Logger.Error("Con_Click Failed.", ex);
+ ToastHelper.Warning(this, ex.Message);
}
}
--
Gitblit v1.9.1