Browse Source

1 fix file log error
2. update version

Robert 1 year ago
parent
commit
0db9ef0a35

+ 1 - 1
GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{ShortSha}'
-next-version: 1.0.6
+next-version: 1.0.7
 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.5.0")]
-[assembly: AssemblyVersion("1.0.5.0")]
-[assembly: AssemblyFileVersion("1.0.5.0")]
-[assembly: AssemblyInformationalVersion("3508d8d")]
+// [assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]
+[assembly: AssemblyInformationalVersion("3825d43")]

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

@@ -136,10 +136,16 @@ namespace ST_LINK_MES
                 fileRrecordService.Start(uxSN.Text);
                 var task = new Task(() =>
                 {
+                    //GenericDelegate porgramFunc;
+                    //porgramFunc = () =>
+                    //{
+                    //    StartProgram(filePath);
+                    //};
+                    //this.Dispatcher.BeginInvoke(porgramFunc);
                     StartProgram(filePath);
                 });
+                task.Start();
                 await task;
-                //task.Start();
             }
             catch (Exception error)
             {

+ 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.5.0")]
-[assembly: AssemblyVersion("1.0.5.0")]
-[assembly: AssemblyFileVersion("1.0.5.0")]
-[assembly: AssemblyInformationalVersion("3508d8d")]
+// [assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]
+[assembly: AssemblyInformationalVersion("3825d43")]

+ 4 - 1
ST-LINK_MES/Service/FileRrecordService.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace ST_LINK_MES.Service
 {
@@ -28,7 +29,9 @@ namespace ST_LINK_MES.Service
 
         public void Start(string serialNumber)
         {
-            fileName = String.Format("{0}_{1}.txt", serialNumber, DateTime.Now.ToString());
+            fileName = String.Format("{0}_{1}.txt", serialNumber, DateTime.Now.ToString("yyyyMMddHHmmss"));
+            //MessageBox.Show(FilePath);
+            //File.Create(FilePath);
         }
 
         public void Log(string logString)