Robert 1 жил өмнө
parent
commit
3508d8d081

+ 1 - 1
GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{ShortSha}'
-next-version: 1.0.4
+next-version: 1.0.5
 branches: {}
 ignore:
   sha: []

+ 4 - 4
MesAdaptor/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
-[assembly: AssemblyInformationalVersion("7a70bdc")]
+// [assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyInformationalVersion("9cc0bed")]

+ 7 - 0
ST-LINK_MES/MainWindow.xaml.cs

@@ -34,6 +34,7 @@ namespace ST_LINK_MES
             Title = Title + string.Format(" V{0}", Assembly.GetEntryAssembly().GetName().Version);
 
             this.stlinkService = new STLinkCliPrograrmService(AppSettingService.Instance.DLinkCliPath);
+            this.fileRrecordService = new FileRrecordService();
             //this.loginWindow = new LoginWindow();
             this.resultDialog = new ResultDialog();
 
@@ -44,6 +45,7 @@ namespace ST_LINK_MES
         //private readonly LoginWindow loginWindow;
         private ResultDialog resultDialog;
         private readonly STLinkCliPrograrmService stlinkService;
+        private readonly FileRrecordService fileRrecordService;
 
         public string UserId { get; internal set; }
         public string WorkOrder { get; internal set; }
@@ -128,6 +130,7 @@ namespace ST_LINK_MES
                 return;
             }
 
+            fileRrecordService.Start(uxSN.Text);
             var task = new Task(() =>
             {
                 StartProgram(filePath);
@@ -156,6 +159,7 @@ namespace ST_LINK_MES
 
             if (!string.IsNullOrEmpty(result.ErrorMsg))
             {
+                fileRrecordService.Log(result.ErrorMsg);
                 AddTerminalMsg(result.ErrorMsg);
             }
 
@@ -198,6 +202,8 @@ namespace ST_LINK_MES
                     resultDialog.ShowResult(true);
                 });
             }
+
+            fileRrecordService.Complete();
         }
 
         private MesErrorCode GetErrorCode(int step)
@@ -276,6 +282,7 @@ namespace ST_LINK_MES
         private void StlinkService_OnMsgReceviced(string msg)
         {
             AddTerminalMsg(msg);
+            fileRrecordService.Log(msg);
         }
 
         private void AddTerminalMsg(string msg)

+ 4 - 4
ST-LINK_MES/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
-[assembly: AssemblyInformationalVersion("7a70bdc")]
+// [assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyInformationalVersion("9cc0bed")]

+ 1 - 0
ST-LINK_MES/ST-LINK_MES.csproj

@@ -74,6 +74,7 @@
       <DependentUpon>ResultDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Service\AppSettingService.cs" />
+    <Compile Include="Service\FileRrecordService.cs" />
     <Compile Include="Service\STLinkCliWrapService.cs" />
     <Compile Include="Service\STLinkCliPrograrmService.cs" />
     <Page Include="LoginWindow.xaml">

+ 49 - 0
ST-LINK_MES/Service/FileRrecordService.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ST_LINK_MES.Service
+{
+    public class FileRrecordService
+    {
+        private static string LogFolder = "Log";
+        //private string serialNumber;
+        private string fileName;
+
+        private string FilePath
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(fileName))
+                {
+                    return null;
+                }
+
+                return Path.Combine(Directory.GetCurrentDirectory(), LogFolder, fileName);
+            }
+        }
+
+        public void Start(string serialNumber)
+        {
+            fileName = String.Format("{0}_{1}.txt", serialNumber, DateTime.Now.ToString());
+        }
+
+        public void Log(string logString)
+        {
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+            logString += Environment.NewLine;
+            File.AppendAllText(FilePath, logString);
+        }
+
+        public void Complete()
+        {
+            fileName = null;
+        }
+    }
+}