修复因DI使用不当造成的多实例创建的问题 (#1565)

Richasy · Nov 14, 2022 · 1db86ea · 1db86ea
1 parent f8d0a69
commit 1db86ea
Show file tree

Hide file tree

Showing 94 changed files with 112 additions and 280 deletions.
diff --git a/src/Adapter/Adapter.UnitTests/Adapter.UnitTests.csproj b/src/Adapter/Adapter.UnitTests/Adapter.UnitTests.csproj
@@ -13,7 +13,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Update="FluentAssertions" Version="6.7.0" />
+      <PackageReference Update="FluentAssertions" Version="6.8.0" />
       <PackageReference Update="FluentAssertions.Analyzers" Version="0.17.2">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/App/App.csproj b/src/App/App.csproj
@@ -1309,19 +1309,19 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
-      <Version>7.1.2</Version>
+      <Version>7.1.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
-      <Version>7.1.2</Version>
+      <Version>7.1.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Behaviors">
-      <Version>7.1.2</Version>
+      <Version>7.1.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>7.1.2</Version>
+      <Version>7.1.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Media">
-      <Version>7.1.2</Version>
+      <Version>7.1.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
       <Version>2.8.2-prerelease.220830001</Version>

diff --git a/src/App/App.xaml.cs b/src/App/App.xaml.cs
@@ -76,7 +76,6 @@ private async void OnLaunchedOrActivatedAsync(IActivatedEventArgs e)
 
                 // Place the frame in the current Window
                 Window.Current.Content = rootFrame;
-                DIFactory.RegisterAppRequiredConstants();
             }
 
             if (e is LaunchActivatedEventArgs && (e as LaunchActivatedEventArgs).PrelaunchActivated == false)

diff --git a/src/App/Controls/App/XboxNavigationView.xaml.cs b/src/App/Controls/App/XboxNavigationView.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using System.Linq;
 using Bili.App.Controls.Base;
 using Bili.App.Pages.Xbox;

diff --git a/src/App/Controls/Community/CommentMainView/CommentMainView.cs b/src/App/Controls/Community/CommentMainView/CommentMainView.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.Models.App.Other;
 using Bili.ViewModels.Interfaces.Community;
 using Windows.UI.Xaml.Controls;

diff --git a/src/App/Controls/Player/BiliMediaPlayer/BiliMediaPlayer.Handlers.cs b/src/App/Controls/Player/BiliMediaPlayer/BiliMediaPlayer.Handlers.cs
@@ -75,7 +75,7 @@ private void OnDanmakuListAdded(object sender, IEnumerable<DanmakuInformation> e
 
         private async void OnMediaPlayerChangedAsync(object sender, object e)
         {
-            if(e is MediaPlayer mp)
+            if (e is MediaPlayer mp)
             {
                 _mediaPlayerElement.SetMediaPlayer(mp);
 

diff --git a/src/App/Controls/Player/BiliMediaTransportControls/BiliMediaTransportControls.Handlers.cs b/src/App/Controls/Player/BiliMediaTransportControls/BiliMediaTransportControls.Handlers.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using System.ComponentModel;
 using Bili.Models.Data.Player;
 using Windows.UI.Xaml;

diff --git a/src/App/Controls/Player/InteractionChoicePanel.xaml.cs b/src/App/Controls/Player/InteractionChoicePanel.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.Models.Data.Player;
 using Bili.ViewModels.Interfaces.Core;
 using Windows.UI.Xaml;

diff --git a/src/App/Controls/Player/PlayerControls/PlayRateButton.xaml.cs b/src/App/Controls/Player/PlayerControls/PlayRateButton.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Windows.UI.Xaml;
 
 namespace Bili.App.Controls.Player.PlayerControls

diff --git a/src/App/Controls/Player/SubtitleConfigPanel.xaml.cs b/src/App/Controls/Player/SubtitleConfigPanel.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.Models.Data.Player;
 using Bili.ViewModels.Interfaces.Common;
 using Windows.UI.Xaml;

diff --git a/src/App/Pages/Desktop/ArticlePartitionPage.xaml.cs b/src/App/Pages/Desktop/ArticlePartitionPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.Models.Data.Community;
 using Bili.Models.Enums;
 using Bili.ViewModels.Interfaces.Article;

diff --git a/src/App/Pages/Desktop/DynamicPage.xaml.cs b/src/App/Pages/Desktop/DynamicPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.App.Other;
 

diff --git a/src/App/Pages/Desktop/Overlay/FavoritePage.xaml.cs b/src/App/Pages/Desktop/Overlay/FavoritePage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using System.Linq;
 using Bili.App.Pages.Base;
 using Bili.Models.App.Other;

diff --git a/src/App/Pages/Desktop/Overlay/LivePartitionDetailPage.xaml.cs b/src/App/Pages/Desktop/Overlay/LivePartitionDetailPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Community;
 using Bili.Models.Data.Live;

diff --git a/src/App/Pages/Desktop/Overlay/LivePartitionPage.xaml.cs b/src/App/Pages/Desktop/Overlay/LivePartitionPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Community;
 

diff --git a/src/App/Pages/Desktop/Overlay/LivePlayerPage.xaml.cs b/src/App/Pages/Desktop/Overlay/LivePlayerPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Local;
 using Windows.UI.Xaml.Navigation;

diff --git a/src/App/Pages/Desktop/Overlay/MessagePage.xaml.cs b/src/App/Pages/Desktop/Overlay/MessagePage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.ViewModels.Interfaces.Community;
 
 namespace Bili.App.Pages.Desktop.Overlay

diff --git a/src/App/Pages/Desktop/Overlay/MyFollowsPage.xaml.cs b/src/App/Pages/Desktop/Overlay/MyFollowsPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.Models.Data.Community;
 using Bili.ViewModels.Interfaces.Account;
 

diff --git a/src/App/Pages/Desktop/Overlay/PgcIndexPage.xaml.cs b/src/App/Pages/Desktop/Overlay/PgcIndexPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using System.Linq;
 using Bili.Models.Data.Appearance;
 using Bili.Models.Enums;

diff --git a/src/App/Pages/Desktop/Overlay/SearchPage.xaml.cs b/src/App/Pages/Desktop/Overlay/SearchPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Appearance;
 using Bili.ViewModels.Interfaces.Search;

diff --git a/src/App/Pages/Desktop/Overlay/UserSpacePage.xaml.cs b/src/App/Pages/Desktop/Overlay/UserSpacePage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.User;
 using Windows.UI.Xaml.Navigation;

diff --git a/src/App/Pages/Desktop/Overlay/VideoPartitionDetailPage.xaml.cs b/src/App/Pages/Desktop/Overlay/VideoPartitionDetailPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Community;
 using Bili.Models.Enums;

diff --git a/src/App/Pages/Desktop/RankPage.xaml.cs b/src/App/Pages/Desktop/RankPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Community;
 

diff --git a/src/App/Pages/Xbox/Overlay/FavoritePage.xaml.cs b/src/App/Pages/Xbox/Overlay/FavoritePage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using System.Linq;
 using Bili.App.Pages.Base;
 using Bili.Models.App.Other;

diff --git a/src/App/Pages/Xbox/Overlay/LivePartitionDetailPage.xaml.cs b/src/App/Pages/Xbox/Overlay/LivePartitionDetailPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Community;
 using Bili.Models.Data.Live;

diff --git a/src/App/Pages/Xbox/Overlay/LivePartitionPage.xaml.cs b/src/App/Pages/Xbox/Overlay/LivePartitionPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Community;
 

diff --git a/src/App/Pages/Xbox/Overlay/SearchPage.xaml.cs b/src/App/Pages/Xbox/Overlay/SearchPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Appearance;
 using Bili.ViewModels.Interfaces.Search;

diff --git a/src/App/Pages/Xbox/Overlay/UserSpacePage.xaml.cs b/src/App/Pages/Xbox/Overlay/UserSpacePage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.User;
 using Windows.UI.Xaml.Navigation;

diff --git a/src/App/Pages/Xbox/Overlay/VideoFavoriteDetailPage.xaml.cs b/src/App/Pages/Xbox/Overlay/VideoFavoriteDetailPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Video;
 using Windows.UI.Xaml.Navigation;

diff --git a/src/App/Pages/Xbox/Overlay/VideoPartitionDetailPage.xaml.cs b/src/App/Pages/Xbox/Overlay/VideoPartitionDetailPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Community;
 using Bili.Models.Enums;

diff --git a/src/App/Pages/Xbox/PreSearchPage.xaml.cs b/src/App/Pages/Xbox/PreSearchPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.Models.Data.Search;
 using Bili.ViewModels.Interfaces.Search;
 

diff --git a/src/App/Pages/Xbox/RankPage.xaml.cs b/src/App/Pages/Xbox/RankPage.xaml.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Richasy. All rights reserved.
 
-using System;
 using Bili.App.Pages.Base;
 using Bili.Models.Data.Community;
 

diff --git a/src/App/Resources/Converter/PreferQualityConverter.cs b/src/App/Resources/Converter/PreferQualityConverter.cs
@@ -15,7 +15,7 @@ internal sealed class PreferQualityConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
-            if(value is PreferQuality quality)
+            if (value is PreferQuality quality)
             {
                 var resToolkit = Locator.Instance.GetService<IResourceToolkit>();
                 return quality switch

diff --git a/src/Lib/DI.App/DI.App.csproj b/src/Lib/DI.App/DI.App.csproj
@@ -129,7 +129,7 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>5.0.4</Version>
+      <Version>5.0.5</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Lib/DI.App/DIFactory.cs b/src/Lib/DI.App/DIFactory.cs
@@ -32,7 +32,6 @@
 using Bili.ViewModels.Uwp.Toolbox;
 using Bili.ViewModels.Uwp.Video;
 using Windows.Storage;
-using Windows.UI.Xaml;
 
 namespace Bili.DI.App
 {
@@ -52,7 +51,7 @@ public static void RegisterAppRequiredServices()
             NLog.GlobalDiagnosticsContext.Set("LogPath", fullPath);
             var logger = NLog.LogManager.GetLogger("Richasy.Bili");
             Container.Locator.Instance
-                .RegisterSingleton<NLog.ILogger>(logger)
+                .RegisterConstant(logger)
                 .RegisterSingleton<IResourceToolkit, ResourceToolkit>()
                 .RegisterSingleton<INumberToolkit, NumberToolkit>()
                 .RegisterSingleton<ISettingsToolkit, SettingsToolkit>()
@@ -179,14 +178,5 @@ public static void RegisterAppRequiredServices()
                 .RegisterSingleton<ILivePlayerPageViewModel, LivePlayerPageViewModel>()
                 .Build();
         }
-
-        /// <summary>
-        /// 注册应用所需的常量.
-        /// </summary>
-        public static void RegisterAppRequiredConstants()
-        {
-            Container.Locator.Instance.RegisterSingleton(Window.Current.CoreWindow.Dispatcher)
-                .Build();
-        }
     }
 }
diff --git a/src/Lib/DI.Container/DI.Container.csproj b/src/Lib/DI.Container/DI.Container.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Autofac" Version="6.4.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
 </Project>