diff --git a/StartServerWPF.Modules.Main/Models/MsEventModel.cs b/StartServerWPF.Modules.Main/Models/MsEventModel.cs index f7e7383..bdf48a3 100644 --- a/StartServerWPF.Modules.Main/Models/MsEventModel.cs +++ b/StartServerWPF.Modules.Main/Models/MsEventModel.cs @@ -24,6 +24,7 @@ namespace StartServerWPF.Modules.Main.Models { this.eventMessage = message; string[] evtS = message.Trim(' ').Split(new char[] { ' ' }); + CurrentTime = DateTime.Now; OriginTime = DateTime.Parse(evtS[0]); EastCoordinate = double.Parse(evtS[2]); NorthCoordinate = double.Parse(evtS[1]); diff --git a/StartServerWPF.Modules.Main/ViewModels/DataProcessViewModel.cs b/StartServerWPF.Modules.Main/ViewModels/DataProcessViewModel.cs index cad0c2a..4da0ba5 100644 --- a/StartServerWPF.Modules.Main/ViewModels/DataProcessViewModel.cs +++ b/StartServerWPF.Modules.Main/ViewModels/DataProcessViewModel.cs @@ -236,7 +236,6 @@ namespace StartServerWPF.Modules.Main.ViewModels MessageBox.Show("内容不能为空", "提示", MessageBoxButton.OK); return; } - var time = (EndSelectedDate.AddSeconds(-EndSelectedDate.Second) - StartSelectedDate.AddSeconds(-StartSelectedDate.Second)); if (time.TotalMinutes < 1) { @@ -245,10 +244,12 @@ namespace StartServerWPF.Modules.Main.ViewModels } DateTime dateTime = StartSelectedDate; string temPath = Path.GetPathRoot(_workareaModel.savepath) + "temPath"; - if (!Directory.Exists(temPath)) + //清除临时文件 + if (Directory.Exists(temPath)) { - Directory.CreateDirectory(temPath); + Directory.Delete(temPath, true); } + Directory.CreateDirectory(temPath); Task.Run(() => { IsBusy = false; @@ -378,11 +379,11 @@ namespace StartServerWPF.Modules.Main.ViewModels Debug.WriteLine($"****数据处理程序退出,{e.ToString()}******************"); IsBusy = true; //处理完成后删除临时文件 - string temPath = Path.GetPathRoot(_workareaModel.savepath) + "temPath"; - if (Directory.Exists(temPath)) - { - Directory.Delete(temPath, true); - } + //string temPath = Path.GetPathRoot(_workareaModel.savepath) + "temPath"; + //if (Directory.Exists(temPath)) + //{ + // Directory.Delete(temPath, true); + //} //解析处理后的事件文件 var fileName = Directory.GetFiles(SavePath, "*.index", SearchOption.AllDirectories); List lines = new List(); diff --git a/StartServerWPF.Modules.Main/Views/DataProcessView.xaml b/StartServerWPF.Modules.Main/Views/DataProcessView.xaml index 1e31030..98b9598 100644 --- a/StartServerWPF.Modules.Main/Views/DataProcessView.xaml +++ b/StartServerWPF.Modules.Main/Views/DataProcessView.xaml @@ -62,8 +62,15 @@