fix: 防止阻塞的方式不停更新ui

Author: chenxuuu

llcomNext/LLCOM/Models/TerminalObject.cs

@@ -42,7 +42,9 @@ private void TerminalChanged()
 
     //可视范围内的宽高
     private int _windowWidth;
+    public int WindowWidth => _windowWidth;
     private int _windowHeight;
+    public int WindowHeight => _windowHeight;
 
     //添加新的一行上去
     private void AddLine()
@@ -262,6 +264,26 @@ public void ChangePosition(int x, int y)
         PositionX = x;
         PositionY = y;
     }
+
+    //TODO)) 仅用于测试
+    public void ChangeStyle(
+        int? foreground = null, 
+        int? background = null, 
+        bool? isBold = null, 
+        bool? isItalic = null, 
+        bool? isUnderLine = null)
+    {
+        if (foreground != null)
+            CurrentState.Foreground = foreground.Value;
+        if (background != null)
+            CurrentState.Background = background.Value;
+        if (isBold != null)
+            CurrentState.IsBold = isBold.Value;
+        if (isItalic != null)
+            CurrentState.IsItalic = isItalic.Value;
+        if (isUnderLine != null)
+            CurrentState.IsUnderLine = isUnderLine.Value;
+    }
 
     /// <summary>
     /// 获取可以显示的行数据

llcomNext/LLCOM/ViewModels/DataViews/TerminalViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using LLCOM.Models;
@@ -30,13 +31,18 @@ public TerminalViewModel(Func<Type, ViewModelBase> getService)
     }
 
     [RelayCommand]
-    private void Test()
+    private async Task Test()
     {
-        TerminalObject.AddText($"中文测试abcdefghijklmnopqrstuvwxyz".ToCharArray());
-        TerminalObject.ChangePosition(1, 0);
-        TerminalObject.AddText($"12345".ToCharArray());
-        
-        TerminalChangedEvent?.Invoke(this, TerminalObject.GetShowLines());
+        var random = new Random();
+        var testChars = "测试Test".ToCharArray();
+        for(int i=0; i<1000; i++)
+        {
+            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());
+            await Task.Delay(1);
+        }
     }
 
     //终端对象，  TODO)) 后续需要为每项操作加锁

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

@@ -20,6 +20,10 @@ namespace LLCOM.Views;
 
 public partial class TerminalView : UserControl
 {
+    private DispatcherTimer _updateTimer;
+    private bool _dataChanged = false;
+    readonly List<List<TerminalBlock>> _terminalBlocks = [];
+    
     public TerminalView()
     {
         InitializeComponent();
@@ -34,11 +38,49 @@ protected override void OnUnloaded(RoutedEventArgs e)
         MainArea.PropertyChanged -= MainArea_PropertyChanged;
         Utils.Setting.TerminalChangedEvent -= TerminalChangedEvent;
         ((TerminalViewModel)DataContext!).TerminalChangedEvent -= TerminalChangedEvent;
+        _updateTimer.Stop();
         Debug.WriteLine("TerminalView unloaded.");
     }
 
     private void Control_OnLoaded(object? sender, RoutedEventArgs e)
     {
+        //搞个定时器来更新UI，防止阻塞
+        _updateTimer = new DispatcherTimer
+        {
+            Interval = TimeSpan.FromMilliseconds(100)
+        };
+        _updateTimer.Tick += (s, e) =>
+        {
+            if (_dataChanged)
+            {
+                lock (_terminalBlocks)
+                {
+                    // 执行更新逻辑
+                    //清空文本
+                    MainTextBlock.Inlines!.Clear();
+                    foreach (var line in _terminalBlocks)
+                    {
+                        foreach (var block in line)
+                        {
+                            //添加块
+                            var run = new Run(block.Text)
+                            {
+                                [!Span.ForegroundProperty] = new Binding(block.ForegroundBindingName) { Source = Utils.Setting },
+                                [!Span.BackgroundProperty] = new Binding(block.BackgroundBindingName) { Source = Utils.Setting },
+                                FontWeight = block.IsBold ? FontWeight.Bold : FontWeight.Normal,
+                                FontStyle = block.IsItalic ? FontStyle.Italic : FontStyle.Normal,
+                                TextDecorations = block.IsUnderLine ? TextDecorations.Underline : null,
+                            };
+                            MainTextBlock.Inlines.Add(run);
+                        }
+                        MainTextBlock.Inlines.Add(new LineBreak());
+                    }
+                }
+                _dataChanged = false; // 重置标记
+            }
+        };
+        _updateTimer.Start();
+        
         Utils.Setting.TerminalChangedEvent += TerminalChangedEvent;
         ((TerminalViewModel)DataContext!).TerminalChangedEvent += TerminalChangedEvent;
         //加载完触发一次，顺便初始化窗口大小数据
@@ -80,27 +122,19 @@ private void MainScrollBar_OnScroll(object? sender, ScrollEventArgs e)
 
     private void TerminalChangedEvent(object? sender, List<List<TerminalBlock>> e)
     {
-        Dispatcher.UIThread.Invoke(() =>
+        lock (_terminalBlocks)
         {
-            //清空文本
-            MainTextBlock.Inlines!.Clear();
+            _terminalBlocks.Clear();
             foreach (var line in e)
             {
+                var newLine = new List<TerminalBlock>();
                 foreach (var block in line)
                 {
-                    //添加块
-                    var run = new Run(block.Text)
-                    {
-                        [!Span.ForegroundProperty] = new Binding(block.ForegroundBindingName) { Source = Utils.Setting },
-                        [!Span.BackgroundProperty] = new Binding(block.BackgroundBindingName) { Source = Utils.Setting },
-                        FontWeight = block.IsBold ? FontWeight.Bold : FontWeight.Normal,
-                        FontStyle = block.IsItalic ? FontStyle.Italic : FontStyle.Normal,
-                        TextDecorations = block.IsUnderLine ? TextDecorations.Underline : null,
-                    };
-                    MainTextBlock.Inlines.Add(run);
+                    newLine.Add((TerminalBlock)block.Clone());
                 }
-                MainTextBlock.Inlines.Add(new LineBreak());
+                _terminalBlocks.Add(newLine);
             }
-        });
+        }
+        _dataChanged = true;
     }
 }