From ba6207f52db76ab47cd6534de0cf1712674ff179 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 13 三月 2025 09:00:46 +0800
Subject: [PATCH] 完善国际化语言；

---
 Plugin.TestResult/ViewControl.xaml.cs |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Plugin.TestResult/ViewControl.xaml.cs b/Plugin.TestResult/ViewControl.xaml.cs
index 7f06b2a..ea740a9 100644
--- a/Plugin.TestResult/ViewControl.xaml.cs
+++ b/Plugin.TestResult/ViewControl.xaml.cs
@@ -1,15 +1,16 @@
 锘縰sing HMI.Base;
+using HMI.Core.Util;
 using HMI.ParameterManage.Entity;
 using HMI.ParameterManage.Util;
+using HMI.UI.Util;
+using log4net;
 using NationalInstruments.TestStand.Interop.API;
 using NationalInstruments.TestStand.Interop.UI.Ax;
 using Plugin.TestResult_WPF.Model;
 using Plugin.TestResult_WPF.Util;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -20,7 +21,6 @@
     /// </summary>
     public partial class ViewControl : PluginControl
     {
-
         private CommonCodeParser codeParser = new CommonCodeParser();
         private double TestTemperature = 60;
         private int TestTime = 3600;
@@ -35,6 +35,8 @@
         /// 娴嬭瘯搴忓垪鎿嶄綔鍙ユ焺
         /// </summary>
         private SequenceContext SequenceContext = null;
+
+        public static ILog Logger { get; private set; }
 
 
         private bool _mesStatus;
@@ -53,7 +55,11 @@
             set => Set(ref _produceStatus, value);
         }
 
-
+        public override void SetLogger(ILog logger)
+        {
+            base.SetLogger(logger);
+            Logger = logger;
+        }
 
         public ViewControl()
         {
@@ -70,7 +76,6 @@
 
         private void axApplicationMgr_ExecutionClosed(object sender, _ApplicationMgrEvents_ExecutionClosedEvent e)
         {
-
         }
 
         private void axApplicationMgr_UIMessageEvent(object sender, _ApplicationMgrEvents_UIMessageEventEvent e)
@@ -116,6 +121,7 @@
             LoadProduct();
             testResultView.InitTestStandEngine();
             Start_Click(null, null);
+            Loaded -= UserControl_Loaded;
         }
 
         public void LoadProduct()
@@ -145,8 +151,6 @@
                 //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;
-
-
             }
             catch (Exception ex)
             {
@@ -159,14 +163,15 @@
             try
             {
                 testResultView.StartTestSequence();
-
                 this.modelSelect.IsEnabled = false;
                 this.btnStart.IsEnabled = false;
                 this.btnStop.IsEnabled = true;
             }
             catch (Exception ex)
             {
-                MessageBox.Show("鍚姩娴嬭瘯澶辫触锛�" + ex.Message);
+                log.Error("Start_Click Failed.", ex);
+                MsgBoxHelper.Error(Window.GetWindow(this),
+                    $"{this.lang("Ts.StartTestSequenceFailed")}: {ex.Message}");
             }
         }
 
@@ -181,7 +186,9 @@
             }
             catch (Exception ex)
             {
-                MessageBox.Show("鍋滄娴嬭瘯澶辫触!" + ex.Message);
+                log.Error("Stop_Click Failed.", ex);
+                MsgBoxHelper.Error(Window.GetWindow(this),
+                    $"{this.lang("Ts.StopTestSequenceFailed")}: {ex.Message}");
             }
         }
 
@@ -189,9 +196,12 @@
         {
             if (scannerWindow1 == null)
             {
-                scannerWindow1 = new Scanner("涓�鍖烘壂鐮�");
+                scannerWindow1 = new Scanner(this.lang("Tr.Zone1Scan"))
+                {
+                    Tag = "Zone1"
+                };
                 scannerWindow1.FinishBarcode += ScannerWindow_FinishBarcode;
-                scannerWindow1.Owner = Window.GetWindow(this);
+                //scannerWindow1.Owner = Window.GetWindow(this);
                 scannerWindow1.Closed += ScannerWindow1_Closed;
                 scannerWindow1.Show();
             }
@@ -205,7 +215,10 @@
         {
             if (scannerWindow2 == null)
             {
-                scannerWindow2 = new Scanner("浜屽尯鎵爜");
+                scannerWindow2 = new Scanner(this.lang("Tr.Zone2Scan"))
+                {
+                    Tag = "Zone2"
+                };
                 scannerWindow2.FinishBarcode += ScannerWindow_FinishBarcode;
                 scannerWindow2.Owner = Window.GetWindow(this);
                 scannerWindow2.Closed += ScannerWindow2_Closed;
@@ -227,14 +240,14 @@
             if (this.SequenceContext == null) return;
             CellInfo cellInfo = codeParser.GetCellInfoByCode(e.positionCode);
 
-            string paramName = e.name == "涓�鍖烘壂鐮�" ? "StationState.StartScanner_A" : "StationState.StartScanner_B";
+            string paramName = e.name == "Zone1" ? "StationState.StartScanner_A" : "StationState.StartScanner_B";
             testResultView.engine.Globals.SetValBoolean(paramName, 0, true);
             string positionCode = e.positionCode, snrCode = e.snrCode;
             //闇�瑕佸鍔犳潯鐮佹牎楠屽姛鑳�
 
             //灏嗚鍒扮殑鏉＄爜鍐欏叆鍒癝N涓�
             int dutNo = Convert.ToInt16(positionCode.Split('-')[2]) - 1;
-            string LookupStr = e.name == "涓�鍖烘壂鐮�" ? $"StationState.SN[{dutNo}]" : $"StationState.SN[{(dutNo + 54)}]";
+            string LookupStr = e.name == "Zone1" ? $"StationState.SN[{dutNo}]" : $"StationState.SN[{(dutNo + 54)}]";
             //this.SequenceContext.StationGlobals.SetValString(LookupStr, 0, snrCode);
             //string code = this.SequenceContext.StationGlobals.GetValString(LookupStr, 0);
 
@@ -255,7 +268,8 @@
 
         private void testResultView_Loaded(object sender, RoutedEventArgs e)
         {
-
         }
+
+
     }
 }

--
Gitblit v1.9.1