feat: add Status enum and Semi pic.

Author: zdpcdt

src/Client.Avalonia/Assets/Semi.svg

@@ -21,6 +21,7 @@
             <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
             <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
         </PackageReference>
+        <PackageReference Include="Avalonia.Svg" Version="11.2.0.2" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2"/>
         <PackageReference Include="Semi.Avalonia" Version="11.2.1.1" />
     </ItemGroup>

src/Client.Avalonia/Client.Avalonia.csproj

@@ -10,11 +10,13 @@ public partial class MainWindowViewModel : ViewModelBase
 {
     [ObservableProperty] private DownloadStatistics _statistics;
 
-    [ObservableProperty] [NotifyCanExecuteChangedFor(nameof(StartCommand))]
-    private bool _isCompleted;
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(StartCommand), nameof(StopCommand))]
+    [NotifyPropertyChangedFor(nameof(IsDownloading), nameof(IsCompleted))]
+    private DownloadStatus _status;
 
-    [ObservableProperty] [NotifyCanExecuteChangedFor(nameof(StartCommand), nameof(StopCommand))]
-    private bool _isUpdating;
+    public bool IsDownloading => Status is DownloadStatus.Downloading;
+    public bool IsCompleted => Status is DownloadStatus.Completed;
 
     private readonly DispatcherTimer _timer;
     private readonly Random _random;
@@ -24,12 +26,13 @@ public MainWindowViewModel()
         Statistics = new DownloadStatistics
         {
             Version = "11.2.2",
-            Speed = "0MB/s",
+            Speed = 0,
             Remaining = TimeSpan.Zero,
             TotalBytesToReceive = 1024 * 1024 * 10,
             BytesReceived = 1024 * 1024 * 0,
             ProgressPercentage = 0
         };
+        Status = DownloadStatus.NotStarted;
 
         _timer = new DispatcherTimer
         {
@@ -42,33 +45,36 @@ public MainWindowViewModel()
 
     #region Buttons
 
-    private bool CanStart => !IsCompleted;
+    private bool CanStart => Status is DownloadStatus.NotStarted or DownloadStatus.Downloading or DownloadStatus.Paused;
 
     [RelayCommand(CanExecute = nameof(CanStart))]
     private void Start()
     {
         if (!_timer.IsEnabled)
         {
             _timer.Start();
-            IsUpdating = true;
+            Status = DownloadStatus.Downloading;
         }
         else
         {
             _timer.Stop();
-            IsUpdating = false;
+            Status = DownloadStatus.Paused;
+            Statistics.Speed = 0;
+            Statistics.Remaining = TimeSpan.Zero;
         }
     }
 
-    [RelayCommand(CanExecute = nameof(IsUpdating))]
+    private bool CanStop => Status is DownloadStatus.Downloading or DownloadStatus.Paused;
+
+    [RelayCommand(CanExecute = nameof(CanStop))]
     private void Stop()
     {
         _timer.Stop();
+        Status = DownloadStatus.NotStarted;
         Statistics.BytesReceived = 0;
         Statistics.ProgressPercentage = 0;
-        Statistics.Speed = "0 MB/s";
+        Statistics.Speed = 0;
         Statistics.Remaining = TimeSpan.Zero;
-        IsCompleted = false;
-        IsUpdating = false;
         OnPropertyChanged(nameof(Statistics));
     }
 
@@ -100,7 +106,7 @@ private void UpdateProgress(object? sender, EventArgs e)
             Statistics.ProgressPercentage = (double)received / total * 100;
 
             var currentSpeed = increment / _timer.Interval.TotalSeconds;
-            Statistics.Speed = $"{currentSpeed / 1024 / 1024:F2} MB/s";
+            Statistics.Speed = currentSpeed / 1024 / 1024;
 
             var remainingBytes = total - received;
             Statistics.Remaining = TimeSpan.FromSeconds(remainingBytes / currentSpeed);
@@ -110,8 +116,9 @@ private void UpdateProgress(object? sender, EventArgs e)
             if (received >= total)
             {
                 _timer.Stop();
-                IsUpdating = false;
-                IsCompleted = true;
+                Status = DownloadStatus.Completed;
+                Statistics.Speed = 0;
+                Statistics.Remaining = TimeSpan.Zero;
             }
         }
     }
@@ -123,7 +130,7 @@ [ObservableProperty] [Description("当前下载版本")]
     private object? _version;
 
     [ObservableProperty] [Description("下载速度")]
-    private string? _speed;
+    private double _speed;
 
     [ObservableProperty] [Description("剩余下载时间")]
     private TimeSpan _remaining;
@@ -139,4 +146,13 @@ [ObservableProperty] [Description("进度百分比")]
 
     public double BytesReceivedInMB => (double)BytesReceived / 1024 / 1024;
     public double TotalBytesToReceiveInMB => (double)TotalBytesToReceive / 1024 / 1024;
+}
+
+[Flags]
+public enum DownloadStatus
+{
+    NotStarted,
+    Downloading,
+    Paused,
+    Completed
 }

src/Client.Avalonia/ViewModels/MainWindowViewModel.cs

@@ -9,7 +9,6 @@
         Icon="/Assets/avalonia-logo.ico"
         RequestedThemeVariant="Dark"
         Width="800" Height="450"
-        Background="{DynamicResource SemiBackground3Color}"
         Title="{Binding Statistics.Version,StringFormat='General Update {0} 版本更新'}">
     <Window.Resources>
         <ResourceDictionary>
@@ -27,9 +26,18 @@
         <vm:MainWindowViewModel />
     </Design.DataContext>
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="10" MinWidth="550">
-        <Image
-            Margin="30"
-            Source="../Assets/GeneralUpdate.png" Width="150" Height="150" />
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <Image
+                Margin="30"
+                Width="150"
+                Height="150"
+                Source="/Assets/GeneralUpdate.png" />
+            <Image
+                Margin="30"
+                Width="150"
+                Height="150"
+                Source="{SvgImage /Assets/Semi.svg}" />
+        </StackPanel>
 
         <SelectableTextBlock
             HorizontalAlignment="Center"
@@ -43,7 +51,7 @@
         <Panel>
             <SelectableTextBlock
                 HorizontalAlignment="Left"
-                Text="{Binding Statistics.Speed, StringFormat='下载速度：{0}'}" />
+                Text="{Binding Statistics.Speed, StringFormat='下载速度：{0:F2} MB/s'}" />
             <SelectableTextBlock
                 HorizontalAlignment="Center">
                 <Run Text="已下载：" />
@@ -75,14 +83,14 @@
         </ProgressBar>
         <Border
             Padding="10"
-            Background="{DynamicResource SemiBackground3Color}"
+            Background="{DynamicResource SemiBackground0Color}"
             Theme="{StaticResource CardBorder}">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10">
                 <Button
                     Name="StopButton"
                     Padding="8"
                     Theme="{StaticResource BorderlessButton}"
-                    Classes="Tertiary"
+                    Classes="Danger"
                     ToolTip.Tip="停止"
                     Command="{Binding StopCommand}">
                     <PathIcon
@@ -92,7 +100,7 @@
                 <ToggleSwitch
                     Name="StartButton"
                     Padding="8"
-                    IsChecked="{Binding IsUpdating}"
+                    IsChecked="{Binding IsDownloading}"
                     Theme="{StaticResource ButtonToggleSwitch}"
                     Command="{Binding StartCommand}">
                     <ToolTip.Tip>
@@ -117,7 +125,7 @@
                     Padding="8"
                     Theme="{StaticResource BorderlessButton}"
                     Classes="Tertiary"
-                    ToolTip.Tip="重新开始"
+                    ToolTip.Tip="重新下载"
                     Command="{Binding RestartCommand}">
                     <PathIcon
                         Theme="{StaticResource InnerPathIcon}"