add: 包样式全部可设置

chenxuuu · chenxuuu · commit b5404d3681a6 · 2025-04-02T09:30:34.000+08:00
diff --git a/llcomNext/LLCOM/Controls/PacketDataControl.axaml b/llcomNext/LLCOM/Controls/PacketDataControl.axaml
@@ -32,8 +32,8 @@
             </Border>
 
             <controls:PacketDataControl
+                DataFontFamily="Consolas"
                 Extra="2025/03/11 - 11:22:33.123"
-                FontFamily="Consolas"
                 Header="串口1"
                 Hex="44 55 66 77 88 99 00 AA BB CC DD EE FF"
                 Icon="&#xE02E;"
@@ -87,9 +87,10 @@
                                     FontFamily="{DynamicResource Phosphor}"
                                     FontSize="12"
                                     Text="{TemplateBinding Icon}" />
-                                <TextBlock Text="{TemplateBinding Header}" />
+                                <TextBlock FontFamily="{TemplateBinding HeaderFontFamily}" Text="{TemplateBinding Header}" />
                                 <TextBlock
                                     VerticalAlignment="Center"
+                                    FontFamily="{TemplateBinding ExtraFontFamily}"
                                     FontSize="12"
                                     FontWeight="Bold"
                                     Text="{TemplateBinding Extra}" />
@@ -106,6 +107,7 @@
                                     <SelectableTextBlock
                                         VerticalAlignment="Center"
                                         Background="Transparent"
+                                        FontFamily="{TemplateBinding ExtraFontFamily}"
                                         FontSize="12"
                                         FontWeight="Bold"
                                         Text="{TemplateBinding Extra}"
@@ -118,28 +120,30 @@
                                         Text="{TemplateBinding Icon}" />
                                     <TextBlock
                                         VerticalAlignment="Center"
+                                        FontFamily="{TemplateBinding HeaderFontFamily}"
                                         FontSize="12"
                                         Foreground="{TemplateBinding MainColor}"
                                         Text="{TemplateBinding Header}" />
                                 </StackPanel>
                                 <SelectableTextBlock
                                     Background="Transparent"
-                                    FontFamily="{TemplateBinding FontFamily}"
+                                    FontFamily="{TemplateBinding DataFontFamily}"
                                     FontSize="16"
                                     Foreground="{TemplateBinding MainColor}"
                                     IsVisible="{Binding ShowString, RelativeSource={RelativeSource TemplatedParent}}"
                                     Text="{TemplateBinding Text}"
                                     TextWrapping="Wrap" />
                                 <SelectableTextBlock
                                     Background="Transparent"
-                                    FontFamily="{TemplateBinding FontFamily}"
+                                    FontFamily="{TemplateBinding DataFontFamily}"
                                     FontSize="16"
                                     Foreground="{TemplateBinding MainColor}"
                                     IsVisible="{Binding !ShowString, RelativeSource={RelativeSource TemplatedParent}}"
                                     Text="{TemplateBinding Hex}"
                                     TextWrapping="Wrap" />
                                 <SelectableTextBlock
                                     Background="Transparent"
+                                    FontFamily="{TemplateBinding HexFontFamily}"
                                     FontSize="10"
                                     Foreground="{DynamicResource SemiColorText2}"
                                     IsVisible="{TemplateBinding ShowHex}"
@@ -166,6 +170,7 @@
                                     Text="{TemplateBinding Icon}" />
                                 <TextBlock
                                     VerticalAlignment="Center"
+                                    FontFamily="{TemplateBinding HeaderFontFamily}"
                                     FontSize="12"
                                     Foreground="{DynamicResource SemiColorHighlight}"
                                     Text="{TemplateBinding Header}" />
@@ -175,6 +180,7 @@
                             Margin="0,0,10,0"
                             HorizontalAlignment="Right"
                             VerticalAlignment="Center"
+                            FontFamily="{TemplateBinding ExtraFontFamily}"
                             FontSize="12"
                             FontWeight="Bold"
                             Text="{TemplateBinding Extra}" />
diff --git a/llcomNext/LLCOM/Controls/PacketDataControl.axaml.cs b/llcomNext/LLCOM/Controls/PacketDataControl.axaml.cs
@@ -91,13 +91,39 @@ public bool? PureText
         set => SetValue(PureTextProperty, value);
     }
     
-    public static readonly StyledProperty<FontFamily?> FontFamilyProperty = 
-        AvaloniaProperty.Register<PacketDataControl, FontFamily?>(nameof(FontFamily));
-    public FontFamily? FontFamily
+    public static readonly StyledProperty<FontFamily?> DataFontFamilyProperty = 
+        AvaloniaProperty.Register<PacketDataControl, FontFamily?>(nameof(DataFontFamily));
+    public FontFamily? DataFontFamily
     {
-        get => GetValue(FontFamilyProperty);
-        set => SetValue(FontFamilyProperty, value);
+        get => GetValue(DataFontFamilyProperty);
+        set => SetValue(DataFontFamilyProperty, value);
     }
+    
+    public static readonly StyledProperty<FontFamily?> HexFontFamilyProperty = 
+        AvaloniaProperty.Register<PacketDataControl, FontFamily?>(nameof(HexFontFamily));
+    public FontFamily? HexFontFamily
+    {
+        get => GetValue(HexFontFamilyProperty);
+        set => SetValue(HexFontFamilyProperty, value);
+    }
+    
+    public static readonly StyledProperty<FontFamily?> HeaderFontFamilyProperty = 
+        AvaloniaProperty.Register<PacketDataControl, FontFamily?>(nameof(HeaderFontFamily));
+    public FontFamily? HeaderFontFamily
+    {
+        get => GetValue(HeaderFontFamilyProperty);
+        set => SetValue(HeaderFontFamilyProperty, value);
+    }
+    
+    public static readonly StyledProperty<FontFamily?> ExtraFontFamilyProperty = 
+        AvaloniaProperty.Register<PacketDataControl, FontFamily?>(nameof(ExtraFontFamily));
+    public FontFamily? ExtraFontFamily
+    {
+        get => GetValue(ExtraFontFamilyProperty);
+        set => SetValue(ExtraFontFamilyProperty, value);
+    }
+    
+    
 
     public PacketDataControl()
     {
diff --git a/llcomNext/LLCOM/Services/Setting.cs b/llcomNext/LLCOM/Services/Setting.cs
@@ -38,40 +38,102 @@ public partial class Setting : ObservableObject
     public bool IsShowHexSmall => IsHexMode is null;
     
     //分包数据的字体
+    ///////////数据包的字体
+    public FontFamily? PacketFontFamily
+    {
+        get
+        {
+            if(string.IsNullOrEmpty(PacketFont))
+                PacketFont = Utils.CheckFontName(PacketFont);
+            return PacketFont;
+        }
+        set
+        {
+            if (value is null)
+                return;
+            PacketFont = value.Name;
+            OnPropertyChanged();
+        }
+    }
+    //字体名称
     [ObservableProperty]
-    private FontFamily _packetFontFamily;
-    
-    //分包数据的字体名称
     private string _packetFont = Database.Get(nameof(PacketFont), "").Result;
-    public string PacketFont => _packetFont;
+    //////////Hex小字的字体
+    public FontFamily? PacketHexFontFamily
+    {
+        get
+        {
+            if(string.IsNullOrEmpty(PacketHexFont))
+                PacketHexFont = Utils.CheckFontName(PacketHexFont);
+            return PacketHexFont;
+        }
+        set
+        {
+            if (value is null)
+                return;
+            PacketHexFont = value.Name;
+            OnPropertyChanged();
+        }
+    }
+    //字体名称
+    [ObservableProperty]
+    private string _packetHexFont = Database.Get(nameof(PacketHexFont), "").Result;
+    //////////标题头的字体
+    public FontFamily? PacketHeaderFontFamily
+    {
+        get
+        {
+            if(string.IsNullOrEmpty(PacketHeaderFont))
+                PacketHeaderFont = Utils.CheckFontName(PacketHeaderFont);
+            return PacketHeaderFont;
+        }
+        set
+        {
+            if (value is null)
+                return;
+            PacketHeaderFont = value.Name;
+            OnPropertyChanged();
+        }
+    }
+    //字体名称
+    [ObservableProperty]
+    private string _packetHeaderFont = Database.Get(nameof(PacketHeaderFont), "").Result;
+    //////////时间标记的字体
+    public FontFamily? PacketExtraFontFamily
+    {
+        get
+        {
+            if(string.IsNullOrEmpty(PacketExtraFont))
+                PacketExtraFont = Utils.CheckFontName(PacketExtraFont);
+            return PacketExtraFont;
+        }
+        set
+        {
+            if (value is null)
+                return;
+            PacketExtraFont = value.Name;
+            OnPropertyChanged();
+        }
+    }
+    //字体名称
+    [ObservableProperty]
+    private string _packetExtraFont = Database.Get(nameof(PacketExtraFont), "").Result;
+    
     
-
     public Setting()
     {
-        var font = SkiaSharp.SKFontManager.Default.MatchFamily(PacketFont);
-        font ??= SkiaSharp.SKTypeface.Default;
-        PacketFontFamily = font.FamilyName;
-        if(string.IsNullOrEmpty(PacketFont))
-            _packetFont = font.FamilyName;
-        
         PropertyChanged += async (sender, e) =>
         {
             //某个变量被更改
             var name = e.PropertyName;
             
-            //需要特殊处理的变量
-            switch (name)
-            {
-                case nameof(PacketFontFamily):
-                    _packetFont = PacketFontFamily.Name;
-                    await Database.Set(nameof(PacketFont), PacketFont);
-                    break;
-            }
-            
             //不需要存储的变量
             string[] dismissList = 
             [
                 nameof(PacketFontFamily),
+                nameof(PacketHexFontFamily),
+                nameof(PacketHeaderFontFamily),
+                nameof(PacketExtraFontFamily),
             ];
             if (name == null || dismissList.Contains(name))
                 return;
diff --git a/llcomNext/LLCOM/Services/Utils.cs b/llcomNext/LLCOM/Services/Utils.cs
@@ -151,4 +151,13 @@ public static void OpenWebLink(string url)
     }
     
     public static bool HasUpdate() => _updateUrl != null;
+
+    /// <summary>
+    /// 获取字体名称，会根据字体名称返回一个可用的字体名称
+    /// 如果字体名称不存在，则返回默认字体名称
+    /// </summary>
+    /// <param name="name">字体名</param>
+    /// <returns>可用的字体名</returns>
+    public static string CheckFontName(string name) =>
+        (SkiaSharp.SKFontManager.Default.MatchFamily(name) ?? SkiaSharp.SKTypeface.Default).FamilyName;
 }
diff --git a/llcomNext/LLCOM/ViewModels/Pages/SettingPageViewModel.cs b/llcomNext/LLCOM/ViewModels/Pages/SettingPageViewModel.cs
@@ -40,9 +40,11 @@ public SettingPageViewModel(Func<Type, ViewModelBase> getService)
             {
                 SystemFontList.Add(f);
             }
-            //找找看当前设置的是什么字体
-            var font = Services.Utils.Setting.PacketFont;
-            SystemFontIndex = SystemFontList.IndexOf(font);
+            //找找看当前设置的是什么字体，对应上
+            PacketFontIndex = SystemFontList.IndexOf(Services.Utils.Setting.PacketFont);
+            PacketHexFontIndex = SystemFontList.IndexOf(Services.Utils.Setting.PacketHexFont);
+            PacketHeaderFontIndex = SystemFontList.IndexOf(Services.Utils.Setting.PacketHeaderFont);
+            PacketExtraFontIndex = SystemFontList.IndexOf(Services.Utils.Setting.PacketExtraFont);
             
             //是否已经检查过更新？
             if (Services.Utils.HasUpdate())
@@ -82,7 +84,13 @@ public SettingPageViewModel(Func<Type, ViewModelBase> getService)
     [ObservableProperty]
     private ObservableCollection<FontFamily> _SystemFontList = new();
     [ObservableProperty]
-    private int _systemFontIndex;
+    private int _packetFontIndex;
+    [ObservableProperty]
+    private int _packetHexFontIndex;
+    [ObservableProperty]
+    private int _packetHeaderFontIndex;
+    [ObservableProperty]
+    private int _packetExtraFontIndex;
 
     #endregion
     
diff --git a/llcomNext/LLCOM/Views/DataViews/PacketDataView.axaml b/llcomNext/LLCOM/Views/DataViews/PacketDataView.axaml
@@ -56,10 +56,13 @@
                         Classes.Black="{Binding IsWayUnknown}"
                         Classes.Green="{Binding IsWaySend}"
                         Classes.Red="{Binding IsWayReceive}"
+                        DataFontFamily="{Binding PacketFontFamily, Source={x:Static services:Utils.Setting}}"
                         Extra="{Binding Extra}"
-                        FontFamily="{Binding PacketFontFamily, Source={x:Static services:Utils.Setting}}"
+                        ExtraFontFamily="{Binding PacketExtraFontFamily, Source={x:Static services:Utils.Setting}}"
                         Header="{Binding Channel}"
+                        HeaderFontFamily="{Binding PacketHeaderFontFamily, Source={x:Static services:Utils.Setting}}"
                         Hex="{Binding HexString}"
+                        HexFontFamily="{Binding PacketHexFontFamily, Source={x:Static services:Utils.Setting}}"
                         HideHeader="{Binding ShowHeader, Source={x:Static services:Utils.Setting}}"
                         PureText="{Binding PureText, Source={x:Static services:Utils.Setting}}"
                         ShowString="{Binding IsShowString, Source={x:Static services:Utils.Setting}}"
diff --git a/llcomNext/LLCOM/Views/Pages/SettingPageView.axaml b/llcomNext/LLCOM/Views/Pages/SettingPageView.axaml

Original file line number	Diff line number	Diff line change
`@@ -151,4 +151,13 @@ public static void OpenWebLink(string url)`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`public static bool HasUpdate() => _updateUrl != null;`
	`154`	`+`
	`155`	`+ /// <summary>`
	`156`	`+ /// 获取字体名称，会根据字体名称返回一个可用的字体名称`
	`157`	`+ /// 如果字体名称不存在，则返回默认字体名称`
	`158`	`+ /// </summary>`
	`159`	`+ /// <param name="name">字体名</param>`
	`160`	`+ /// <returns>可用的字体名</returns>`
	`161`	`+ public static string CheckFontName(string name) =>`
	`162`	`+ (SkiaSharp.SKFontManager.Default.MatchFamily(name) ?? SkiaSharp.SKTypeface.Default).FamilyName;`
`154`	`163`	`}`