update: 少复制一次

Author: chenxuuu

llcomNext/LLCOM/Models/TerminalObject.cs

@@ -16,13 +16,13 @@ public TerminalObject()
     }
 
     //展示画面变化时的事件
-    public EventHandler<List<List<TerminalBlock>>>? TerminalChangedEvent { get; set; }
+    public EventHandler? TerminalChangedEvent { get; set; }
     private void TerminalChanged()
     {
         if(TerminalChangedEvent is null)
             return;
         //触发更新事件
-        TerminalChangedEvent?.Invoke(this, GetShowLines());
+        TerminalChangedEvent?.Invoke(this, EventArgs.Empty);
     }
 
     //用于存放终端数据的缓存

llcomNext/LLCOM/ViewModels/DataViews/TerminalViewModel.cs

@@ -23,10 +23,10 @@ public TerminalViewModel(Func<Type, ViewModelBase> getService)
 
         TerminalObject.TerminalChangedEvent += (sender, args) =>
         {
-            if(TerminalChangedEvent == null)
+            if(TerminalRefreshEvent == null)
                 return;
             //更新数据
-            TerminalChangedEvent?.Invoke(this, args);
+            TerminalRefreshEvent?.Invoke(this, args);
         };
     }
 
@@ -42,7 +42,7 @@ private async Task Test()
                 TerminalObject.ChangeStyle(random.Next(30,38),random.Next(30,38));
                 TerminalObject.ChangePosition(random.Next(0,TerminalObject.WindowWidth), random.Next(0,TerminalObject.WindowHeight));
                 TerminalObject.AddText([testChars[random.Next(0, testChars.Length)]]); 
-                TerminalChangedEvent?.Invoke(this, TerminalObject.GetShowLines());
+                TerminalRefreshEvent?.Invoke(this, EventArgs.Empty);
             }
             await Task.Delay(1);
         }
@@ -72,5 +72,24 @@ public void ScrollBarChanged(double value)
             TerminalObject.ScrollBarChanged(value);
     }
     //接管更新事件
-    public EventHandler<List<List<TerminalBlock>>>? TerminalChangedEvent;
+    public EventHandler? TerminalRefreshEvent;
+    
+    public List<List<TerminalBlock>> GetShowLines()
+    {
+        lock (TerminalObject)
+        {
+            var newLines = new List<List<TerminalBlock>>();
+            var lines = TerminalObject.GetShowLines();
+            foreach (var line in lines)
+            {
+                var newLine = new List<TerminalBlock>();
+                foreach (var block in line)
+                {
+                    newLine.Add((TerminalBlock)block.Clone());
+                }
+                newLines.Add(newLine);
+            }
+            return newLines;
+        }
+    }
 }

llcomNext/LLCOM/Views/DataViews/TerminalView.axaml.cs

@@ -23,7 +23,6 @@ public partial class TerminalView : UserControl
 {
     private readonly CancellationTokenSource _cts = new CancellationTokenSource();
     private readonly EventWaitHandle _dataChangeWaitHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
-    private readonly List<List<TerminalBlock>> _terminalBlocks = [];
 
     public TerminalView()
     {
@@ -38,7 +37,7 @@ protected override void OnUnloaded(RoutedEventArgs e)
         base.OnUnloaded(e);
         MainArea.PropertyChanged -= MainArea_PropertyChanged;
         Utils.Setting.TerminalChangedEvent -= TerminalChangedEvent;
-        ((TerminalViewModel)DataContext!).TerminalChangedEvent -= TerminalChangedEvent;
+        ((TerminalViewModel)DataContext!).TerminalRefreshEvent -= TerminalRefreshEvent;
         _cts.Cancel();
         _dataChangeWaitHandle.Set();
         Debug.WriteLine("TerminalView unloaded.");
@@ -55,17 +54,11 @@ private void Control_OnLoaded(object? sender, RoutedEventArgs e)
                 _dataChangeWaitHandle.Reset();
                 if(_cts.Token.IsCancellationRequested)
                     break;
-                
-                var tempLines = new List<List<TerminalBlock>>();
-                lock (_terminalBlocks)
-                {
-                    //克隆数据
-                    tempLines.AddRange(CloneAllLines(_terminalBlocks));
-                }
 
                 // 执行更新逻辑
                 Dispatcher.UIThread.Post(() =>
-                {                
+                {         
+                    var tempLines = ((TerminalViewModel)DataContext!).GetShowLines();       
                     //清空文本
                     MainTextBlock.Inlines!.Clear();
                     foreach (var line in tempLines)
@@ -91,7 +84,7 @@ private void Control_OnLoaded(object? sender, RoutedEventArgs e)
         }).Start();
 
         Utils.Setting.TerminalChangedEvent += TerminalChangedEvent;
-        ((TerminalViewModel)DataContext!).TerminalChangedEvent += TerminalChangedEvent;
+        ((TerminalViewModel)DataContext!).TerminalRefreshEvent += TerminalRefreshEvent;
         //加载完触发一次，顺便初始化窗口大小数据
         RefreshWindowSize();
     }
@@ -129,29 +122,8 @@ private void MainScrollBar_OnScroll(object? sender, ScrollEventArgs e)
         ((TerminalViewModel)DataContext!).ScrollBarChanged(e.NewValue);
     }
 
-    private void TerminalChangedEvent(object? sender, List<List<TerminalBlock>> e)
+    private void TerminalRefreshEvent(object? sender, EventArgs e)
     {
-        lock (_terminalBlocks)
-        {
-            _terminalBlocks.Clear();
-            //克隆数据
-            _terminalBlocks.AddRange(CloneAllLines(e));
-        }
         _dataChangeWaitHandle.Set();
     }
-    
-    private List<List<TerminalBlock>> CloneAllLines(List<List<TerminalBlock>> lines)
-    {
-        var newLines = new List<List<TerminalBlock>>();
-        foreach (var line in lines)
-        {
-            var newLine = new List<TerminalBlock>();
-            foreach (var block in line)
-            {
-                newLine.Add((TerminalBlock)block.Clone());
-            }
-            newLines.Add(newLine);
-        }
-        return newLines;
-    }
 }