add: 有新版本就显示个小红点

Author: chenxuuu

llcomNext/LLCOM/Services/Utils.cs

@@ -5,6 +5,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using RestSharp;
 
 namespace LLCOM.Services;
 
@@ -97,4 +98,54 @@ public static void OpenWebLink(string url)
             // ignored
         }
     }
+
+    private static string? _updateUrl = null;
+    /// <summary>
+    /// 检查更新
+    /// </summary>
+    /// <returns>是否有新版本，有的话返回下载地址</returns>
+    public static async Task<string?> CheckUpdate()
+    {
+        if(_updateUrl != null)
+            return _updateUrl;
+        
+        var versionNow = Services.Utils.Version;
+        //获取https://api.github.com/repos/chenxuuu/llcom/releases/latest的json结果
+        var client = new RestClient("https://api.github.com/repos/chenxuuu/llcom/releases/latest");
+        var request = new RestRequest();
+        var response = await client.ExecuteAsync(request);
+        if (!response.IsSuccessful || response.Content is null)
+            return null;
+        
+        var json = System.Text.Json.JsonDocument.Parse(response.Content);
+        var version = json.RootElement.GetProperty("tag_name").GetString();
+        if(version == null)
+            return null;
+        
+        //判断在线版本是否新于本地版本，按点分割后比较
+        var isBigger = true;
+        if(version == versionNow)
+            isBigger = false;
+        else
+        {
+            var versionNowSplit = versionNow.Split('.');
+            var versionSplit = version.Split('.');
+            for (int i = 0; i < versionNowSplit.Length; i++)
+            {
+                if (int.Parse(versionNowSplit[i]) > int.Parse(versionSplit[i]))
+                {
+                    isBigger = false;
+                    break;
+                }
+            }
+        }
+
+        //更新信息
+        if(isBigger)
+            _updateUrl = json.RootElement.GetProperty("html_url").GetString();
+
+        return _updateUrl;
+    }
+    
+    public static bool HasUpdate() => _updateUrl != null;
 }

llcomNext/LLCOM/ViewModels/MainViewModel.cs

@@ -39,6 +39,13 @@ 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]
@@ -53,7 +60,10 @@ public MainViewModel(Func<Type, ViewModelBase> getService)
     private void LogPageButton() => CurrentPage = _getService(typeof(LogPageViewModel));
     [RelayCommand]
     private void SettingPageButton() => CurrentPage = _getService(typeof(SettingPageViewModel));
-    
+
+
+    [ObservableProperty] 
+    private bool _showSettingDot = false;
 
     //以下代码用于切换DataPage中的子页面
     [ObservableProperty]
@@ -71,4 +81,5 @@ public MainViewModel(Func<Type, ViewModelBase> getService)
     [RelayCommand]
     private void WaveformButton() => CurrentDataPage = _getService(typeof(WaveformViewModel));
 
+    
 }

llcomNext/LLCOM/ViewModels/Pages/SettingPageViewModel.cs

@@ -19,8 +19,15 @@ public SettingPageViewModel(Func<Type, ViewModelBase> getService)
         _getService = getService;
 
         //初始化系统信息
-        Task.Run(() =>
+        Task.Run(async () =>
         {
+            //是否已经检查过更新？
+            if (Services.Utils.HasUpdate())
+            {
+                _updateUrl = await Services.Utils.CheckUpdate();
+                HasCheckedUpdate = true;
+            }
+            
             var packagesInfo = new List<string>();
             var assemblies = AppDomain.CurrentDomain.GetAssemblies();
 
@@ -44,11 +51,13 @@ public SettingPageViewModel(Func<Type, ViewModelBase> getService)
                 $"Packages \n{string.Join("\n", packagesInfo)}\n" +
                 $"Environment: {Environment.GetEnvironmentVariable("PATH")}";
         });
+
     }
 
 
     #region About
-    [ObservableProperty] private string _systemInfo = "Loading...";
+    [ObservableProperty]
+    private string _systemInfo = "Loading...";
 
     [RelayCommand]
     private async Task CopySystemInfo()
@@ -76,40 +85,11 @@ private async Task CheckUpdate()
             return;
         }
 
-        var versionNow = Services.Utils.Version;
-        //获取https://api.github.com/repos/chenxuuu/llcom/releases/latest的json结果
-        var client = new RestClient("https://api.github.com/repos/chenxuuu/llcom/releases/latest");
-        var request = new RestRequest();
-        var response = await client.ExecuteAsync(request);
-        if (!response.IsSuccessful || response.Content is null)
-            return;
-        
-        var json = System.Text.Json.JsonDocument.Parse(response.Content);
-        var version = json.RootElement.GetProperty("tag_name").GetString();
-        if(version == null)
-            return;
-        
-        //判断在线版本是否新于本地版本，按点分割后比较
-        var isBigger = true;
-        if(version == versionNow)
-            isBigger = false;
-        else
-        {
-            var versionNowSplit = versionNow.Split('.');
-            var versionSplit = version.Split('.');
-            for (int i = 0; i < versionNowSplit.Length; i++)
-            {
-                if (int.Parse(versionNowSplit[i]) > int.Parse(versionSplit[i]))
-                {
-                    isBigger = false;
-                    break;
-                }
-            }
-        }
+        var url = await Services.Utils.CheckUpdate();
 
         //更新信息
-        if(isBigger)
-            _updateUrl = json.RootElement.GetProperty("html_url").GetString();
+        if(url != null)
+            _updateUrl = url;
 
         HasCheckedUpdate = true;
     }

llcomNext/LLCOM/Views/MainView.axaml

@@ -52,13 +52,27 @@
                         Content=""
                         ToolTip.Tip="历史日志" />
                 </StackPanel>
-                <Button
-                    VerticalAlignment="Bottom"
-                    Classes="IconButton Tertiary"
-                    Classes.IconButtonActive="{Binding IsSettingPageActive}"
-                    Command="{Binding SettingPageButtonCommand}"
-                    Content="&#xE270;"
-                    ToolTip.Tip="软件设置" />
+                <Panel VerticalAlignment="Bottom">
+                    <Button
+                        Classes="IconButton Tertiary"
+                        Classes.IconButtonActive="{Binding IsSettingPageActive}"
+                        Command="{Binding SettingPageButtonCommand}"
+                        ToolTip.Tip="软件设置">
+                        <Panel HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            <TextBlock
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Text="&#xE270;" />
+                            <u:Badge
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top"
+                                Classes="Danger"
+                                Dot="True"
+                                IsVisible="{Binding ShowSettingDot}" />
+                        </Panel>
+                    </Button>
+
+                </Panel>
             </Panel>
         </Border>
         <UserControl Grid.Column="1" Content="{Binding CurrentPage}" />

llcomNext/LLCOM/Views/Pages/SettingPageView.axaml

@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     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="800"
     d:DesignWidth="381"
@@ -23,7 +24,19 @@
         </TabItem>
         <TabItem Header="外观与字体" />
         <TabItem Header="日志与缓存" />
-        <TabItem Header="关于软件">
+        <TabItem>
+            <TabItem.Header>
+                <Panel>
+                    <TextBlock>关于软件</TextBlock>
+                    <u:Badge
+                        Margin="0,0,-8,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        Classes="Danger"
+                        Dot="True"
+                        IsVisible="{Binding HasNewVersion}" />
+                </Panel>
+            </TabItem.Header>
             <ScrollViewer>
                 <StackPanel Margin="10">
                     <Border
@@ -44,7 +57,14 @@
                         FontSize="15"
                         Text="多功能调试工具" />
 
-                    <Panel Margin="0,10,0,0">
+                    <Panel Margin="0,10,0,0" HorizontalAlignment="Center">
+                        <u:Badge
+                            Margin="0,-8,-20,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            Classes="Danger"
+                            Header="NEW"
+                            IsVisible="{Binding HasNewVersion}" />
                         <Button Name="CheckUpdateButton" Command="{Binding CheckUpdateCommand}">
                             <Panel>
                                 <TextBlock HorizontalAlignment="Center" IsVisible="{Binding !HasCheckedUpdate}">检查更新</TextBlock>