From 15bbd62b0b24b72c717ae91ab45348a2083ad04e Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 10 十月 2025 08:58:18 +0800
Subject: [PATCH] 优化bug；
---
Plugin.TestResult/ViewControl.xaml.cs | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 81 insertions(+), 22 deletions(-)
diff --git a/Plugin.TestResult/ViewControl.xaml.cs b/Plugin.TestResult/ViewControl.xaml.cs
index 548299e..13cb7c7 100644
--- a/Plugin.TestResult/ViewControl.xaml.cs
+++ b/Plugin.TestResult/ViewControl.xaml.cs
@@ -21,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;
@@ -63,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;
@@ -76,6 +90,7 @@
{
get => testResultView;
}
+ public static string SannerIniFile { get; private set; }
public override void InitFinish()
{
@@ -84,12 +99,25 @@
testResultView.SetCountIniPath(path);
testResultView.InitMainGrid();
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)
@@ -109,6 +137,15 @@
string strData;
if (EventCase != 10014) return;
+
+ try
+ {
+ log.Info($"EventCase: {EventCase}, MethodCode: {MethodCode}, StrData: {e.uiMsg.StringData}");
+ }
+ catch
+ {
+
+ }
if (MethodCode == 0)
{
@@ -141,22 +178,41 @@
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()
@@ -172,7 +228,7 @@
}
testResultView.SetProductSource(productSource);
- string model = testResultView.engine.Globals.GetValString("ProductModel", 0);
+ string model = testResultView.engine.Globals.GetValString("ProductModel", 1);
if (!string.IsNullOrEmpty(model))
{
this.modelSelect.SelectedItem = model;
@@ -214,9 +270,7 @@
try
{
testResultView.StartTestSequence();
- this.modelSelect.IsEnabled = false;
- this.btnStart.IsEnabled = false;
- this.btnStop.IsEnabled = true;
+ IsRunning = true;
}
catch (Exception ex)
{
@@ -231,9 +285,7 @@
try
{
testResultView.StopTest();
- this.modelSelect.IsEnabled = true;
- this.btnStart.IsEnabled = true;
- this.btnStop.IsEnabled = false;
+ IsRunning = false;
}
catch (Exception ex)
{
@@ -331,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");
+ }
}
}
--
Gitblit v1.9.1