add: 分包数据自动滚动逻辑

Author: chenxuuu

llcomNext/LLCOM/Services/Utils.cs

@@ -6,6 +6,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using LLCOM.Models;
 using RestSharp;
 
 namespace LLCOM.Services;
@@ -36,7 +37,15 @@ private static string InitializeAppPath()
         return appPath;
     }
 
+    /// <summary>
+    /// 全局设置
+    /// </summary>
     public static Setting Setting = null!;
+
+    /// <summary>
+    /// 添加数据包到分包数据界面
+    /// </summary>
+    public static Action<PackData> AddPacketDataAction = null!;
 
     /// <summary>
     /// 启动软件时的初始化操作

llcomNext/LLCOM/ViewModels/DataViews/PacketDataViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using LLCOM.Models;
 
 namespace LLCOM.ViewModels;
@@ -17,41 +18,32 @@ public PacketDataViewModel(Func<Type, ViewModelBase> getService)
     {
         _getService = getService;
 
-        Task.Run(async () =>
+        //添加数据包到分包数据界面的操作
+        Services.Utils.AddPacketDataAction = data =>
         {
-            for(int i=0; i<100; i++)
-            {
-                await Task.Delay(100);
-                for(int j=0; j<100; j++)
-                {
-                    PacketData.Add(new ("0123"u8.ToArray(), MessageWay.Send, "串口1"));
-                    PacketData.Add(new ("0123"u8.ToArray(), MessageWay.Receive, "串口1"));
-                }
-            }
-        });
+            lock (PacketData)
+                PacketData.Add(data);
+            if(AutoScroll)
+                ScrollToBottomAction?.Invoke();
+        };
     }
 
     [ObservableProperty]
-    private ObservableCollection<PackData> _packetData =         [
-        new ([], MessageWay.Unknown, "MQTT1",null,null,true,"已连接"),
-        new ("0123"u8.ToArray(), MessageWay.Send, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Receive, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Receive, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Send, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Receive, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Send, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Receive, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Send, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Receive, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Send, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Receive, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Send, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Receive, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Send, "串口1"),
-        new ("0123"u8.ToArray(), MessageWay.Receive, "串口1"),
-    ];
+    private ObservableCollection<PackData> _packetData = [];
 
     //自动滚到底部
     [ObservableProperty]
     private bool _autoScroll = true;
+    
+    public Action? ScrollToBottomAction { get; set; }
+    
+    [RelayCommand]
+    private async Task ClearPacketData()
+    {
+        await Task.Run(() =>
+        {
+            lock (PacketData)
+                PacketData.Clear();
+        });
+    }
 }

llcomNext/LLCOM/Views/DataViews/PacketDataView.axaml

@@ -10,6 +10,7 @@
     d:DesignHeight="757"
     d:DesignWidth="762"
     x:DataType="vm:PacketDataViewModel"
+    Loaded="Control_OnLoaded"
     mc:Ignorable="d">
     <Design.DataContext>
         <vm:PacketDataViewModel />
@@ -44,6 +45,7 @@
     </UserControl.Styles>
     <Grid RowDefinitions="auto *">
         <ListBox
+            Name="MainListBox"
             Grid.Row="1"
             Margin="0,5"
             u:ScrollTo.ButtonTheme="{DynamicResource PrimaryScrollToButton}"
@@ -98,7 +100,7 @@
                     VerticalAlignment="Center"
                     Content="自动滚动"
                     IsChecked="{Binding AutoScroll}" />
-                <Button Content="清空数据" />
+                <Button Command="{Binding ClearPacketDataCommand}" Content="清空数据" />
             </StackPanel>
         </Border>
     </Grid>

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

@@ -1,13 +1,46 @@
-using Avalonia;
+using System;
+using System.Linq;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+using LLCOM.ViewModels;
 
 namespace LLCOM.Views;
 
 public partial class PacketDataView : UserControl
 {
+    
     public PacketDataView()
     {
         InitializeComponent();
     }
+
+    private bool _needScrollToBottom = false;
+    private void Control_OnLoaded(object? sender, RoutedEventArgs e)
+    {
+        if (DataContext is PacketDataViewModel vm)
+            vm.ScrollToBottomAction = () => _needScrollToBottom = true;
+        
+        
+        //开一个定时器，定时检查是否需要滚动到底部
+        DispatcherTimer timer = new()
+        {
+            Interval = TimeSpan.FromMilliseconds(100)
+        };
+        timer.Tick += (_, args) =>
+        {
+            if (_needScrollToBottom)
+            {
+                Dispatcher.UIThread.Post(() =>
+                {
+                    if (MainListBox.ItemCount > 0)
+                        MainListBox.ScrollIntoView(MainListBox.ItemCount - 1);
+                }, DispatcherPriority.Background);
+                _needScrollToBottom = false;
+            }
+        };
+        timer.Start();
+    }
 }