Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-10-13 20:09:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update MsgViewModel.cs

Browse source
This commit is contained in:
xujie86 2025-09-25 06:56:42 +08:00 committed by GitHub
parent f9f45d7c53
commit 6d45efc9e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
View file

@ -10,12 +10,15 @@ namespace ServiceLib.ViewModels;
public class MsgViewModel : MyReactiveObject public class MsgViewModel : MyReactiveObject
{ {
private readonly ConcurrentQueue<string> _queueMsg = new(); private readonly ConcurrentQueue<string> _queueMsg = new();
private readonly int _numMaxMsg = 500; private readonly int _numMaxMsg = 500; // 仅用于限制队列，不做显示裁剪
private bool _lastMsgFilterNotAvailable; private bool _lastMsgFilterNotAvailable;
private bool _blLockShow = false; private bool _blLockShow = false;
[Reactive] public string MsgFilter { get; set; } [Reactive]
[Reactive] public bool AutoRefresh { get; set; } public string MsgFilter { get; set; }
[Reactive]
public bool AutoRefresh { get; set; }
public MsgViewModel(Func<EViewAction, object?, Task<bool>>? updateView) public MsgViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
{ {
@ -35,7 +38,7 @@ public class MsgViewModel : MyReactiveObject
private async Task AppendQueueMsg(string msg) private async Task AppendQueueMsg(string msg)
{ {
if (!AutoRefresh) return; if (AutoRefresh == false) return;
await EnqueueQueueMsg(msg); await EnqueueQueueMsg(msg);
if (_blLockShow || !_config.UiItem.ShowInTaskbar) return; if (_blLockShow || !_config.UiItem.ShowInTaskbar) return;
@ -43,13 +46,15 @@ public class MsgViewModel : MyReactiveObject
await Task.Delay(500); await Task.Delay(500);
var sb = new StringBuilder(); var sbDelta = new StringBuilder();
while (_queueMsg.TryDequeue(out var line)) while (_queueMsg.TryDequeue(out var line))
{ {
sb.Append(line); sbDelta.Append(line);
} }
if (sb.Length > 0)
await _updateView?.Invoke(EViewAction.DispatcherShowMsg, sb.ToString()); var delta = sbDelta.ToString();
if (delta.Length > 0)
await _updateView?.Invoke(EViewAction.DispatcherShowMsg, delta);
_blLockShow = false; _blLockShow = false;
} }
@ -69,11 +74,8 @@ public class MsgViewModel : MyReactiveObject
} }
} }
if (_queueMsg.Count > _numMaxMsg) while (_queueMsg.Count > _numMaxMsg)
{ _queueMsg.TryDequeue(out _);
for (int k = 0; k < _queueMsg.Count - _numMaxMsg; k++)
_queueMsg.TryDequeue(out _);
}
_queueMsg.Enqueue(msg); _queueMsg.Enqueue(msg);
if (!msg.EndsWith(Environment.NewLine)) if (!msg.EndsWith(Environment.NewLine))