Compare commits

..

No commits in common. '909b897064e54d288e4c9c962a432bf4abb5197a' and '78d89060eb6c92302fbfb901c3e804ec6bc9b052' have entirely different histories.

@ -484,8 +484,7 @@ namespace Txgy.FilesWatcher.ViewModels
{ {
timer1.Dispatcher.Invoke(() => timer1.Dispatcher.Invoke(() =>
{ {
if(DataList.Count >= 20) { DataList.Remove(dataList.Last()); } DataList.Add(new FileModel
DataList.Insert(0, new FileModel
{ {
CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"), CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"),
Data = $"{currentT.AddMinutes(-2).ToString("yyyy-MM-dd T HH:mm:ss")}{a}" Data = $"{currentT.AddMinutes(-2).ToString("yyyy-MM-dd T HH:mm:ss")}{a}"
@ -574,11 +573,10 @@ namespace Txgy.FilesWatcher.ViewModels
UploadRealtimeFile.UploadRealtimeFileOnce(filePath, lastLine, WorkAreaId); UploadRealtimeFile.UploadRealtimeFileOnce(filePath, lastLine, WorkAreaId);
timer1.Dispatcher.Invoke(() => timer1.Dispatcher.Invoke(() =>
{ {
if (RealTimeDataList.Count >= 20) { RealTimeDataList.Remove(RealTimeDataList.Last()); } RealTimeDataList.Add(new FileModel
RealTimeDataList.Insert(0, new FileModel
{ {
CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"), CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"),
Data = $"{lastLine},事件上传成功。" Data = $"{DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss")}事件上传成功。"
}); });
}); });
} }
@ -589,8 +587,7 @@ namespace Txgy.FilesWatcher.ViewModels
MQPublish(a, b); MQPublish(a, b);
timer1.Dispatcher.Invoke(() => timer1.Dispatcher.Invoke(() =>
{ {
if (MQTTDataList.Count >= 20) { MQTTDataList.Remove(MQTTDataList.Last()); } MQTTDataList.Add(new FileModel
MQTTDataList.Insert(0, new FileModel
{ {
CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"), CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"),
Data = $"{DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss")}事件上传成功。" Data = $"{DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss")}事件上传成功。"
@ -609,11 +606,10 @@ namespace Txgy.FilesWatcher.ViewModels
{ {
timer1.Dispatcher.Invoke(() => timer1.Dispatcher.Invoke(() =>
{ {
if (PostDataList.Count >= 20) { PostDataList.Remove(PostDataList.Last()); } PostDataList.Add(new FileModel
PostDataList.Insert(0,new FileModel
{ {
CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"), CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"),
Data = $"{lastLine},事件上传成功。" Data = $"{DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss")}事件上传成功。"
}); });
}); });
} }
@ -625,8 +621,7 @@ namespace Txgy.FilesWatcher.ViewModels
MQPublish(a, b); MQPublish(a, b);
timer1.Dispatcher.Invoke(() => timer1.Dispatcher.Invoke(() =>
{ {
if (MQTTDataList.Count >= 20) { MQTTDataList.Remove(MQTTDataList.Last()); } MQTTDataList.Add(new FileModel
MQTTDataList.Insert(0, new FileModel
{ {
CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"), CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"),
Data = $"{DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss")}事件上传成功。" Data = $"{DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss")}事件上传成功。"

Loading…
Cancel
Save