增加对收发数据显示长度的限制，防止因过长而卡死软件

增加对收发数量条目数显示的限制，超过500条自动清空
去除是否保存串口日志的选项，强制保存日志
收发串口数据后，再新建日志文件

Author: chenxuuu

changlog/autoUpdate.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-    <version>1.0.1.5</version>
-    <url>https://llcom.papapoi.com/update/1.0.1.5.zip</url>
-    <changelog>https://llcom.papapoi.com/changelog/1.0.1.5.html</changelog>
+    <version>1.0.1.6</version>
+    <url>https://llcom.papapoi.com/update/1.0.1.6.zip</url>
+    <changelog>https://llcom.papapoi.com/changelog/1.0.1.6.html</changelog>
     <mandatory mode="1">true</mandatory>
 </item>

changlog/index.html

@@ -8,10 +8,21 @@
 
 > 欢迎加入交流群：`906307487`
 
+## LLCOM 1.0.1.6
+
+- 增加对收发数据显示长度的限制，防止因过长而卡死软件
+- 增加对收发数量条目数显示的限制，超过500条自动清空
+- 去除是否保存串口日志的选项，强制保存日志
+- 收发串口数据后，再新建日志文件，不会一开软件就创建日志文件了
+
+---
+
 ## LLCOM 1.0.1.5
 
 - .net framework 框架版本需求降低为4.5，照顾没升级的用户
 
+---
+
 ## LLCOM 1.0.1.4
 
 - **重要：** 更正遗留的定时器处理逻辑错误问题

llcom/MainWindow.xaml.cs

@@ -1,4 +1,4 @@
-using FontAwesome.WPF;
+using FontAwesome.WPF;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Highlighting.Xshd;
 using ICSharpCode.AvalonEdit.Search;
@@ -313,8 +313,13 @@ private void addUartLog(byte[] data, bool send)
             text.Foreground = Brushes.Black;
             text.FontWeight = FontWeights.Bold;
             p.Inlines.Add(text);
+            
+            if (data.Length > 2000)
+                text = new Span(new Run(Tools.Global.Byte2String(data.Skip(0).Take(2000).ToArray())
+                    +"\r\n数据过长，剩余部分请去日志文件查看"));
+            else
+                text = new Span(new Run(Tools.Global.Byte2String(data)));
 
-            text = new Span(new Run(Tools.Global.Byte2String(data)));
             if (send)
                 text.Foreground = Brushes.DarkRed;
             else
@@ -328,14 +333,26 @@ private void addUartLog(byte[] data, bool send)
 
             if (Tools.Global.setting.showHex)
             {
-                p = new Paragraph(new Run("HEX:" + Tools.Global.Byte2Hex(data," ")));
+                if (data.Length > 600)
+                    p = new Paragraph(new Run("HEX:" + Tools.Global.Byte2Hex(data.Skip(0).Take(600).ToArray(), " ")
+                    + "\r\n数据过长，剩余部分请去日志文件查看"));
+                else
+                    p = new Paragraph(new Run("HEX:" + Tools.Global.Byte2Hex(data, " ")));
+
                 if (send)
                     p.Foreground = Brushes.LightPink;
                 else
                     p.Foreground = Brushes.LightGreen;
                 p.Margin = new Thickness(0, 0, 0, 8);
                 uartDataFlowDocument.Document.Blocks.Add(p);
             }
+            
+            //条目过多，自动清空
+            if(uartDataFlowDocument.Document.Blocks.Count > 500)
+            {
+                uartDataFlowDocument.Document.Blocks.Clear();
+                addUartLog(Tools.Global.Hex2Byte(Tools.Global.String2Hex("数据量过大，自动清理，请去日志文件查看历史数据","")), true);
+            }
 
             sv.ScrollToBottom();
         }

llcom/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.5")]
-[assembly: AssemblyFileVersion("1.0.1.5")]
+[assembly: AssemblyVersion("1.0.1.6")]
+[assembly: AssemblyFileVersion("1.0.1.6")]
 [assembly: NeutralResourcesLanguage("zh-CN")]
 

llcom/SettingWindow.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="llcom.SettingWindow"
+<Window x:Class="llcom.SettingWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -16,7 +16,8 @@
             <TabItem Header="串口基本设置">
                 <StackPanel Margin="10,5,0,0" >
                     <CheckBox Content="自动恢复被断开的串口连接" Margin="5" IsChecked="{Binding autoReconnect}"/>
-                    <CheckBox Content="自动保存串口收发日志" Margin="5" IsChecked="{Binding autoSaveLog}"/>
+                    <!--<CheckBox Content="自动保存串口收发日志" Margin="5" IsChecked="{Binding autoSaveLog}"/>-->
+                    <Button Name="OpenLogButton" Content="打开串口收发日志目录" Click="OpenLogButton_Click" Margin="5"/>
                     <CheckBox Content="串口数据窗口显示HEX值" Margin="5" IsChecked="{Binding showHex}"/>
                     <CheckBox Content="窗口保持置顶显示" Margin="5" IsChecked="{Binding topmost}"/>
                     <WrapPanel Margin="5">

llcom/SettingWindow.xaml.cs

@@ -1,4 +1,4 @@
-using ICSharpCode.AvalonEdit.Highlighting;
+using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Highlighting.Xshd;
 using ICSharpCode.AvalonEdit.Search;
 using System;
@@ -260,5 +260,10 @@ private void SettingsButton_Click(object sender, RoutedEventArgs e)
             string path = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).FilePath;
             System.Diagnostics.Process.Start("explorer.exe", path.Substring(0,path.Length-11));
         }
+
+        private void OpenLogButton_Click(object sender, RoutedEventArgs e)
+        {
+            System.Diagnostics.Process.Start("explorer.exe", "logs");
+        }
     }
 }

llcom/Tools/Global.cs

@@ -1,4 +1,4 @@
-using LibUsbDotNet;
+using LibUsbDotNet;
 using LibUsbDotNet.Main;
 using System;
 using System.Collections.Generic;
@@ -53,7 +53,6 @@ public static void Initial()
             setting = new Model.Settings();
             Model.Settings.UpdateQuickSend();
 
-            Logger.InitUartLog();
             uart.Init();
             uart.serial.BaudRate = setting.baudRate;
             uart.serial.Parity = (Parity)setting.parity;

llcom/Tools/Logger.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -27,6 +27,8 @@ public static void InitUartLog()
         /// <param name="l"></param>
         public static void AddUartLog(string l)
         {
+            if (uartLogFile == "")
+                InitUartLog();
             try
             {
                 File.AppendAllText(uartLogFile, DateTime.Now.ToString("[yyyy-MM-dd HH:mm:ss:ffff]") + l + "\r\n");