add: listbox展示数据

Author: chenxuuu

llcomNext/LLCOM/Controls/PacketDataControl.axaml

@@ -3,14 +3,20 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:LLCOM.Controls">
     <Design.PreviewWith>
-        <Grid Width="500">
+        <StackPanel Width="500">
             <controls:PacketDataControl
                 Extra="2025/03/11 - 11:22:33.123"
                 Header="本机 &lt;&lt; 串口1"
                 Hex="11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF"
                 MainColor="{DynamicResource SemiGreen8}"
                 Text="接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123" />
-        </Grid>
+            <controls:PacketDataControl
+                Extra="2025/03/11 - 11:22:33.123"
+                Header="本机 &lt;&lt; 串口1"
+                Hex="44 55 66 77 88 99 00 AA BB CC DD EE FF"
+                MainColor="{DynamicResource SemiGreen8}"
+                Text="接收到的xxx数据123123接" />
+        </StackPanel>
     </Design.PreviewWith>
 
     <Style Selector="controls|PacketDataControl">
@@ -30,12 +36,12 @@
                                 Foreground="{DynamicResource SemiColorHighlight}"
                                 Text="{TemplateBinding Header}" />
                         </Border>
-                        <TextBlock
+                        <SelectableTextBlock
                             Margin="0,2,10,0"
                             HorizontalAlignment="Right"
                             FontSize="12"
                             FontWeight="Bold"
-                            Text="{DynamicResource Extra}" />
+                            Text="{TemplateBinding Extra}" />
                     </Grid>
                     <Border
                         BorderBrush="{TemplateBinding MainColor}"
@@ -44,12 +50,14 @@
                         <StackPanel>
                             <SelectableTextBlock
                                 Margin="5,5,5,0"
+                                Background="Transparent"
                                 FontSize="16"
                                 Foreground="{TemplateBinding MainColor}"
                                 Text="{TemplateBinding Text}"
                                 TextWrapping="Wrap" />
                             <SelectableTextBlock
                                 Margin="5,0,5,3"
+                                Background="Transparent"
                                 FontSize="12"
                                 Foreground="{DynamicResource SemiColorText2}"
                                 Text="{TemplateBinding Hex}"

llcomNext/LLCOM/Models/PacketData.cs

@@ -2,11 +2,24 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Avalonia.Media;
 
 namespace LLCOM.Models;
 
 public class PacketData
 {
+    public PacketData(byte[] data, MessageWay way, string channel, string? extra = null,
+        Encoding? encoding = null, bool readable = true, string? s = null, IBrush? brush = null)
+    {
+        Data = data;
+        Way = way;
+        Channel = channel;
+        Extra = extra ?? Time.ToString("yyyy/MM/dd HH:mm:ss.fff");
+        encoding ??= Encoding.UTF8;
+        String = s ?? GenerateString(Data, encoding, readable);
+        HexString = GenerateHexString(Data);
+    }
+
     /// <summary>
     /// 此包收到的时间
     /// </summary>
@@ -15,12 +28,14 @@ public class PacketData
     /// <summary>
     /// 包内的原始数据
     /// </summary>
-    public byte[] Data { get; set; } = [];
+    public byte[] Data { get; set; }
+
+    public string HexString { get; }
 
     /// <summary>
-    /// 包的额外信息
+    /// 包的额外信息，一般是日期时间的字符串展示
     /// </summary>
-    public string? Extra { get; set; } = null;
+    public string Extra { get; set; }
 
     /// <summary>
     /// 该包的字符串表示
@@ -36,19 +51,36 @@ public class PacketData
     /// 消息通道类型
     /// </summary>
     public string Channel { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 表示该包的方向和通道的字符串
+    /// </summary>
+    public string TagString
+    {
+        get
+        {
+            return Way switch
+            {
+                MessageWay.Unknown => $"{Channel}",
+                MessageWay.Send => $"本机 >> {Channel}",//TODO 多语言支持
+                MessageWay.Receive => $"{Channel} >> 本机",//TODO 多语言支持
+                _ => throw new ArgumentOutOfRangeException()
+            };
+        }
+    }
 
     /// <summary>
     /// 根据Data生成一个十六进制字符串
     /// </summary>
-    public void GenerateHexString()
+    public static string GenerateHexString(byte[] data)
     {
         var sb = new StringBuilder();
-        foreach (var b in Data)
+        foreach (var b in data)
         {
             sb.Append(b.ToString("X2"));
             sb.Append(" ");
         }
-        String = sb.ToString();
+        return sb.ToString();
     }
 
     private static readonly byte[] BDel = "\u2421"u8.ToArray();
@@ -74,26 +106,25 @@ public void GenerateHexString()
     /// </summary>
     /// <param name="encoding">指定的编码</param>
     /// <param name="readable">是否将不可见字符转义为可见字符</param>
-    /// <returns></returns>
-    public void GenerateString(Encoding encoding, bool readable = true)
+    /// <returns>转换后的字符串</returns>
+    public static string GenerateString(byte[] data,Encoding encoding, bool readable = true)
     {
         //非utf8编码就不转义了
         if (!readable || encoding.CodePage != 65001)
         {
-            String = Byte2String(encoding, Data, true);
-            return;
+            return Byte2String(encoding, data, true);
         }
         var temp = new List<byte>();
-        for (int i = 0; i < Data.Length; i++)
+        for (int i = 0; i < data.Length; i++)
         {
-            switch(Data[i])
+            switch(data[i])
             {
                 case 0x00:
                     temp.AddRange(Symbols[0x00]);
                     break;
                 case 0x0d:
                     //遇到成对出现
-                    if(i < Data.Length - 1 && Data[i+1] == 0x0a)
+                    if(i < data.Length - 1 && data[i+1] == 0x0a)
                     {
                         temp.AddRange(Symbols[0x0d]);
                         temp.AddRange(Symbols[0x0a]);
@@ -104,26 +135,26 @@ public void GenerateString(Encoding encoding, bool readable = true)
                     else
                     {
                         temp.AddRange(Symbols[0x0d]);
-                        temp.Add(Data[i]);
+                        temp.Add(data[i]);
                     }
                     break;
                 case 0x0a:
                 case 0x09://tab字符
-                    temp.AddRange(Symbols[Data[i]]);
-                    temp.Add(Data[i]);
+                    temp.AddRange(Symbols[data[i]]);
+                    temp.Add(data[i]);
                     break;
                 default:
                     //普通的字符
-                    if(Data[i] <= 0x1f)
-                        temp.AddRange(Symbols[Data[i]]);
-                    else if (Data[i] == 0x7f)//del
+                    if(data[i] <= 0x1f)
+                        temp.AddRange(Symbols[data[i]]);
+                    else if (data[i] == 0x7f)//del
                         temp.AddRange(BDel);
                     else
-                        temp.Add(Data[i]);
+                        temp.Add(data[i]);
                     break;
             }
         }
-        String = Byte2String(encoding, temp.ToArray());
+        return Byte2String(encoding, temp.ToArray());
     }
 
     /// <summary>

llcomNext/LLCOM/Services/Utils.cs

@@ -11,7 +11,7 @@ namespace LLCOM.Services;
 
 public class Utils
 {
-    private static string? _version = null;
+    private static string? _version = "1.0.0.0";//null;
     /// <summary>
     /// 软件版本
     /// </summary>

llcomNext/LLCOM/ViewModels/DataViews/PacketDataViewModel.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using LLCOM.Models;
 
 namespace LLCOM.ViewModels;
 
@@ -12,6 +15,27 @@ public PacketDataViewModel() {}
     public PacketDataViewModel(Func<Type, ViewModelBase> getService)
     {
         _getService = getService;
+        
+
     }
 
+    [ObservableProperty]
+    private ObservableCollection<PacketData> _packetData =         [
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Send, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Send, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Send, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Send, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Send, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Send, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Send, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Send, "串口1"),
+        new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),
+    ];
 }

llcomNext/LLCOM/ViewModels/MainViewModel.cs

@@ -4,8 +4,11 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Avalonia.Controls.Notifications;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Notification = Ursa.Controls.Notification;
+using WindowNotificationManager = Ursa.Controls.WindowNotificationManager;
 
 namespace LLCOM.ViewModels;
 
@@ -39,13 +42,14 @@ public MainViewModel(Func<Type, ViewModelBase> getService)
         _getService = getService;
         CurrentPage = _getService(typeof(DataPageViewModel));
         CurrentDataPage = _getService(typeof(PacketDataViewModel));
-        
-        Task.Run(async () =>
-        {
-            //检查下是否有新版本吧
-            if (await Services.Utils.CheckUpdate() != null)
-                ShowSettingDot = true;
-        });
+    }
+
+    [RelayCommand]
+    private async Task PageLoaded()
+    {
+        //检查下是否有新版本吧
+        if (await Services.Utils.CheckUpdate() != null)
+            ShowSettingDot = true;
     }
 
     [RelayCommand]

llcomNext/LLCOM/Views/DataViews/PacketDataView.axaml

@@ -5,6 +5,7 @@
     xmlns:controls="clr-namespace:LLCOM.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:u="https://irihi.tech/ursa"
     xmlns:vm="using:LLCOM.ViewModels"
     d:DesignHeight="757"
     d:DesignWidth="762"
@@ -13,20 +14,47 @@
     <Design.DataContext>
         <vm:PacketDataViewModel />
     </Design.DataContext>
-    <ScrollViewer Margin="5,5,10,5">
-        <StackPanel Spacing="5">
-            <PacketDataControl
-                Extra="2025/03/11 - 11:22:33.123"
-                Header="本机 &lt;&lt; 串口1"
-                Hex="11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF"
-                MainColor="{DynamicResource SemiGreen8}"
-                Text="接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123" />
-            <PacketDataControl
-                Extra="2025/03/11 - 11:22:33.123"
-                Header="串口1 &gt;&gt; 本机"
-                Hex="11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF"
-                MainColor="{DynamicResource SemiRed8}"
-                Text="接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123" />
-        </StackPanel>
-    </ScrollViewer>
+    <!-- <ScrollViewer Margin="5,5,10,5"> -->
+    <!--     <StackPanel Spacing="5"> -->
+    <!--  <PacketDataControl  -->
+    <!--  Extra="2025/03/11 - 11:22:33.123"  -->
+    <!--  Header="本机 &lt;&lt; 串口1"  -->
+    <!--  Hex="11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF"  -->
+    <!--  MainColor="{DynamicResource SemiGreen8}"  -->
+    <!--  Text="接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123" />  -->
+    <!--  <PacketDataControl  -->
+    <!--  Extra="2025/03/11 - 11:22:33.123"  -->
+    <!--  Header="串口1 &gt;&gt; 本机"  -->
+    <!--  Hex="11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF11 22 33 44 55 66 77 88 99 00 AA BB CC DD EE FF"  -->
+    <!--  MainColor="{DynamicResource SemiRed8}"  -->
+    <!--  Text="接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123接收到的xxx数据123123" />  -->
+    <!--     </StackPanel> -->
+    <!-- </ScrollViewer> -->
+    <UserControl.Styles>
+        <Style Selector="ListBoxItem">
+            <Setter Property="Padding" Value="0 0 0 5" />
+        </Style>
+        <Style Selector="ListBoxItem:pointerover">
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+        <Style Selector="ListBoxItem:selected">
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+    </UserControl.Styles>
+    <ListBox
+        Margin="5,5,10,5"
+        u:ScrollTo.ButtonTheme="{DynamicResource PrimaryScrollToButton}"
+        u:ScrollTo.Direction="Bottom"
+        ItemsSource="{Binding PacketData}">
+        <ListBox.ItemTemplate>
+            <DataTemplate>
+                <controls:PacketDataControl
+                    Extra="{Binding Extra}"
+                    Header="{Binding TagString}"
+                    Hex="{Binding HexString}"
+                    MainColor="{DynamicResource SemiGreen8}"
+                    Text="{Binding String}" />
+            </DataTemplate>
+        </ListBox.ItemTemplate>
+    </ListBox>
 </UserControl>

llcomNext/LLCOM/Views/MainView.axaml

@@ -9,6 +9,7 @@
     d:DesignHeight="800"
     d:DesignWidth="1200"
     x:DataType="vm:MainViewModel"
+    Loaded="Control_OnLoaded"
     mc:Ignorable="d">
     <Design.DataContext>
         <vm:MainViewModel />

llcomNext/LLCOM/Views/MainView.axaml.cs

@@ -1,6 +1,9 @@
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using LLCOM.ViewModels;
 
 namespace LLCOM.Views;
 
@@ -10,4 +13,9 @@ public MainView()
     {
         InitializeComponent();
     }
+
+    private async void Control_OnLoaded(object? sender, RoutedEventArgs e)
+    {
+        await ((MainViewModel)this.DataContext!).PageLoadedCommand.ExecuteAsync(null);
+    }
 }