From 7dee4a0ea523ba4e46c171205ca5f55df3678b66 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Tue, 30 Apr 2024 13:35:05 +0800 Subject: [PATCH] fix launch package convert --- src/Snap.Hutao/Snap.Hutao/Core/IO/FileOperation.cs | 1 - .../Snap.Hutao/Core/Windowing/WindowController.cs | 1 - .../Snap.Hutao/Core/Windowing/WindowOptions.cs | 1 - .../Snap.Hutao/Core/Windowing/WindowSubclass.cs | 1 - .../Converter/AssociationTypeIconConverter.cs | 1 - src/Snap.Hutao/Snap.Hutao/Program.cs | 1 - .../Snap.Hutao/Service/Abstraction/DbStoreOptions.cs | 1 - .../Achievement/AchievementStatisticsService.cs | 2 -- .../Service/Achievement/IAchievementService.cs | 1 - .../Achievement/IAchievementStatisticsService.cs | 2 -- .../Service/Announcement/AnnouncementService.cs | 1 - .../Service/AvatarInfo/AvatarInfoDbBulkOperation.cs | 1 - .../Service/AvatarInfo/AvatarInfoDbService.cs | 3 --- .../Builder/NameIconDescriptionBuilderExtension.cs | 2 -- .../Service/Cultivation/MaterialIdComparer.cs | 1 - .../DailyNote/DailyNoteNotificationOperation.cs | 1 - .../GachaLog/Factory/GachaStatisticsFactory.cs | 1 - .../Service/Game/Unlocker/GameProcessModule.cs | 1 - .../MetadataServiceContextExtension.cs | 1 - .../Snap.Hutao/Service/Update/CheckUpdateResult.cs | 12 ------------ .../Snap.Hutao/Service/Update/LaunchUpdaterResult.cs | 11 ----------- .../ViewModel/Achievement/AchievementImporter.cs | 2 -- .../ViewModel/Achievement/AchievementViewModel.cs | 1 - .../Achievement/AchievementViewModelSlim.cs | 1 - .../ViewModel/AvatarProperty/AvatarView.cs | 1 - .../Game/IViewModelSupportLaunchExecution.cs | 1 - .../ViewModel/Game/LaunchGameLaunchExecution.cs | 6 +++--- .../Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs | 4 +--- .../ViewModel/Game/LaunchGameViewModelSlim.cs | 6 +----- .../SpiralAbyss/SpiralAbyssRecordViewModel.cs | 1 - .../Snap.Hutao/ViewModel/TitleViewModel.cs | 1 - .../SdkStatic/Hk4e/Launcher/ResourceClient.cs | 2 -- .../Builder/Abstraction/IHttpContentBuilder.cs | 2 +- .../Builder/Abstraction/IHttpHeadersBuilder.cs | 2 +- .../Builder/Abstraction/IHttpMethodBuilder.cs | 2 +- .../Abstraction/IHttpRequestMessageBuilder.cs | 2 +- .../Abstraction/IHttpRequestOptionsBuilder.cs | 2 +- 37 files changed, 10 insertions(+), 73 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/IO/FileOperation.cs b/src/Snap.Hutao/Snap.Hutao/Core/IO/FileOperation.cs index 5b80fd6f..9b54261d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/IO/FileOperation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/FileOperation.cs @@ -1,7 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Win32.Foundation; using Snap.Hutao.Win32.System.Com; using Snap.Hutao.Win32.UI.Shell; using System.IO; diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs index 066c2907..494dd476 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs @@ -13,7 +13,6 @@ using Snap.Hutao.Win32; using Snap.Hutao.Win32.Foundation; using Snap.Hutao.Win32.Graphics.Dwm; using Snap.Hutao.Win32.UI.WindowsAndMessaging; -using System.Collections.Frozen; using System.IO; using Windows.Graphics; using Windows.UI; diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowOptions.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowOptions.cs index 3f50032d..d0ddfc2a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowOptions.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Microsoft.UI.Input; -using Microsoft.UI.Windowing; using Microsoft.UI.Xaml; using Snap.Hutao.Win32.Foundation; using Windows.Graphics; diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs index 02dc0eb9..33a5f142 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs @@ -9,7 +9,6 @@ using Snap.Hutao.Win32.UI.Shell; using Snap.Hutao.Win32.UI.WindowsAndMessaging; using static Snap.Hutao.Win32.ComCtl32; using static Snap.Hutao.Win32.ConstValues; -using static Snap.Hutao.Win32.User32; namespace Snap.Hutao.Core.Windowing; diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs index 5db2c9cb..87dae95c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs @@ -3,7 +3,6 @@ using Snap.Hutao.Control; using Snap.Hutao.Model.Intrinsic; -using System.Collections.Frozen; namespace Snap.Hutao.Model.Metadata.Converter; diff --git a/src/Snap.Hutao/Snap.Hutao/Program.cs b/src/Snap.Hutao/Snap.Hutao/Program.cs index 8240cc83..110500f0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Program.cs +++ b/src/Snap.Hutao/Snap.Hutao/Program.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Microsoft.UI.Xaml; -using Snap.Hutao.Core; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using WinRT; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/DbStoreOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/DbStoreOptions.cs index d3ef0c1e..580a1fea 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/DbStoreOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/DbStoreOptions.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using CommunityToolkit.Mvvm.ComponentModel; -using Microsoft.Extensions.Options; using Snap.Hutao.Core.Database; using Snap.Hutao.Model.Entity.Database; using System.Globalization; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementStatisticsService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementStatisticsService.cs index 75d2ef23..29c21f50 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementStatisticsService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementStatisticsService.cs @@ -2,10 +2,8 @@ // Licensed under the MIT license. using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Primitive; using Snap.Hutao.ViewModel.Achievement; using EntityAchievement = Snap.Hutao.Model.Entity.Achievement; -using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement; namespace Snap.Hutao.Service.Achievement; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementService.cs index adbfca29..77e7e814 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementService.cs @@ -5,7 +5,6 @@ using Snap.Hutao.Model.InterChange.Achievement; using Snap.Hutao.ViewModel.Achievement; using System.Collections.ObjectModel; using EntityArchive = Snap.Hutao.Model.Entity.AchievementArchive; -using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement; namespace Snap.Hutao.Service.Achievement; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementStatisticsService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementStatisticsService.cs index 73eb1bf0..10df34fc 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementStatisticsService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementStatisticsService.cs @@ -1,9 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Model.Primitive; using Snap.Hutao.ViewModel.Achievement; -using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement; namespace Snap.Hutao.Service.Achievement; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Announcement/AnnouncementService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Announcement/AnnouncementService.cs index 63507a2f..2fa0b369 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Announcement/AnnouncementService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Announcement/AnnouncementService.cs @@ -7,7 +7,6 @@ using Snap.Hutao.Service.Announcement; using Snap.Hutao.Web.Hoyolab; using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement; using Snap.Hutao.Web.Response; -using System.Collections.Specialized; using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbBulkOperation.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbBulkOperation.cs index 626a2d3c..222047b3 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbBulkOperation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbBulkOperation.cs @@ -12,7 +12,6 @@ using Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Avatar; using Snap.Hutao.Web.Response; -using System.Reflection.Emit; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using CalculateAvatar = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.Avatar; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbService.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbService.cs index d93e048b..e76f1dc5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbService.cs @@ -1,9 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Microsoft.EntityFrameworkCore; -using Snap.Hutao.Core.Database; -using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Service.Abstraction; using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/NameIconDescriptionBuilderExtension.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/NameIconDescriptionBuilderExtension.cs index 5f5474f9..d5e89b81 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/NameIconDescriptionBuilderExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/NameIconDescriptionBuilderExtension.cs @@ -2,8 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Core.Abstraction.Extension; -using Snap.Hutao.Model; -using Snap.Hutao.Model.Intrinsic; using Snap.Hutao.ViewModel.AvatarProperty; namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/MaterialIdComparer.cs b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/MaterialIdComparer.cs index 0d910c93..b579335e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/MaterialIdComparer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/MaterialIdComparer.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Model.Primitive; -using Snap.Hutao.ViewModel.Cultivation; namespace Snap.Hutao.Service.Cultivation; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs index 04266341..5d2c71a3 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs @@ -8,7 +8,6 @@ using Snap.Hutao.Model.Entity; using Snap.Hutao.Service.DailyNote.NotifySuppression; using Snap.Hutao.Service.Game; using Snap.Hutao.Web.Hoyolab.Takumi.Binding; -using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.DailyNote; using Snap.Hutao.Web.Response; namespace Snap.Hutao.Service.DailyNote; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs index cc988e76..5e21fd81 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs @@ -6,7 +6,6 @@ using Snap.Hutao.Model.Intrinsic; using Snap.Hutao.Model.Metadata; using Snap.Hutao.Model.Metadata.Avatar; using Snap.Hutao.Model.Metadata.Weapon; -using Snap.Hutao.Service.Metadata; using Snap.Hutao.Service.Metadata.ContextAbstraction; using Snap.Hutao.ViewModel.GachaLog; using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameProcessModule.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameProcessModule.cs index ece2ad89..cc63bb3d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameProcessModule.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameProcessModule.cs @@ -5,7 +5,6 @@ using Snap.Hutao.Core.Diagnostics; using Snap.Hutao.Win32.Foundation; using Snap.Hutao.Win32.Memory; using Snap.Hutao.Win32.System.ProcessStatus; -using System.Diagnostics; using System.Runtime.InteropServices; using static Snap.Hutao.Win32.Kernel32; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/MetadataServiceContextExtension.cs b/src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/MetadataServiceContextExtension.cs index 8ec47d27..7cd18212 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/MetadataServiceContextExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/MetadataServiceContextExtension.cs @@ -1,7 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Microsoft.EntityFrameworkCore.Metadata.Internal; using Snap.Hutao.Model.Metadata.Avatar; using Snap.Hutao.Model.Metadata.Item; using Snap.Hutao.Model.Metadata.Weapon; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Update/CheckUpdateResult.cs b/src/Snap.Hutao/Snap.Hutao/Service/Update/CheckUpdateResult.cs index f3f7226d..5979086d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Update/CheckUpdateResult.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Update/CheckUpdateResult.cs @@ -1,19 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Core; -using Snap.Hutao.Core.IO.Hashing; -using Snap.Hutao.Core.IO.Http.Sharding; -using Snap.Hutao.Core.Setting; -using Snap.Hutao.Service.Abstraction; -using Snap.Hutao.Service.Notification; using Snap.Hutao.Web.Hutao; -using Snap.Hutao.Web.Hutao.Response; -using Snap.Hutao.Web.Response; -using System.Diagnostics; -using System.IO; -using System.Net.Http; -using Windows.Storage; namespace Snap.Hutao.Service.Update; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Update/LaunchUpdaterResult.cs b/src/Snap.Hutao/Snap.Hutao/Service/Update/LaunchUpdaterResult.cs index 122264f9..f7761319 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Update/LaunchUpdaterResult.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Update/LaunchUpdaterResult.cs @@ -1,18 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Core; -using Snap.Hutao.Core.IO.Hashing; -using Snap.Hutao.Core.IO.Http.Sharding; -using Snap.Hutao.Core.Setting; -using Snap.Hutao.Service.Abstraction; -using Snap.Hutao.Service.Notification; -using Snap.Hutao.Web.Hutao; -using Snap.Hutao.Web.Hutao.Response; using System.Diagnostics; -using System.IO; -using System.Net.Http; -using Windows.Storage; namespace Snap.Hutao.Service.Update; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementImporter.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementImporter.cs index 8779cd21..679fcade 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementImporter.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementImporter.cs @@ -4,8 +4,6 @@ using Microsoft.UI.Xaml.Controls; using Snap.Hutao.Control.Extension; using Snap.Hutao.Core.IO; -using Snap.Hutao.Core.IO.DataTransfer; -using Snap.Hutao.Factory.ContentDialog; using Snap.Hutao.Factory.Picker; using Snap.Hutao.Model.InterChange.Achievement; using Snap.Hutao.Service.Achievement; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs index de4f3cf2..d81338da 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs @@ -16,7 +16,6 @@ using Snap.Hutao.View.Dialog; using System.Collections.ObjectModel; using System.Text.RegularExpressions; using EntityAchievementArchive = Snap.Hutao.Model.Entity.AchievementArchive; -using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement; using MetadataAchievementGoal = Snap.Hutao.Model.Metadata.Achievement.AchievementGoal; using SortDescription = CommunityToolkit.WinUI.Collections.SortDescription; using SortDirection = CommunityToolkit.WinUI.Collections.SortDirection; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModelSlim.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModelSlim.cs index 67803ae3..d901ba7f 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModelSlim.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModelSlim.cs @@ -1,7 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Model.Primitive; using Snap.Hutao.Service.Achievement; using Snap.Hutao.Service.Metadata; using Snap.Hutao.Service.Metadata.ContextAbstraction; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarView.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarView.cs index ca5bdd68..19e599df 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarView.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarView.cs @@ -5,7 +5,6 @@ using Snap.Hutao.Model; using Snap.Hutao.Model.Calculable; using Snap.Hutao.Model.Intrinsic; using Snap.Hutao.Model.Primitive; -using Snap.Hutao.Service.AvatarInfo.Factory.Builder; namespace Snap.Hutao.ViewModel.AvatarProperty; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/IViewModelSupportLaunchExecution.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/IViewModelSupportLaunchExecution.cs index 98fd6d0d..b52c96cf 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/IViewModelSupportLaunchExecution.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/IViewModelSupportLaunchExecution.cs @@ -3,7 +3,6 @@ using Snap.Hutao.Model.Entity; using Snap.Hutao.Service.Game.PathAbstraction; -using Snap.Hutao.Service.Notification; using System.Collections.Immutable; namespace Snap.Hutao.ViewModel.Game; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameLaunchExecution.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameLaunchExecution.cs index 3bf0c471..0c0752a3 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameLaunchExecution.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameLaunchExecution.cs @@ -9,17 +9,17 @@ namespace Snap.Hutao.ViewModel.Game; internal static class LaunchGameLaunchExecution { - public static async ValueTask LaunchExecutionAsync(this IViewModelSupportLaunchExecution launchExecution) + public static async ValueTask LaunchExecutionAsync(this IViewModelSupportLaunchExecution launchExecution, LaunchScheme? targetScheme) { IServiceProvider root = Ioc.Default; IInfoBarService infoBarService = root.GetRequiredService(); ILogger logger = root.GetRequiredService>(); - LaunchScheme? scheme = launchExecution.Shared.GetCurrentLaunchSchemeFromConfigFile(); + // LaunchScheme? scheme = launchExecution.Shared.GetCurrentLaunchSchemeFromConfigFile(); try { // Root service provider is required. - LaunchExecutionContext context = new(root, launchExecution, scheme, launchExecution.SelectedGameAccount); + LaunchExecutionContext context = new(root, launchExecution, targetScheme, launchExecution.SelectedGameAccount); LaunchExecutionResult result = await new LaunchExecutionInvoker().InvokeAsync(context).ConfigureAwait(false); if (result.Kind is not LaunchExecutionResultKind.Ok) diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs index 0f449ef3..fb4b44a9 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Microsoft.Extensions.Caching.Memory; -using Microsoft.UI.Windowing; using Snap.Hutao.Control.Collection.AdvancedCollectionView; using Snap.Hutao.Core; using Snap.Hutao.Core.Database; @@ -11,7 +10,6 @@ using Snap.Hutao.Core.ExceptionService; using Snap.Hutao.Model.Entity; using Snap.Hutao.Service; using Snap.Hutao.Service.Game; -using Snap.Hutao.Service.Game.Launching; using Snap.Hutao.Service.Game.Locator; using Snap.Hutao.Service.Game.PathAbstraction; using Snap.Hutao.Service.Game.Scheme; @@ -216,7 +214,7 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel, IView [Command("LaunchCommand")] private async Task LaunchAsync() { - await this.LaunchExecutionAsync().ConfigureAwait(false); + await this.LaunchExecutionAsync(SelectedScheme).ConfigureAwait(false); } [Command("DetectGameAccountCommand")] diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModelSlim.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModelSlim.cs index bd134f3c..36fb5b0b 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModelSlim.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModelSlim.cs @@ -2,14 +2,10 @@ // Licensed under the MIT license. using Snap.Hutao.Control.Collection.AdvancedCollectionView; -using Snap.Hutao.Core.ExceptionService; using Snap.Hutao.Model.Entity; using Snap.Hutao.Service.Game; -using Snap.Hutao.Service.Game.Launching; -using Snap.Hutao.Service.Game.PathAbstraction; using Snap.Hutao.Service.Game.Scheme; using Snap.Hutao.Service.Notification; -using System.Collections.Immutable; using System.Collections.ObjectModel; namespace Snap.Hutao.ViewModel.Game; @@ -73,6 +69,6 @@ internal sealed partial class LaunchGameViewModelSlim : Abstraction.ViewModelSli [Command("LaunchCommand")] private async Task LaunchAsync() { - await this.LaunchExecutionAsync().ConfigureAwait(false); + await this.LaunchExecutionAsync(launchGameShared.GetCurrentLaunchSchemeFromConfigFile()).ConfigureAwait(false); } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs index cac9964c..8c37b2c6 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using CommunityToolkit.Mvvm.Messaging; -using Microsoft.UI.Xaml.Controls; using Snap.Hutao.Factory.ContentDialog; using Snap.Hutao.Message; using Snap.Hutao.Service.Hutao; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/TitleViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/TitleViewModel.cs index 16c236d7..6094f845 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/TitleViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/TitleViewModel.cs @@ -11,7 +11,6 @@ using Snap.Hutao.Service.Abstraction; using Snap.Hutao.Service.Notification; using Snap.Hutao.Service.Update; using Snap.Hutao.View.Dialog; -using System.Diagnostics; using System.Globalization; using System.Text; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/ResourceClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/ResourceClient.cs index ca3cc16f..5a7c849d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/ResourceClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/ResourceClient.cs @@ -8,9 +8,7 @@ using Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher.Resource; using Snap.Hutao.Web.Request.Builder; using Snap.Hutao.Web.Request.Builder.Abstraction; using Snap.Hutao.Web.Response; -using System.IO; using System.Net.Http; -using System.Text; namespace Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpContentBuilder.cs b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpContentBuilder.cs index 52a6ffd0..ce3f206b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpContentBuilder.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpContentBuilder.cs @@ -1,8 +1,8 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using System.Net.Http; using Snap.Hutao.Core.Abstraction; +using System.Net.Http; namespace Snap.Hutao.Web.Request.Builder.Abstraction; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpHeadersBuilder.cs b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpHeadersBuilder.cs index ecea5bf2..d87421cc 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpHeadersBuilder.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpHeadersBuilder.cs @@ -1,8 +1,8 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using System.Net.Http.Headers; using Snap.Hutao.Core.Abstraction; +using System.Net.Http.Headers; namespace Snap.Hutao.Web.Request.Builder.Abstraction; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpMethodBuilder.cs b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpMethodBuilder.cs index 5c29f4ad..fd705628 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpMethodBuilder.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpMethodBuilder.cs @@ -1,8 +1,8 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using System.Net.Http; using Snap.Hutao.Core.Abstraction; +using System.Net.Http; namespace Snap.Hutao.Web.Request.Builder.Abstraction; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpRequestMessageBuilder.cs b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpRequestMessageBuilder.cs index eb5f7d83..4f1928e6 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpRequestMessageBuilder.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpRequestMessageBuilder.cs @@ -1,8 +1,8 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using System.Net.Http; using Snap.Hutao.Core.Abstraction; +using System.Net.Http; namespace Snap.Hutao.Web.Request.Builder.Abstraction; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpRequestOptionsBuilder.cs b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpRequestOptionsBuilder.cs index 132820eb..f4e629df 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpRequestOptionsBuilder.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/Abstraction/IHttpRequestOptionsBuilder.cs @@ -1,8 +1,8 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using System.Net.Http; using Snap.Hutao.Core.Abstraction; +using System.Net.Http; namespace Snap.Hutao.Web.Request.Builder.Abstraction;