feat: extract mock service.

Author: zdpcdt

src/Client.Avalonia/App.axaml.cs

@@ -1,11 +1,12 @@
+using System.Linq;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core;
 using Avalonia.Data.Core.Plugins;
-using System.Linq;
 using Avalonia.Markup.Xaml;
+using Client.Avalonia.Services;
 using Client.Avalonia.ViewModels;
 using Client.Avalonia.Views;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Client.Avalonia;
 
@@ -18,14 +19,19 @@ public override void Initialize()
 
     public override void OnFrameworkInitializationCompleted()
     {
+        var services = new ServiceCollection();
+        services.AddSingleton<IDownloadService, MockDownloadService>();
+        services.AddTransient<MainWindowViewModel>();
+        var serviceProvider = new DefaultServiceProviderFactory().CreateServiceProvider(services);
+
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
             // Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
             // More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
             DisableAvaloniaDataAnnotationValidation();
             desktop.MainWindow = new MainWindow
             {
-                DataContext = new MainWindowViewModel(),
+                DataContext = serviceProvider.GetRequiredService<MainWindowViewModel>()
             };
         }
 

src/Client.Avalonia/Client.Avalonia.csproj

@@ -9,7 +9,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Folder Include="Models\"/>
         <AvaloniaResource Include="Assets\**"/>
     </ItemGroup>
 
@@ -23,6 +22,7 @@
         </PackageReference>
         <PackageReference Include="Avalonia.Svg" Version="11.2.0.2" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
         <PackageReference Include="Semi.Avalonia" Version="11.2.1.1" />
     </ItemGroup>
 </Project>

src/Client.Avalonia/Models/DownloadStatistics.cs

@@ -0,0 +1,29 @@
+using System;
+using System.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Client.Avalonia.Models;
+
+public partial class DownloadStatistics : ObservableObject
+{
+    [ObservableProperty] [Description("当前下载版本")]
+    private object? _version;
+
+    [ObservableProperty] [Description("下载速度")]
+    private double _speed;
+
+    [ObservableProperty] [Description("剩余下载时间")]
+    private TimeSpan _remaining;
+
+    [ObservableProperty] [Description("总大小")] [NotifyPropertyChangedFor(nameof(TotalBytesToReceiveInMB))]
+    private long _totalBytesToReceive;
+
+    [ObservableProperty] [Description("已下载大小")] [NotifyPropertyChangedFor(nameof(BytesReceivedInMB))]
+    private long _bytesReceived;
+
+    [ObservableProperty] [Description("进度百分比")]
+    private double _progressPercentage;
+
+    public double BytesReceivedInMB => (double)BytesReceived / 1024 / 1024;
+    public double TotalBytesToReceiveInMB => (double)TotalBytesToReceive / 1024 / 1024;
+}

src/Client.Avalonia/Services/IDownloadService.cs

@@ -0,0 +1,28 @@
+using System;
+using System.ComponentModel;
+using Client.Avalonia.Models;
+
+namespace Client.Avalonia.Services;
+
+public interface IDownloadService
+{
+    event Action<DownloadStatistics> ProgressChanged;
+    event Action<DownloadStatus> StatusChanged;
+
+    DownloadStatistics CurrentStatistics { get; }
+    DownloadStatus Status { get; }
+
+    void Start();
+    void Pause();
+    void Stop();
+    void Restart();
+}
+
+[Flags]
+public enum DownloadStatus
+{
+    [Description("未开始")] NotStarted,
+    [Description("下载中")] Downloading,
+    [Description("已暂停")] Paused,
+    [Description("已完成")] Completed
+}

src/Client.Avalonia/Services/MockDownloadService.cs

@@ -0,0 +1,107 @@
+using System;
+using Avalonia.Threading;
+using Client.Avalonia.Models;
+
+namespace Client.Avalonia.Services;
+
+public class MockDownloadService : IDownloadService
+{
+    public event Action<DownloadStatistics>? ProgressChanged;
+    public event Action<DownloadStatus>? StatusChanged;
+
+    private readonly DispatcherTimer _timer;
+    private readonly Random _random;
+
+    public DownloadStatistics CurrentStatistics { get; private set; }
+    public DownloadStatus Status { get; private set; }
+
+    public MockDownloadService()
+    {
+        CurrentStatistics = new DownloadStatistics
+        {
+            Version = "11.2.2",
+            Speed = 0,
+            Remaining = TimeSpan.Zero,
+            TotalBytesToReceive = 1024 * 1024 * 10,
+            BytesReceived = 0,
+            ProgressPercentage = 0
+        };
+        Status = DownloadStatus.NotStarted;
+
+        _random = new Random();
+        _timer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(1000) };
+        _timer.Tick += UpdateProgress;
+    }
+
+    public void Start()
+    {
+        if (Status is DownloadStatus.Downloading)
+        {
+            Pause();
+            return;
+        }
+
+        _timer.Start();
+        UpdateStatus(DownloadStatus.Downloading);
+    }
+
+    public void Pause()
+    {
+        if (Status is DownloadStatus.Downloading)
+        {
+            _timer.Stop();
+            UpdateStatus(DownloadStatus.Paused);
+            CurrentStatistics.Speed = 0;
+            ProgressChanged?.Invoke(CurrentStatistics);
+        }
+    }
+
+    public void Stop()
+    {
+        _timer.Stop();
+        UpdateStatus(DownloadStatus.NotStarted);
+
+        CurrentStatistics.BytesReceived = 0;
+        CurrentStatistics.ProgressPercentage = 0;
+        CurrentStatistics.Speed = 0;
+        CurrentStatistics.Remaining = TimeSpan.Zero;
+
+        ProgressChanged?.Invoke(CurrentStatistics);
+    }
+
+    public void Restart()
+    {
+        Stop();
+        Start();
+    }
+
+    private void UpdateProgress(object? sender, EventArgs e)
+    {
+        var stats = CurrentStatistics;
+        var increment = _random.Next(1024 * 1024 * 2, 1024 * 1024 * 3);
+        stats.BytesReceived = Math.Min(stats.BytesReceived + increment, stats.TotalBytesToReceive);
+
+        stats.ProgressPercentage = (double)stats.BytesReceived / stats.TotalBytesToReceive * 100;
+        stats.Speed = increment / _timer.Interval.TotalSeconds / 1024 / 1024;
+        stats.Remaining = stats.BytesReceived >= stats.TotalBytesToReceive
+            ? TimeSpan.Zero
+            : TimeSpan.FromSeconds((stats.TotalBytesToReceive - stats.BytesReceived) / (stats.Speed * 1024 * 1024));
+
+        ProgressChanged?.Invoke(stats);
+
+        if (stats.BytesReceived >= stats.TotalBytesToReceive)
+        {
+            _timer.Stop();
+            UpdateStatus(DownloadStatus.Completed);
+        }
+    }
+
+    private void UpdateStatus(DownloadStatus newStatus)
+    {
+        if (Status != newStatus)
+        {
+            Status = newStatus;
+            StatusChanged?.Invoke(newStatus);
+        }
+    }
+}

src/Client.Avalonia/ViewModels/MainWindowViewModel.cs

@@ -1,153 +1,43 @@
-using System;
-using System.ComponentModel;
-using Avalonia.Threading;
+using Client.Avalonia.Models;
+using Client.Avalonia.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
 namespace Client.Avalonia.ViewModels;
 
 public partial class MainWindowViewModel : ViewModelBase
 {
+    private readonly IDownloadService _downloadService;
+
     [ObservableProperty] private DownloadStatistics _statistics;
 
     [ObservableProperty] [NotifyCanExecuteChangedFor(nameof(StartCommand), nameof(StopCommand))]
     private DownloadStatus _status;
 
-    private readonly DispatcherTimer _timer;
-    private readonly Random _random;
-
-    public MainWindowViewModel()
+    public MainWindowViewModel(IDownloadService downloadService)
     {
-        Statistics = new DownloadStatistics
-        {
-            Version = "11.2.2",
-            Speed = 0,
-            Remaining = TimeSpan.Zero,
-            TotalBytesToReceive = 1024 * 1024 * 10,
-            BytesReceived = 1024 * 1024 * 0,
-            ProgressPercentage = 0
-        };
-        Status = DownloadStatus.NotStarted;
+        _downloadService = downloadService;
+        _downloadService.ProgressChanged += stats => Statistics = stats;
+        _downloadService.StatusChanged += status => Status = status;
 
-        _timer = new DispatcherTimer
-        {
-            Interval = TimeSpan.FromMilliseconds(1000)
-        };
-        _timer.Tick += UpdateProgress;
-
-        _random = new Random();
+        Statistics = _downloadService.CurrentStatistics;
+        Status = _downloadService.Status;
     }
 
     #region Buttons
 
     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();
-            Status = DownloadStatus.Downloading;
-        }
-        else
-        {
-            _timer.Stop();
-            Status = DownloadStatus.Paused;
-            Statistics.Speed = 0;
-            Statistics.Remaining = TimeSpan.Zero;
-        }
-    }
+    private void Start() => _downloadService.Start();
 
     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;
-        Statistics.Remaining = TimeSpan.Zero;
-        OnPropertyChanged(nameof(Statistics));
-    }
+    private void Stop() => _downloadService.Stop();
 
     [RelayCommand]
-    private void Restart()
-    {
-        Stop();
-        Start();
-    }
+    private void Restart() => _downloadService.Restart();
 
     #endregion
-
-
-    private void UpdateProgress(object? sender, EventArgs e)
-    {
-        var received = Statistics.BytesReceived;
-        var total = Statistics.TotalBytesToReceive;
-        if (received < total)
-        {
-            var increment = _random.Next(1024 * 1024 * 2, 1024 * 1024 * 3);
-            received += increment;
-
-            if (received > total)
-            {
-                received = total;
-            }
-
-            Statistics.BytesReceived = received;
-            Statistics.ProgressPercentage = (double)received / total * 100;
-
-            var currentSpeed = increment / _timer.Interval.TotalSeconds;
-            Statistics.Speed = currentSpeed / 1024 / 1024;
-
-            var remainingBytes = total - received;
-            Statistics.Remaining = TimeSpan.FromSeconds(remainingBytes / currentSpeed);
-
-            OnPropertyChanged(nameof(Statistics));
-
-            if (received >= total)
-            {
-                _timer.Stop();
-                Status = DownloadStatus.Completed;
-                Statistics.Speed = 0;
-                Statistics.Remaining = TimeSpan.Zero;
-            }
-        }
-    }
-}
-
-public partial class DownloadStatistics : ObservableObject
-{
-    [ObservableProperty] [Description("当前下载版本")]
-    private object? _version;
-
-    [ObservableProperty] [Description("下载速度")]
-    private double _speed;
-
-    [ObservableProperty] [Description("剩余下载时间")]
-    private TimeSpan _remaining;
-
-    [ObservableProperty] [Description("总大小")] [NotifyPropertyChangedFor(nameof(TotalBytesToReceiveInMB))]
-    private long _totalBytesToReceive;
-
-    [ObservableProperty] [Description("已下载大小")] [NotifyPropertyChangedFor(nameof(BytesReceivedInMB))]
-    private long _bytesReceived;
-
-    [ObservableProperty] [Description("进度百分比")]
-    private double _progressPercentage;
-
-    public double BytesReceivedInMB => (double)BytesReceived / 1024 / 1024;
-    public double TotalBytesToReceiveInMB => (double)TotalBytesToReceive / 1024 / 1024;
-}
-
-[Flags]
-public enum DownloadStatus
-{
-    [Description("未开始")] NotStarted,
-    [Description("下载中")] Downloading,
-    [Description("已暂停")] Paused,
-    [Description("已完成")] Completed
 }