Browse Source

revise log language to english

chenzk 2 months ago
parent
commit
a26e8b105c

+ 1 - 1
CyberX8_Core/SerializeHelper.cs

@@ -392,7 +392,7 @@ namespace Venus_Unity
             }
             catch (Exception ex)
             {
-                throw new Exception(" 对象转换成JSON失败!" + ex.Message);
+                throw new Exception("Convert Object TO JSON Failed!" + ex.Message);
             }
             return result;
         }

+ 3 - 3
CyberX8_MainPages/ViewModels/DataHistoryViewModel.cs

@@ -208,7 +208,7 @@ namespace CyberX8_MainPages.ViewModels
             {
                 ((System.Windows.Controls.CheckBox)obj).IsChecked= false;
                 timer.Stop();
-                WPFMessageBox.ShowWarning("最多显示10个数据");
+                WPFMessageBox.ShowWarning("Only Display 10 data");
                 return;
             }
 
@@ -225,7 +225,7 @@ namespace CyberX8_MainPages.ViewModels
            
             if (Keys.Count > 10)
             {
-                WPFMessageBox.ShowWarning("最多显示10个数据");
+                WPFMessageBox.ShowWarning("Only Display 10 data");
                 return;
             }
             this.DataHistoryView.MyDrawGraphicsControl.ClearPlotPoints();
@@ -440,7 +440,7 @@ namespace CyberX8_MainPages.ViewModels
         {    
             if (Keys.Count > 10)
             {
-                WPFMessageBox.ShowWarning("最多显示10个数据");
+                WPFMessageBox.ShowWarning("Only Display 10 data");
                 timer.Stop();
                 return;
             }

+ 1 - 1
CyberX8_MainPages/ViewModels/ProcessHistoryViewModel.cs

@@ -460,7 +460,7 @@ namespace CyberX8_MainPages.ViewModels
             }
             if (keys.Count > 10)
             {
-                WPFMessageBox.ShowWarning("最多显示10个数据");
+                WPFMessageBox.ShowWarning("Only Display 10 data");
                 return;
             }
             OldPdKeyDataCollection.Clear();

+ 4 - 4
CyberX8_MainPages/ViewModels/RecipeManageViewModel.cs

@@ -244,7 +244,7 @@ namespace CyberX8_MainPages.ViewModels
                 string projectName = _content[_content.Length - 2];
                 if ("Production".Equals(projectName))
                 {
-                    MessageBox.Show($"所选文件包含Production文件,无法执行该操作!", "提示", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show($"The selected file contains a Production file, so this operation cannot be performed!", "Hint", MessageBoxButton.OK, MessageBoxImage.Error);
                     return;
                 }
                 string _fileName = _content[_content.Length - 1];
@@ -278,7 +278,7 @@ namespace CyberX8_MainPages.ViewModels
                 {
                     if (item == _fileName)
                     {
-                        if (MessageBox.Show($"{_fileName} 已经存在是否覆盖?", "保存", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+                        if (MessageBox.Show($"{_fileName} already exist,do overWrite?", "Save", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                         {
                             continue;
                         }
@@ -291,7 +291,7 @@ namespace CyberX8_MainPages.ViewModels
                 }
 
             }
-            if (MessageBox.Show($"确认需要将{SelectedFileNames}文件移至production吗?", "确认", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+            if (MessageBox.Show($"Confirm move {SelectedFileNames} to production ?", "confirm", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
             {
                 SaveFile(FilePaths);
             }
@@ -309,7 +309,7 @@ namespace CyberX8_MainPages.ViewModels
             {
                 return;
             }
-            if (MessageBox.Show($"确认删除{FileNames}文件吗?", "确认", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+            if (MessageBox.Show($"Confirm delete {FileNames} ?", "Confirm", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
             {
                 foreach (var fileItem in FilePaths)
                 {

+ 2 - 2
CyberX8_MainPages/ViewModels/SequenceRecipeViewModel.cs

@@ -475,7 +475,7 @@ namespace CyberX8_MainPages.ViewModels
                         string first = ProcessRecipes.FirstOrDefault(O => O.Contains(str));
                         if (!string.IsNullOrEmpty(first))
                         {
-                            MessageBox.Show("已经存在同一类型Recipe", "Add Recipe", MessageBoxButton.OK, MessageBoxImage.Error);
+                            MessageBox.Show("Already exist same Recipe type", "Add Recipe", MessageBoxButton.OK, MessageBoxImage.Error);
                             return;
                         }
                     }
@@ -484,7 +484,7 @@ namespace CyberX8_MainPages.ViewModels
                         string containResult = ProcessRecipes.FirstOrDefault(O => O == SelectedSubRecipe);
                         if (!string.IsNullOrEmpty(containResult))
                         {
-                            MessageBox.Show($"{SelectedSubRecipe}已经存在", "Add Recipe", MessageBoxButton.OK, MessageBoxImage.Error);
+                            MessageBox.Show($"{SelectedSubRecipe} already exist", "Add Recipe", MessageBoxButton.OK, MessageBoxImage.Error);
                             return;
                         }
                     }

+ 1 - 1
CyberX8_MainPages/Views/DataHistoryView.xaml

@@ -119,7 +119,7 @@
 
                 <CheckBox    HorizontalAlignment="Center" FontSize="20" Padding="3,-5,0,0" Margin="100,25,0,0" Content="AutoY Zoom"     x:Name="AutoYCheckBox"/>
 
-                <CheckBox   HorizontalAlignment="Center" FontSize="20" Padding="3,-5,0,0" Margin="100,25,0,0" Content="查看实时数据"     x:Name="TimeDataCheckBox">
+                <CheckBox   HorizontalAlignment="Center" FontSize="20" Padding="3,-5,0,0" Margin="100,25,0,0" Content="Real-Time Data"     x:Name="TimeDataCheckBox">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Checked">
                             <i:InvokeCommandAction  Command="{Binding StartRealTimeCommand}" CommandParameter="{Binding ElementName=TimeDataCheckBox}"/>

+ 1 - 1
CyberX8_RT/App.config

@@ -13,7 +13,7 @@
 			<datePattern value="yyyyMMdd'.txt'" />
 			<layout type="log4net.Layout.PatternLayout,log4net">
 				<param name="ConversionPattern" value="%d%8p %m%n" />
-				<param name="Header" value="&#xA;----------------------开启RT--------------------------&#xA;" />
+				<param name="Header" value="&#xA;----------------------RT Start Running--------------------------&#xA;" />
 			</layout>
 		</appender>
 		<root>

+ 1 - 8
CyberX8_RT/Config/Devices/LinmotCfg-Simulator.xml

@@ -7,18 +7,11 @@
     <Device Name="LNM1-3" Address="3" />
     <Device Name="LNM1-4" Address="4" />
   </LinmotDeviceConfig>
-  <!-- <LinmotDeviceConfig Name="LNM2" BaudRate="9600" Parity="N" Data="8" StopBit="1" Port="com116" SendTimeout="2000" RecvTimeout="2000"> -->
-  <LinmotDeviceConfig Name="LNM2" BaudRate="9600" Parity="N" Data="8" StopBit="1" Port="com27" SendTimeout="2000" RecvTimeout="2000">
-    <Device Name="LNM2-1" Address="1" />
-    <Device Name="LNM2-2" Address="2" />
-    <Device Name="LNM2-3" Address="3" />
-    <Device Name="LNM2-4" Address="4" />
-  </LinmotDeviceConfig>
   <!-- <LinmotDeviceConfig Name="LNM5" BaudRate="9600" Parity="N" Data="8" StopBit="1" Port="com113" SendTimeout="2000" RecvTimeout="2000"> -->
   <LinmotDeviceConfig Name="LNM3" BaudRate="9600" Parity="N" Data="8" StopBit="1" Port="com29" SendTimeout="2000" RecvTimeout="2000">
     <Device Name="LNM3-1" Address="1" NoProfile="Y" Drive_A_Mode="M" Drive_B_Mode="S" ModuleName="E200" ModuleSettingMode="0" ModuleAddress="1">
       <DeviceData Name="LNM3-1-A">
-        <TopPosition>-150234.75</TopPosition>
+        <TopPosition>-1502340.75</TopPosition>
 		<BottomPosition>0</BottomPosition>
 		<UpMaxSpeed>22120.26</UpMaxSpeed>
 		<DownMaxSpeed>28610.25</DownMaxSpeed>

+ 1 - 1
CyberX8_UI/App.config

@@ -14,7 +14,7 @@
 			<datePattern value="yyyyMMdd'.txt'" />
 			<layout type="log4net.Layout.PatternLayout,log4net">
 				<param name="ConversionPattern" value="%d%8p %m%n" />
-				<param name="Header" value="&#xA;----------------------开启UI--------------------------&#xA;" />
+				<param name="Header" value="&#xA;----------------------UI Start running--------------------------&#xA;" />
 			</layout>
 		</appender>
 		<root>

+ 4 - 4
Framework/Common/Account/Authorization.cs

@@ -113,14 +113,14 @@ namespace Aitex.Core.Account
         /// <param name="ip">client ip</param>
         public static void Request(string accountId, string ip)
         {
-            EV.PostMessage(Module,  EventEnum.OperationAuthorization, string.Format("{0} 在申请操控权", accountId));
+            EV.PostMessage(Module,  EventEnum.OperationAuthorization, string.Format("{0} is applying control", accountId));
 
             if (CanAutoAuthorize(accountId, ip))
             {
                 AuthorizedAccount = accountId;
                 AuthorizedIP = ip;
 
-                EV.PostMessage(Module, EventEnum.OperationAuthorization, string.Format("{0} 获得操控权", AuthorizedAccount));
+                EV.PostMessage(Module, EventEnum.OperationAuthorization, string.Format("{0} get control", AuthorizedAccount));
                 _status = AuthorizationStatusEnum.Granted;
 
                 Update();
@@ -167,12 +167,12 @@ namespace Aitex.Core.Account
                 AuthorizedIP = AuthorizingIP;
 
                 _status = AuthorizationStatusEnum.Granted;
-                EV.PostMessage(Module, EventEnum.OperationAuthorization, string.Format("{0} 获得操控权", AuthorizedAccount));
+                EV.PostMessage(Module, EventEnum.OperationAuthorization, string.Format("{0} is applying control", AuthorizedAccount));
             }
             else
             {
                 _status = AuthorizationStatusEnum.Rejected;
-                EV.PostMessage(Module, EventEnum.OperationAuthorization, string.Format("{0} 拒绝转交操控权", AuthorizedAccount));
+                EV.PostMessage(Module, EventEnum.OperationAuthorization, string.Format("{0} refuse release control", AuthorizedAccount));
             }
 
             Update();

+ 2 - 2
Framework/Common/Communications/AsyncSocketDevice.cs

@@ -134,7 +134,7 @@ namespace MECF.Framework.Common.Communications
             catch (Exception e)
             {
                 //LOG.Write(e);
-                string reason = string.Format("TCP连接发生错误:{0}", e.Message);
+                string reason = string.Format("TCP Connect error:{0}", e.Message);
                 //LOG.Error(string.Format("Communication  {0}:{1:D} {2}.", _ip, _port, reason));
                 OnErrorHappened(new ErrorEventArgsDevice(reason));
             }
@@ -247,7 +247,7 @@ namespace MECF.Framework.Common.Communications
             catch (Exception ex)
             {
                 //LOG.WriteExeption(ex);
-                string reason = string.Format("释放socket资源失败:{0}", ex.Message);
+                string reason = string.Format("release socket source failed:{0}", ex.Message);
                 OnErrorHappened(new ErrorEventArgsDevice(reason));
             }
         }

+ 3 - 3
Framework/Common/DataCollection/DataCollectionManager.cs

@@ -316,7 +316,7 @@ namespace Aitex.Core.RT.DataCollection
                             }
                             catch (Exception ex)
                             {
-                                LOG.WriteExeption("数据记录发生异常" + moduleInsertSql[module], ex);
+                                LOG.WriteExeption("data recoder error" + moduleInsertSql[module], ex);
                             }
                         }
 
@@ -336,7 +336,7 @@ namespace Aitex.Core.RT.DataCollection
                 }//end while
                 catch (Exception ex)
                 {
-                    LOG.WriteExeption("数据库操作记录发生异常", ex);
+                    LOG.WriteExeption("database operate recoder error", ex);
                 }
             }
         }
@@ -430,7 +430,7 @@ namespace Aitex.Core.RT.DataCollection
                 }
                 catch (Exception ex1)
                 {
-                    LOG.WriteExeption("创建数据库表格失败", ex1);
+                    LOG.WriteExeption("Create database table failed", ex1);
                     throw;
                 }
             }

+ 1 - 1
Framework/Common/Device/Common/DEVICE.cs

@@ -102,7 +102,7 @@ namespace Aitex.Core.RT.Device
                 }
                 catch (Exception ex)
                 {
-                    LOG.WriteExeption(string.Format("Device:执行{0}命令发生异常",name), ex);
+                    LOG.WriteExeption(string.Format("Device:execute {0} error",name), ex);
                     ret = false;
                 }
             }

+ 3 - 3
Framework/Common/Fsm/StateMachine.cs

@@ -186,7 +186,7 @@ namespace Aitex.Core.RT.Fsm
                                     ///add log
                                     //if (Name == "EFEM FSM")
                                     {
-                                        LOG.Write(eEvent.EV_FSM_NOTIFY, MECF.Framework.Common.Equipment.ModuleName.System, $"状态机 {Name}收到消息 {GetStringMessage(_msgInProcess.Key)}, 状态 {GetStringState(PrevState)}==>{GetStringState(State)}");
+                                        LOG.Write(eEvent.EV_FSM_NOTIFY, MECF.Framework.Common.Equipment.ModuleName.System, $"State Machine {Name} receive messages {GetStringMessage(_msgInProcess.Key)}, Status {GetStringState(PrevState)}==>{GetStringState(State)}");
                                     }
 
 
@@ -259,7 +259,7 @@ namespace Aitex.Core.RT.Fsm
                             ///add log
                             //if (Name == "EFEM FSM")
                             {
-                                LOG.Write(eEvent.EV_FSM_NOTIFY, MECF.Framework.Common.Equipment.ModuleName.System, $"状态机 {Name}收到消息 {GetStringMessage(_msgInProcess.Key)}, 状态 {GetStringState(PrevState)}==>{GetStringState(State)} 时长{TransitionElapsedTime}");
+                                LOG.Write(eEvent.EV_FSM_NOTIFY, MECF.Framework.Common.Equipment.ModuleName.System, $"State Machine {Name} reveive message {GetStringMessage(_msgInProcess.Key)}, status {GetStringState(PrevState)}==>{GetStringState(State)} time consuming {TransitionElapsedTime}");
                             }
                             transitionEnterTime = Environment.TickCount;
 
@@ -334,7 +334,7 @@ namespace Aitex.Core.RT.Fsm
                             ///add log
                             //if (Name == "EFEM FSM")
                             {
-                                LOG.Write(eEvent.EV_FSM_NOTIFY, MECF.Framework.Common.Equipment.ModuleName.System, $"状态机 {Name}收到消息 {GetStringMessage(_msgInProcess.Key)}, 状态 {GetStringState(PrevState)}==>{GetStringState(State)} 时长{TransitionElapsedTime}");
+                                LOG.Write(eEvent.EV_FSM_NOTIFY, MECF.Framework.Common.Equipment.ModuleName.System, $"State Machine {Name} receive message {GetStringMessage(_msgInProcess.Key)}, status {GetStringState(PrevState)}==>{GetStringState(State)} time consuming {TransitionElapsedTime}");
                             }
                             transitionEnterTime = Environment.TickCount;
 

+ 8 - 8
Framework/Common/RecipeCenter/RecipeFileManager.cs

@@ -468,7 +468,7 @@ namespace Aitex.Core.RT.RecipeCenter
             }
             catch (Exception ex)
             {
-                LOG.WriteExeption("删除recipe file 出错", ex);
+                LOG.WriteExeption("Delete recipe file error", ex);
 
                 WarningDialog(string.Format(Resources.RecipeFileManager_DeleteRecipe_RecipeFile0DeleteFailed, recipeName));
 
@@ -507,7 +507,7 @@ namespace Aitex.Core.RT.RecipeCenter
             }
             catch (Exception ex)
             {
-                LOG.WriteExeption("重命名recipe file 出错", ex);
+                LOG.WriteExeption("Rename recipe file error", ex);
 
                 WarningDialog(string.Format(Resources.RecipeFileManager_RenameRecipe_RecipeFile0RenameFailed, oldName, newName));
 
@@ -588,7 +588,7 @@ namespace Aitex.Core.RT.RecipeCenter
             }
             catch (Exception ex)
             {
-                LOG.WriteExeption("删除recipe folder 出错", ex);
+                LOG.WriteExeption("Delete recipe folder error", ex);
                 WarningDialog(string.Format("recipe folder  {0} delete failed", folderName));
                 return false;
             }
@@ -651,7 +651,7 @@ namespace Aitex.Core.RT.RecipeCenter
             }
             catch (Exception ex)
             {
-                LOG.WriteExeption("保存recipe file 出错", ex);
+                LOG.WriteExeption("Save recipe file error", ex);
 
                 if (notifyUI)
                 {
@@ -687,7 +687,7 @@ namespace Aitex.Core.RT.RecipeCenter
             }
             catch (Exception ex)
             {
-                LOG.WriteExeption("保存recipe file 出错", ex);
+                LOG.WriteExeption("Save recipe file error", ex);
 
                 if (notifyUI)
                 {
@@ -724,7 +724,7 @@ namespace Aitex.Core.RT.RecipeCenter
             }
             catch (Exception ex)
             {
-                LOG.WriteExeption("移动 recipe file 出错", ex);
+                LOG.WriteExeption("Move recipe file error", ex);
 
                 if (notifyUI)
                 {
@@ -750,7 +750,7 @@ namespace Aitex.Core.RT.RecipeCenter
             }
             catch (Exception ex)
             {
-                LOG.WriteExeption("创建recipe folder 出错", ex);
+                LOG.WriteExeption("Create recipe folder error", ex);
                 WarningDialog(string.Format(Resources.RecipeFileManager_CreateFolder_RecipeFolder0CreateFailed, folderName));
                 return false;
             }
@@ -775,7 +775,7 @@ namespace Aitex.Core.RT.RecipeCenter
             }
             catch (Exception ex)
             {
-                LOG.WriteExeption("重命名recipe folder 出错", ex);
+                LOG.WriteExeption("Rename recipe folder error", ex);
                 WarningDialog(string.Format(Resources.RecipeFileManager_RenameFolder_RecipeFolder0RenameFailed, oldName, newName));
                 return false;
             }

+ 1 - 1
Framework/Common/RecipeCenter/RecipeService.cs

@@ -168,7 +168,7 @@ namespace MECF.Framework.Common.RecipeCenter
         {
             if (CheckSoftwareExpired())
                 return false;
-            LOG.Write(eEvent.EV_SEQUENCE, ModuleName.System, string.Format("Rename {0} Recipe {1}{2}", chamId, oldName, newName));
+            LOG.Write(eEvent.EV_SEQUENCE, ModuleName.System, string.Format("Rename {0} Recipe {1} to {2}", chamId, oldName, newName));
             //if (!ChamberOperationService.IsSuperEnter()) return false;
             return RecipeFileManager.Instance.RenameRecipe(chamId.ToString(), oldName, newName);
         }

+ 17 - 17
Framework/Common/Routine/RoutineRunner.cs

@@ -81,7 +81,7 @@ namespace MECF.Framework.Common.Routine
             _runnerState = RState.Running;
             _subState = RState.End;
             _stopwatch.Restart();
-            Notify("开始");
+            Notify("Start");
             return _runnerState;
         }
         public RState Start(string module, string name)
@@ -94,7 +94,7 @@ namespace MECF.Framework.Common.Routine
             _subState = RState.End;
             _stopwatch.Restart();
 
-            Notify("开始");
+            Notify("Start");
             return _runnerState;
         }
         /// <summary>
@@ -142,7 +142,7 @@ namespace MECF.Framework.Common.Routine
                 }
                 else if(_subStepTimer.ElapsedMilliseconds >= timeout)
                 {
-                    Alarm($"Step:{id} 超时",error);
+                    Alarm($"Step:{id} timeout",error);
                     _runnerState = _subState = RState.Timeout;
                     _subStepTimer.Reset();
                 }
@@ -249,7 +249,7 @@ namespace MECF.Framework.Common.Routine
                 {
                     if (_subStepTimer.ElapsedMilliseconds >= timeout)
                     {
-                        Alarm($"Step:{id} 超时", error);
+                        Alarm($"Step:{id} timeout", error);
                         _runnerState = _subState = RState.Timeout;
                         _subStepTimer.Reset();
                     }
@@ -343,7 +343,7 @@ namespace MECF.Framework.Common.Routine
             {
                 if (condition())
                 {
-                    Notify($"结束");
+                    Notify($"End");
                     _runnerState = RState.End;
                     _subState = RState.End;
                 }
@@ -351,7 +351,7 @@ namespace MECF.Framework.Common.Routine
                 {
                     if (_subStepTimer.ElapsedMilliseconds > timeout)
                     {
-                        Alarm($"Step:{id} 超时");
+                        Alarm($"Step:{id} timeout");
                         _runnerState = RState.Failed;
                         _subState = RState.Timeout;
                     }
@@ -371,7 +371,7 @@ namespace MECF.Framework.Common.Routine
             {
                 if (_subStepTimer.ElapsedMilliseconds > delayMS)
                 {
-                    Notify($"结束");
+                    Notify($"End");
                     _runnerState = RState.End;
                     _subState = RState.End;
                     _stopwatch.Stop();
@@ -433,7 +433,7 @@ namespace MECF.Framework.Common.Routine
                 }
                 else if(fail())
                 {
-                    Notify($"结束");
+                    Notify($"End");
                     _runnerState = RState.End;
                     _subState = RState.End;
                 }
@@ -463,7 +463,7 @@ namespace MECF.Framework.Common.Routine
                 }
                 else if (_subStepTimer.ElapsedMilliseconds >= timeout)
                 {
-                    Alarm($"Step:{id} 超时");
+                    Alarm($"Step:{id} timeout");
                     _runnerState = _subState = RState.Timeout;
                     _subStepTimer.Reset();
                 }
@@ -510,7 +510,7 @@ namespace MECF.Framework.Common.Routine
                 }
                 else if (_subStepTimer.ElapsedMilliseconds >= timeout)
                 {
-                    Alarm($"Step:{id} 超时");
+                    Alarm($"Step:{id} timeout");
                     _runnerState = _subState = RState.Timeout;
                     _subStepTimer.Reset();
                 }
@@ -551,7 +551,7 @@ namespace MECF.Framework.Common.Routine
                     {
                         if (_subStepTimer.ElapsedMilliseconds >= timeout)
                         {
-                            Alarm($"Step:{id} 超时", true);
+                            Alarm($"Step:{id} timeout", true);
                             _runnerState = _subState = RState.Timeout;
                             _subStepTimer.Reset();
                         }
@@ -642,7 +642,7 @@ namespace MECF.Framework.Common.Routine
                 {
                     if (_subStepTimer.ElapsedMilliseconds >= timeout)
                     {
-                        Alarm($"Step:{id} 超时", true);
+                        Alarm($"Step:{id} timeout", true);
                         _runnerState = _subState = RState.Timeout;
                         _subStepTimer.Reset();
                     }
@@ -680,7 +680,7 @@ namespace MECF.Framework.Common.Routine
                 }
                 else if (_subStepTimer.ElapsedMilliseconds >= timeout)
                 {
-                    Alarm($"Step:{id} 超时");
+                    Alarm($"Step:{id} timeout");
                     _runnerState = _subState = RState.Timeout;
                     _subStepTimer.Reset();
                 }
@@ -784,7 +784,7 @@ namespace MECF.Framework.Common.Routine
                 }
                 else if (_subStepTimer.ElapsedMilliseconds >= timeout)
                 {
-                    Alarm($"Step:{id} 超时");
+                    Alarm($"Step:{id} timeout");
                     _runnerState = _subState = RState.Timeout;
                     _subStepTimer.Reset();
                 }
@@ -816,7 +816,7 @@ namespace MECF.Framework.Common.Routine
                 {
                     if (_subStepTimer.ElapsedMilliseconds >= timeout)
                     {
-                        Alarm($"Step:{id} 超时", true);
+                        Alarm($"Step:{id} timeout", true);
                         _runnerState = _subState = RState.Timeout;
                         _subStepTimer.Reset();
                     }
@@ -844,7 +844,7 @@ namespace MECF.Framework.Common.Routine
                 }
                 else if (_subStepTimer.ElapsedMilliseconds >= timeout)
                 {
-                    Alarm($"Step:{id} 超时");
+                    Alarm($"Step:{id} timeout");
                     _runnerState = _subState = RState.Timeout;
                     _subStepTimer.Reset();
                 }
@@ -960,7 +960,7 @@ namespace MECF.Framework.Common.Routine
                 {
                     if (_subStepTimer.ElapsedMilliseconds >= timeout)
                     {
-                        Alarm($"Step:{id} 超时", true);
+                        Alarm($"Step:{id} timeout", true);
                         _runnerState = _subState = RState.Timeout;
                         _subStepTimer.Reset();
                     }

+ 1 - 1
Framework/Common/SCCore/DeviceConfigManager.cs

@@ -22,7 +22,7 @@ namespace Aitex.Core.RT.ConfigCenter
             string fileCurrent = string.Format("{0}\\config\\DeviceConfig.xml", Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName));
 
             if (!File.Exists(fileDefault) && !File.Exists(fileCurrent))
-                throw new ApplicationException("没有找到DeviceConfig配置文件。\r\n"+fileDefault + "\r\n或者" + fileCurrent);
+                throw new ApplicationException("can not find DeviceConfig file。\r\n"+fileDefault + "\r\nor" + fileCurrent);
 
             if (File.Exists(fileDefault))
             {

+ 1 - 1
Framework/Common/SCCore/TypedConfigManager.cs

@@ -27,7 +27,7 @@ namespace MECF.Framework.Common.SCCore
             string fileCurrent = string.Format("{0}\\config\\DataHistoryTypedConfig.xml", Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName));
 
             if (!File.Exists(fileDefault) && !File.Exists(fileCurrent))
-                throw new ApplicationException("没有找到DataHistoryTypedConfig配置文件.\r\n" + fileDefault + "\r\n或者" + fileCurrent);
+                throw new ApplicationException("Can not find DataHistoryTypedConfig file.\r\n" + fileDefault + "\r\nor" + fileCurrent);
 
             if (File.Exists(fileDefault))
             {