🐛 PluginCount

BeyondDimension · Mar 16, 2024 · 01e8478 · 01e8478
1 parent 0de0262
commit 01e8478
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/HomePage.axaml b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/HomePage.axaml
@@ -8,6 +8,7 @@
     xmlns:s="https://steampp.net/services"
     xmlns:spp="https://steampp.net/ui"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
+    xmlns:wtts="using:BD.WTTS"
     d:DesignHeight="900"
     d:DesignWidth="1080"
     x:CompileBindings="True"
@@ -86,7 +87,7 @@
                 VerticalAlignment="Top"
                 IsClosable="False"
                 IsOpen="True"
-                IsVisible="{Binding !!!MainWindow2.PluginCount, Mode=OneWay, Source={x:Static s:IViewModelManager.Instance}}"
+                IsVisible="{Binding !!!PluginCount, Mode=OneWay, Source={x:Static wtts:Startup.Instance}}"
                 Message="检测到你没有安装插件，请去下载插件即可使用更多功能。"
                 Severity="Warning" />
 

diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Plugin.axaml b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Plugin.axaml
@@ -8,6 +8,7 @@
     xmlns:s="https://steampp.net/services"
     xmlns:spp="https://steampp.net/ui"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
+    xmlns:wtts="using:BD.WTTS"
     d:DesignHeight="680"
     d:DesignWidth="1080"
     x:CompileBindings="True"
@@ -38,8 +39,8 @@
                         Source="{x:Static s:ResourceService.Current}" />
                     <CompiledBinding
                         Mode="OneWay"
-                        Path="MainWindow2.PluginCount"
-                        Source="{x:Static s:IViewModelManager.Instance}" />
+                        Path="PluginCount"
+                        Source="{x:Static wtts:Startup.Instance}" />
                 </MultiBinding>
             </TextBlock.Text>
             <!--<Run Text="{Binding Path=Res.Plugin_InstalledPlugins, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />

diff --git a/src/BD.WTTS.Client/Startup/Startup.Properties.cs b/src/BD.WTTS.Client/Startup/Startup.Properties.cs
@@ -202,4 +202,7 @@ public bool TryGetPluginResults([NotNullWhen(true)] out IReadOnlyCollection<Plug
     /// 自定义本机库加载路径
     /// </summary>
     public static string? NativeLibraryPath => _NativeLibraryPath.Value;
+
+    [Reactive]
+    public int PluginCount { get; set; }
 }
diff --git a/src/BD.WTTS.Client/Startup/Startup.cs b/src/BD.WTTS.Client/Startup/Startup.cs
@@ -12,7 +12,7 @@ namespace BD.WTTS;
 /// <summary>
 /// 应用程序启动
 /// </summary>
-public abstract partial class Startup
+public abstract partial class Startup : ReactiveObject
 {
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     internal void SetConsoleTitle(string title)

diff --git a/src/BD.WTTS.Client/UI/ViewModels/Windows/Main/MainWindowViewModel.cs b/src/BD.WTTS.Client/UI/ViewModels/Windows/Main/MainWindowViewModel.cs
@@ -119,7 +119,7 @@ public override async Task Initialize()
             }
             if (startup.TryGetPlugins(out var plugins))
             {
-                PluginCount = plugins.Count;
+                Startup.Instance.PluginCount = PluginCount = plugins.Count;
                 foreach (var plugin in plugins)
                 {
                     try