fix: 修复异步加载导致的第一页初始加载不完全的问题

Author: AMagicPear

PCL.Neo/App.axaml.cs

@@ -33,7 +33,7 @@ public override void Initialize()
 
         private static IServiceProvider ConfigureServices() => new ServiceCollection()
             .AddTransient<MainWindowViewModel>()
-            .AddTransient<ViewModels.Home.HomeViewModel>()
+            .AddTransient<HomeViewModel>()
             .AddTransient<HomeSubViewModel>()
             .AddTransient<VersionManagerViewModel>()
             .AddTransient<GameSettingsViewModel>()
@@ -49,7 +49,7 @@ public override void Initialize()
             .AddSingleton<IJavaManager, JavaManager>()
             .AddSingleton<DownloadService>()
             .AddSingleton<GameService>()
-            .AddSingleton<GameLauncher>(provider => new GameLauncher(provider.GetRequiredService<GameService>()))
+            .AddSingleton<GameLauncher>()
             .AddSingleton<UserService>()
             .BuildServiceProvider();
 
@@ -65,6 +65,8 @@ public override void OnFrameworkInitializationCompleted()
                 // More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
                 DisableAvaloniaDataAnnotationValidation();
                 desktop.MainWindow = new MainWindow { DataContext = vm };
+                // 由于导航改成了异步方法，在构造函数中无法正常导向首页，需要在此处导向
+                Ioc.Default.GetRequiredService<INavigationService>().GotoAsync<HomeViewModel>();
             }
 
             base.OnFrameworkInitializationCompleted();

PCL.Neo/ViewModels/Home/GameSettingsViewModel.cs

@@ -41,7 +41,7 @@ public class VersionComponent
     public bool IsClickable { get; set; } = false;
 }
 
-[SubViewModelOf(typeof(HomeViewModel))]
+[SubViewModelOf(typeof(HomeViewModelBackup))]
 public partial class GameSettingsViewModel : ViewModelBase
 {
     private readonly INavigationService _navigationService;

PCL.Neo/ViewModels/Home/HomeViewModel.cs renamed to PCL.Neo/ViewModels/Home/HomeViewModelBackup.cs

@@ -7,11 +7,12 @@
 
 namespace PCL.Neo.ViewModels.Home
 {
-    public partial class HomeViewModel : ObservableObject
+    // TODO)) 暂未使用
+    public partial class HomeViewModelBackup : ObservableObject
     {
         private readonly INavigationService _navigationService;
 
-        public HomeViewModel(INavigationService navigationService)
+        public HomeViewModelBackup(INavigationService navigationService)
         {
             _navigationService = navigationService;
         }
@@ -22,12 +23,12 @@ private async Task ManageUsers()
             // 导航到用户管理页面
             await _navigationService.GotoAsync<HomeSubViewModel>();
         }
-        
+
         [RelayCommand]
         private async Task ManageVersions()
         {
             // 导航到版本管理页面
             await _navigationService.GotoAsync<VersionManagerViewModel>();
         }
     }
-} 
+}

PCL.Neo/ViewModels/Home/VersionManagerViewModel.cs

@@ -35,7 +35,7 @@ public class VersionItem
     public VersionInfo VersionInfo { get; set; } = null!;
 }
 
-[SubViewModelOf(typeof(HomeViewModel))]
+[SubViewModelOf(typeof(HomeViewModelBackup))]
 public partial class VersionManagerViewModel : ViewModelBase
 {
     private readonly INavigationService _navigationService;

PCL.Neo/ViewModels/MainWindowViewModel.cs

@@ -38,7 +38,9 @@ private int CheckedBtn
         }
 
 
-        [ObservableProperty] private ViewModelBase? _currentViewModel;
+        [ObservableProperty] [NotifyPropertyChangedFor(nameof(CheckedBtn))]
+        private ViewModelBase? _currentViewModel;
+
         [ObservableProperty] private ViewModelBase? _currentSubViewModel;
 
         [ObservableProperty] private bool _canGoBack;
@@ -68,9 +70,10 @@ public MainWindowViewModel(INavigationService navigationService)
             NavigationService.CurrentViewModelChanged += vm =>
             {
                 CurrentViewModel = vm;
-
                 // 更新返回按钮状态
                 CanGoBack = NavigationService.CanGoBack;
+                // 由外部的页面跳转反向触发设置按钮状态
+                UpdateNavBtnState();
             };
             NavigationService.CurrentSubViewModelChanged += vm => CurrentSubViewModel = vm;
         }
@@ -144,8 +147,9 @@ private void UpdateNavBtnState()
             {
                 HomeViewModel => 1,
                 DownloadViewModel => 2,
-                SetupViewModel => 3,
-                LogViewModel => 4,
+                // LinkViewModel => 3,
+                SetupViewModel => 4,
+                // MoreViewModel => 4,
                 _ => throw new ArgumentOutOfRangeException()
             };
         }

PCL.Neo/Views/Home/HomeSubView.axaml

@@ -9,7 +9,6 @@
     xmlns:home="clr-namespace:PCL.Neo.ViewModels.Home"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pc="using:PCL.Neo.Controls"
-    xmlns:vm="using:PCL.Neo.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ScrollViewer>
         <StackPanel Orientation="Vertical">