Skip to content

Commit

Permalink
【一、新增功能】
Browse files Browse the repository at this point in the history 
过滤器
选项卡右键支持：关闭、移动、固定操作

【二、优化修复】
修复输入备注时默认值不正确
完善日志系统
点击关闭后鼠标 arrow
获得焦点的时候不滚动
去掉2 个设置项：搜索时滚动、停止搜索后不滚动
去掉固定时提示关闭搜索
超大报文挂机，内存泄漏问题
menuitem 切换皮肤时未切换
优化 Tilte 菜单栏
  • Loading branch information
SuperStudio committed Feb 5, 2023
1 parent bb9a22f commit 31a3c0b
Show file tree
Hide file tree
Showing 23 changed files with 677 additions and 387 deletions.
54 changes: 44 additions & 10 deletions SuperCom/App.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using SuperControls.Style.Windows;
using SuperCom.Log;
using SuperCom.WatchDog;
using SuperControls.Style.Windows;
using System;
using System.Collections.Generic;
using System.Configuration;
Expand All @@ -14,15 +16,37 @@ namespace SuperCom
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
///

public partial class App : Application
{
private static bool Error { get; set; }

public static Logger Logger = Logger.Instance;
private static MemoryDog memoryDog { get; set; }

public static Action OnMemoryDog;
public static Action<long> OnMemoryChanged;

static App()
{
memoryDog = new MemoryDog();
memoryDog.OnNotFeed += () =>
{
OnMemoryDog?.Invoke();
};
memoryDog.OnMemoryChanged += (memory) =>
{
OnMemoryChanged?.Invoke(memory);
};
}

protected override void OnStartup(StartupEventArgs e)
{
// UI线程未捕获异常处理事件
//#if DEBUG
#if DEBUG

//#else
#else
this.DispatcherUnhandledException += new DispatcherUnhandledExceptionEventHandler(App_DispatcherUnhandledException);

// Task线程内未捕获异常处理事件
Expand All @@ -31,17 +55,25 @@ protected override void OnStartup(StartupEventArgs e)
// 非UI线程未捕获异常处理事件
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);

//#endif
#endif
// 看门狗
memoryDog.Watch();
base.OnStartup(e);
}

void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
{
try
{
if (Error)
return;
Error = true;
Window_ErrorMsg window_ErrorMsg = new Window_ErrorMsg();
window_ErrorMsg.SetError(e.Exception.ToString());
string error = e.Exception.ToString();
Logger.Error(error);
window_ErrorMsg.SetError(error);
window_ErrorMsg.ShowDialog();

}
catch (Exception ex)
{
Expand All @@ -59,11 +91,13 @@ void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs

try
{
StringBuilder builder = new StringBuilder();
if (e.IsTerminating)
if (e.IsTerminating && !Error)
{
Error = true;
Window_ErrorMsg window_ErrorMsg = new Window_ErrorMsg();
window_ErrorMsg.SetError(e.ExceptionObject.ToString());
string error = e.ExceptionObject.ToString();
Logger.Error(error);
window_ErrorMsg.SetError(error);
window_ErrorMsg.ShowDialog();
}
}
Expand All @@ -81,8 +115,8 @@ void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs
void TaskScheduler_UnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
{
// task线程内未处理捕获
Console.WriteLine(e.Exception.StackTrace);
Console.WriteLine(e.Exception.Message);
Logger.Error(e.Exception.StackTrace);
Logger.Error(e.Exception.Message);
e.SetObserved(); // 设置该异常已察觉（这样处理后就不会引起程序崩溃）
}
}
Expand Down
2 changes: 1 addition & 1 deletion SuperCom/Config/ConfigManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public static class ConfigManager
{
public const string SQLITE_DATA_PATH = "user_data.sqlite";

public const string RELEASE_DATE = "2023-01-17";
public const string RELEASE_DATE = "2023-02-05";
public static Main Main { get; set; }
public static CommonSettings CommonSettings { get; set; }
public static Settings Settings { get; set; }
Expand Down
3 changes: 3 additions & 0 deletions SuperCom/Config/Settings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class Settings : AbstractConfig
{

private const int DEFAULT_LOG_FRAG_SIZE = 40; // MB
private const int DEFAULT_MEMORY_LIMIT = 1024; // MB
private Settings() : base(ConfigManager.SQLITE_DATA_PATH, $"WindowConfig.Settings")
{
Width = SystemParameters.WorkArea.Width * 0.7;
Expand All @@ -17,6 +18,7 @@ private Settings() : base(ConfigManager.SQLITE_DATA_PATH, $"WindowConfig.Setting
AutoBackup = true;
EnabledLogFrag = true;
LogFragSize = DEFAULT_LOG_FRAG_SIZE;
MemoryLimit = DEFAULT_MEMORY_LIMIT;
}

public static List<int> BackUpPeriods = new List<int> { 1, 3, 7, 15, 30 };
Expand Down Expand Up @@ -47,6 +49,7 @@ public static Settings CreateInstance()
public long RemoteIndex { get; set; }
public bool EnabledLogFrag { get; set; }
public long LogFragSize { get; set; }
public long MemoryLimit { get; set; }

}
}
2 changes: 1 addition & 1 deletion SuperCom/Entity/ComSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static void InitSqlite()
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
App.Logger.Error(ex.Message);
}
}
}
Expand Down
47 changes: 37 additions & 10 deletions SuperCom/Entity/PortTabItem.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

using ICSharpCode.AvalonEdit;
using ICSharpCode.AvalonEdit.Highlighting;
using SuperCom.Config;
using SuperCom.Config.WindowConfig;
using SuperUtils.Common;
Expand Down Expand Up @@ -98,7 +99,6 @@ public string WriteData
set { _WriteData = value; RaisePropertyChanged(); }
}

private StringBuilder Builder { get; set; }
public TextEditor TextEditor { get; set; }

private bool _AddTimeStamp = true;
Expand Down Expand Up @@ -126,7 +126,7 @@ public bool EnabledMonitor
}


public UInt64 CurrentCharSize { get; set; }
public double CurrentCharSize { get; set; }

private long _RX = 0L;
public long RX
Expand Down Expand Up @@ -195,14 +195,37 @@ public bool Pinned
get { return _Pinned; }
set { _Pinned = value; RaisePropertyChanged(); }
}
private bool _FixedText;
public bool FixedText
{
get { return _FixedText; }
set
{
_FixedText = value;
RaisePropertyChanged();
if (TextEditor != null)
{
if (value)
TextEditor.TextChanged -= TextBox_TextChanged;
else
TextEditor.TextChanged += TextBox_TextChanged;
}
}
}


public void TextBox_TextChanged(object sender, EventArgs e)
{
TextEditor textEditor = sender as TextEditor;
textEditor?.ScrollToEnd();
}

public bool RunningCommands { get; set; }

public Queue<ResultCheck> ResultChecks { get; set; }

public void ClearData()
{
Builder.Clear();
FirstSaveData = true;
}

Expand Down Expand Up @@ -397,7 +420,7 @@ public bool IsInFilterRule(string line)
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
App.Logger.Error(ex.Message);
continue;
}

Expand Down Expand Up @@ -509,7 +532,11 @@ public void SepFile()
if (ConfigManager.Settings.EnabledLogFrag)
{
//if (CurrentCharSize >= 4096)
if (CurrentCharSize / 1024 >= (UInt64)ConfigManager.Settings.LogFragSize)
#if DEBUG
if (CurrentCharSize / 1024 / 1024 >= (UInt64)ConfigManager.Settings.LogFragSize)
#else
if (CurrentCharSize / 1024 / 1024 >= (UInt64)ConfigManager.Settings.LogFragSize)
#endif
{
CurrentCharSize = 0;
ConnectTime = DateTime.Now;
Expand All @@ -533,14 +560,15 @@ public void SepFile()
}

public bool FirstSaveData;
private StringBuilder builder = new StringBuilder();
public void SaveData(string line)
{
RX += line.Length;
RX += Encoding.UTF8.GetByteCount(line); // todo
string value = line.Replace("\0", "\\0");
if (AddTimeStamp)
{
// 遍历字符串
StringBuilder builder = new StringBuilder();
builder.Clear();
// 一次遍历效率最高，使用 indexof 还额外多遍历几次
char c;
for (int i = 0; i < value.Length; i++)
Expand All @@ -567,7 +595,7 @@ public void SaveData(string line)
}
value = builder.ToString();
}
CurrentCharSize += (UInt64)value.Length * sizeof(char);
CurrentCharSize += Encoding.UTF8.GetByteCount(value);
MonitorLine(value);
FilterLine(value); // 过滤器
SepFile();
Expand All @@ -578,7 +606,7 @@ public void SaveData(string line)
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
App.Logger.Error(ex.Message);
}
}

Expand All @@ -590,7 +618,6 @@ public PortTabItem(string name, bool connected)
Name = name;
Connected = connected;
Setting = new PortSetting();
Builder = new StringBuilder();
SaveFileName = GetSaveFileName();
}
}
Expand Down
14 changes: 7 additions & 7 deletions SuperCom/Entity/VirtualPort.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ await Task.Run(() =>
result.Add(port);
}, null, (ex) =>
{
Console.WriteLine(ex.Message);
App.Logger.Error(ex.Message);
}, () =>
{
completed = true;
Expand Down Expand Up @@ -140,13 +140,13 @@ await Task.Run(() =>
{
CmdHelper.Run($"cmd.exe", cmdParam, (output) =>
{
Console.WriteLine(output);
App.Logger.Info(output);
if (output.IndexOf("logged as \"in use\"") >= 0)
count++;
completed = count == 2;
}, null, (ex) =>
{
Console.WriteLine(ex.Message);
App.Logger.Error(ex.Message);
});
});
// 超时
Expand Down Expand Up @@ -177,14 +177,14 @@ await Task.Run(() =>
{
CmdHelper.Run($"cmd.exe", cmdParam, (output) =>
{
Console.WriteLine(output);
App.Logger.Info(output);
if (output.IndexOf($"Removed CNCA{n}") >= 0 ||
output.IndexOf($"Removed CNCB{n}") >= 0)
count++;
completed = count == 2;
}, null, (ex) =>
{
Console.WriteLine(ex.Message);
App.Logger.Error(ex.Message);
completed = true;
});
});
Expand All @@ -211,12 +211,12 @@ public static async Task<bool> UpdatePorts(List<VirtualPort> ports)
foreach (VirtualPort port in ports)
{
string cmdParam = $"/C cd /d \"{AppDir}\" && setupc.exe change {port.ID} {port.ToUpdateString()}";
Console.WriteLine(cmdParam);
App.Logger.Info($"执行命令：{cmdParam}");
await Task.Run(() =>
{
CmdHelper.Run($"cmd.exe", cmdParam, (output) =>
{
Console.WriteLine(output);
App.Logger.Info(output);
if (output.IndexOf($"Restarted {port.ID}") >= 0)
completed = true;
});
Expand Down
2 changes: 1 addition & 1 deletion SuperCom/Lang/LangManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static bool SetLang(string lang)
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
App.Logger.Error(ex.Message);
return false;
}
}
Expand Down
10 changes: 8 additions & 2 deletions SuperCom/Log/Logger.cs
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
using SuperUtils.Framework.Logger;
using SuperUtils.IO;
using SuperUtils.Time;
using System;
using System.IO;

namespace SuperCom.Log
{
public class Logger : AbstractLogger
{
public static string FilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "app.log");
private static string LogDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "app_logs");
private static string LogFilePath = Path.Combine(LogDir, "app.log");
private Logger() { }

public static Logger Instance { get; }

static Logger()
{
Instance = new Logger();
Instance.LogLevel = AbstractLogger.Level.Info;
if (!Directory.Exists(LogDir))
DirHelper.TryCreateDirectory(LogDir);
LogFilePath = Path.Combine(LogDir, $"{DateHelper.NowDate()}.log");
}

public override void LogPrint(string str)
{
Console.WriteLine(str);
FileHelper.TryAppendToFile(FilePath, str);
FileHelper.TryAppendToFile(LogFilePath, str, System.Text.Encoding.UTF8);
}
}
}
Loading

0 comments on commit 31a3c0b

Please sign in to comment.