mirror of
https://github.com/wangdage12/Snap.Hutao.git
synced 2026-02-18 02:42:15 +08:00
Compare commits
2 Commits
56c36a01ae
...
db6df72791
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db6df72791 | ||
|
|
bd9f188ac1 |
@@ -39,6 +39,7 @@ internal static class DependencyInjection
|
|||||||
.AddJsonOptions()
|
.AddJsonOptions()
|
||||||
.AddDatabase()
|
.AddDatabase()
|
||||||
.AddServices()
|
.AddServices()
|
||||||
|
.AddThirdPartyToolService()
|
||||||
.AddResponseValidation()
|
.AddResponseValidation()
|
||||||
.AddConfiguredHttpClients()
|
.AddConfiguredHttpClients()
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
|
|||||||
using Snap.Hutao.Core.Text.Json;
|
using Snap.Hutao.Core.Text.Json;
|
||||||
using Snap.Hutao.Factory.Process;
|
using Snap.Hutao.Factory.Process;
|
||||||
using Snap.Hutao.Model.Entity.Database;
|
using Snap.Hutao.Model.Entity.Database;
|
||||||
|
using Snap.Hutao.Service.ThirdPartyTool;
|
||||||
using Snap.Hutao.Win32;
|
using Snap.Hutao.Win32;
|
||||||
using System.Data.Common;
|
using System.Data.Common;
|
||||||
|
|
||||||
@@ -66,5 +67,10 @@ internal static partial class ServiceCollectionExtension
|
|||||||
.UseSqlite(sqlConnectionString);
|
.UseSqlite(sqlConnectionString);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IServiceCollection AddThirdPartyToolService()
|
||||||
|
{
|
||||||
|
return services.AddSingleton<IThirdPartyToolService, ThirdPartyToolService>();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1208,6 +1208,12 @@
|
|||||||
<data name="ServiceYaeWaitForGameResponseMessage" xml:space="preserve">
|
<data name="ServiceYaeWaitForGameResponseMessage" xml:space="preserve">
|
||||||
<value>正在等待游戏数据</value>
|
<value>正在等待游戏数据</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ServiceThirdPartyToolNoExecutableFound" xml:space="preserve">
|
||||||
|
<value>未找到可执行文件</value>
|
||||||
|
</data>
|
||||||
|
<data name="ServiceThirdPartyToolFileNotFound" xml:space="preserve">
|
||||||
|
<value>文件不存在:{0}</value>
|
||||||
|
</data>
|
||||||
<data name="UIViewMainTitleBarBackgroundActivityAction" xml:space="preserve">
|
<data name="UIViewMainTitleBarBackgroundActivityAction" xml:space="preserve">
|
||||||
<value>后台任务</value>
|
<value>后台任务</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1586,6 +1592,12 @@
|
|||||||
<data name="ViewDialogLaunchGamePackageConvertTitle" xml:space="preserve">
|
<data name="ViewDialogLaunchGamePackageConvertTitle" xml:space="preserve">
|
||||||
<value>正在转换客户端</value>
|
<value>正在转换客户端</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewDialogThirdPartyToolDescription" xml:space="preserve">
|
||||||
|
<value>工具描述:</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewDialogThirdPartyToolLaunch" xml:space="preserve">
|
||||||
|
<value>启动</value>
|
||||||
|
</data>
|
||||||
<data name="ViewDialogQRCodeTitle" xml:space="preserve">
|
<data name="ViewDialogQRCodeTitle" xml:space="preserve">
|
||||||
<value>使用米游社扫描二维码</value>
|
<value>使用米游社扫描二维码</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -2916,6 +2928,9 @@
|
|||||||
<data name="ViewPageLaunchGameInjectionHeader" xml:space="preserve">
|
<data name="ViewPageLaunchGameInjectionHeader" xml:space="preserve">
|
||||||
<value>注入</value>
|
<value>注入</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewPageLaunchGameThirdPartyTools" xml:space="preserve">
|
||||||
|
<value>第三方注入工具:</value>
|
||||||
|
</data>
|
||||||
<data name="ViewPageLaunchGameIslandConnected" xml:space="preserve">
|
<data name="ViewPageLaunchGameIslandConnected" xml:space="preserve">
|
||||||
<value>已连接到游戏,更改设置将会动态反映到游戏中</value>
|
<value>已连接到游戏,更改设置将会动态反映到游戏中</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
using Snap.Hutao.Web.ThirdPartyTool;
|
||||||
|
using System.Collections.Immutable;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service.ThirdPartyTool;
|
||||||
|
|
||||||
|
internal interface IThirdPartyToolService
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 获取第三方工具列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="token">取消令牌</param>
|
||||||
|
/// <returns>工具列表</returns>
|
||||||
|
ValueTask<ImmutableArray<ToolInfo>> GetToolsAsync(CancellationToken token = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 下载工具文件
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="tool">工具信息</param>
|
||||||
|
/// <param name="progress">进度报告</param>
|
||||||
|
/// <param name="token">取消令牌</param>
|
||||||
|
/// <returns>是否下载成功</returns>
|
||||||
|
ValueTask<bool> DownloadToolAsync(ToolInfo tool, IProgress<double>? progress = null, CancellationToken token = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 启动工具
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="tool">工具信息</param>
|
||||||
|
/// <returns>是否启动成功</returns>
|
||||||
|
ValueTask<bool> LaunchToolAsync(ToolInfo tool);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检查工具是否已下载
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="tool">工具信息</param>
|
||||||
|
/// <returns>是否已下载</returns>
|
||||||
|
bool IsToolDownloaded(ToolInfo tool);
|
||||||
|
}
|
||||||
@@ -0,0 +1,213 @@
|
|||||||
|
using Snap.Hutao.Core;
|
||||||
|
using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
|
||||||
|
using Snap.Hutao.Core.ExceptionService;
|
||||||
|
using Snap.Hutao.Service.Notification;
|
||||||
|
using Snap.Hutao.Web.Request.Builder;
|
||||||
|
using Snap.Hutao.Web.Request.Builder.Abstraction;
|
||||||
|
using Snap.Hutao.Web.ThirdPartyTool;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.IO;
|
||||||
|
using System.Net.Http;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service.ThirdPartyTool;
|
||||||
|
|
||||||
|
[HttpClient(HttpClientConfiguration.Default)]
|
||||||
|
[Service(ServiceLifetime.Singleton, typeof(IThirdPartyToolService))]
|
||||||
|
internal sealed partial class ThirdPartyToolService : IThirdPartyToolService
|
||||||
|
{
|
||||||
|
private const string ApiBaseUrl = "https://htserver.wdg.cloudns.ch/api";
|
||||||
|
private const string ToolsEndpoint = "/tools";
|
||||||
|
|
||||||
|
private readonly IHttpClientFactory httpClientFactory;
|
||||||
|
private readonly IHttpRequestMessageBuilderFactory httpRequestMessageBuilderFactory;
|
||||||
|
private readonly IMessenger messenger;
|
||||||
|
|
||||||
|
[GeneratedConstructor]
|
||||||
|
public partial ThirdPartyToolService(IServiceProvider serviceProvider, HttpClient httpClient);
|
||||||
|
|
||||||
|
public async ValueTask<ImmutableArray<ToolInfo>> GetToolsAsync(CancellationToken token = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
HttpClient httpClient = httpClientFactory.CreateClient();
|
||||||
|
|
||||||
|
// 添加日志
|
||||||
|
SentrySdk.AddBreadcrumb($"Creating request to: {ApiBaseUrl}{ToolsEndpoint}", category: "ThirdPartyTool");
|
||||||
|
|
||||||
|
HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create()
|
||||||
|
.SetRequestUri($"{ApiBaseUrl}{ToolsEndpoint}")
|
||||||
|
.Get();
|
||||||
|
|
||||||
|
SentrySdk.AddBreadcrumb($"Sending HTTP request", category: "ThirdPartyTool");
|
||||||
|
|
||||||
|
ToolApiResponse? response = await builder
|
||||||
|
.SendAsync<ToolApiResponse>(httpClient, token)
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
|
SentrySdk.AddBreadcrumb($"Request completed", category: "ThirdPartyTool");
|
||||||
|
|
||||||
|
if (response is null)
|
||||||
|
{
|
||||||
|
SentrySdk.AddBreadcrumb("Response is null", category: "ThirdPartyTool");
|
||||||
|
return ImmutableArray<ToolInfo>.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
SentrySdk.AddBreadcrumb($"Response received: Code={response.Code}, Message={response.Message}, Data.Length={response.Data.Length}", category: "ThirdPartyTool");
|
||||||
|
|
||||||
|
if (response.Code != 0)
|
||||||
|
{
|
||||||
|
SentrySdk.AddBreadcrumb($"API returned error code: {response.Code}, Message: {response.Message}", category: "ThirdPartyTool");
|
||||||
|
return ImmutableArray<ToolInfo>.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.Data;
|
||||||
|
}
|
||||||
|
catch (HttpRequestException ex)
|
||||||
|
{
|
||||||
|
SentrySdk.AddBreadcrumb($"HTTP request failed: {ex.Message}", category: "ThirdPartyTool");
|
||||||
|
SentrySdk.CaptureException(ex);
|
||||||
|
return ImmutableArray<ToolInfo>.Empty;
|
||||||
|
}
|
||||||
|
catch (TaskCanceledException ex)
|
||||||
|
{
|
||||||
|
SentrySdk.AddBreadcrumb($"Request timed out or was cancelled: {ex.Message}", category: "ThirdPartyTool");
|
||||||
|
SentrySdk.CaptureException(ex);
|
||||||
|
return ImmutableArray<ToolInfo>.Empty;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
SentrySdk.AddBreadcrumb($"Failed to get third party tools: {ex.Message}", category: "ThirdPartyTool");
|
||||||
|
SentrySdk.CaptureException(ex);
|
||||||
|
return ImmutableArray<ToolInfo>.Empty;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<bool> DownloadToolAsync(ToolInfo tool, IProgress<double>? progress = null, CancellationToken token = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string toolDirectory = GetToolDirectory(tool);
|
||||||
|
Directory.CreateDirectory(toolDirectory);
|
||||||
|
|
||||||
|
int totalFiles = tool.Files.Count;
|
||||||
|
int downloadedFiles = 0;
|
||||||
|
|
||||||
|
using (HttpClient httpClient = httpClientFactory.CreateClient())
|
||||||
|
{
|
||||||
|
foreach (string fileName in tool.Files)
|
||||||
|
{
|
||||||
|
string fileUrl = $"{tool.Url}{fileName}";
|
||||||
|
string localFilePath = Path.Combine(toolDirectory, fileName);
|
||||||
|
|
||||||
|
// 如果文件已存在,跳过下载
|
||||||
|
if (File.Exists(localFilePath))
|
||||||
|
{
|
||||||
|
downloadedFiles++;
|
||||||
|
progress?.Report((double)downloadedFiles / totalFiles * 100);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 下载文件
|
||||||
|
HttpResponseMessage response = await httpClient.GetAsync(fileUrl, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false);
|
||||||
|
response.EnsureSuccessStatusCode();
|
||||||
|
|
||||||
|
using (Stream contentStream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
|
||||||
|
using (FileStream fileStream = new(localFilePath, FileMode.Create, FileAccess.Write, FileShare.None))
|
||||||
|
{
|
||||||
|
await contentStream.CopyToAsync(fileStream, token).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
downloadedFiles++;
|
||||||
|
progress?.Report((double)downloadedFiles / totalFiles * 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
messenger.Send(InfoBarMessage.Error(ex));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<bool> LaunchToolAsync(ToolInfo tool)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string toolDirectory = GetToolDirectory(tool);
|
||||||
|
|
||||||
|
// 查找可执行文件(.exe)
|
||||||
|
string? executablePath = tool.Files.FirstOrDefault(f => f.EndsWith(".exe", StringComparison.OrdinalIgnoreCase));
|
||||||
|
if (string.IsNullOrEmpty(executablePath))
|
||||||
|
{
|
||||||
|
messenger.Send(InfoBarMessage.Warning(SH.ServiceThirdPartyToolNoExecutableFound));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
string fullPath = Path.Combine(toolDirectory, executablePath);
|
||||||
|
if (!File.Exists(fullPath))
|
||||||
|
{
|
||||||
|
messenger.Send(InfoBarMessage.Warning(SH.FormatServiceThirdPartyToolFileNotFound(fullPath)));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 尝试以管理员权限启动
|
||||||
|
ProcessStartInfo startInfo = new()
|
||||||
|
{
|
||||||
|
FileName = fullPath,
|
||||||
|
WorkingDirectory = toolDirectory,
|
||||||
|
UseShellExecute = true,
|
||||||
|
Verb = "runas", // 请求管理员权限
|
||||||
|
};
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Process.Start(startInfo);
|
||||||
|
}
|
||||||
|
catch (System.ComponentModel.Win32Exception)
|
||||||
|
{
|
||||||
|
// 用户拒绝了管理员权限,尝试以普通权限启动
|
||||||
|
startInfo.Verb = string.Empty;
|
||||||
|
startInfo.UseShellExecute = false;
|
||||||
|
Process.Start(startInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
messenger.Send(InfoBarMessage.Error(ex));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsToolDownloaded(ToolInfo tool)
|
||||||
|
{
|
||||||
|
string toolDirectory = GetToolDirectory(tool);
|
||||||
|
if (!Directory.Exists(toolDirectory))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查所有文件是否存在
|
||||||
|
foreach (string fileName in tool.Files)
|
||||||
|
{
|
||||||
|
string filePath = Path.Combine(toolDirectory, fileName);
|
||||||
|
if (!File.Exists(filePath))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetToolDirectory(ToolInfo tool)
|
||||||
|
{
|
||||||
|
// 使用数据目录/工具名作为存储路径
|
||||||
|
return Path.Combine(HutaoRuntime.DataDirectory, "Tools", tool.Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
<ContentDialog
|
||||||
|
x:Class="Snap.Hutao.UI.Xaml.View.Dialog.ThirdPartyToolDialog"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
|
||||||
|
Title="{x:Bind Tool.Name, Mode=OneWay}"
|
||||||
|
CloseButtonText="{shuxm:ResourceString Name=ContentDialogCancelCloseButtonText}"
|
||||||
|
DefaultButton="Primary"
|
||||||
|
PrimaryButtonText="{shuxm:ResourceString Name=ViewDialogThirdPartyToolLaunch}"
|
||||||
|
Style="{StaticResource DefaultContentDialogStyle}"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
|
||||||
|
<Grid RowSpacing="12">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="0"
|
||||||
|
Style="{StaticResource BodyTextBlockStyle}"
|
||||||
|
Text="{shuxm:ResourceString Name=ViewDialogThirdPartyToolDescription}"
|
||||||
|
TextWrapping="Wrap"/>
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="1"
|
||||||
|
Style="{StaticResource BodyStrongTextBlockStyle}"
|
||||||
|
Text="{x:Bind Tool.Description, Mode=OneWay}"
|
||||||
|
TextWrapping="Wrap"/>
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
Grid.Row="2"
|
||||||
|
Height="4"
|
||||||
|
IsIndeterminate="{x:Bind IsDownloading.Value, Mode=OneWay, FallbackValue=False}"
|
||||||
|
Visibility="{x:Bind IsDownloading.Value, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
|
||||||
|
</Grid>
|
||||||
|
</ContentDialog>
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
using Microsoft.UI.Xaml.Controls;
|
||||||
|
using Snap.Hutao.Factory.ContentDialog;
|
||||||
|
using Snap.Hutao.Service.Notification;
|
||||||
|
using Snap.Hutao.Service.ThirdPartyTool;
|
||||||
|
using Snap.Hutao.Web.ThirdPartyTool;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.UI.Xaml.View.Dialog;
|
||||||
|
|
||||||
|
[DependencyProperty<ToolInfo>("Tool")]
|
||||||
|
[DependencyProperty<bool>("IsDownloading", DefaultValue = false)]
|
||||||
|
internal sealed partial class ThirdPartyToolDialog : ContentDialog
|
||||||
|
{
|
||||||
|
private readonly IContentDialogFactory contentDialogFactory;
|
||||||
|
private readonly IThirdPartyToolService thirdPartyToolService;
|
||||||
|
private readonly IMessenger messenger;
|
||||||
|
|
||||||
|
[GeneratedConstructor(InitializeComponent = true)]
|
||||||
|
public partial ThirdPartyToolDialog(IServiceProvider serviceProvider);
|
||||||
|
|
||||||
|
public ThirdPartyToolDialog(IServiceProvider serviceProvider, ToolInfo tool)
|
||||||
|
: this(serviceProvider)
|
||||||
|
{
|
||||||
|
Tool = tool;
|
||||||
|
PrimaryButtonClick += OnPrimaryButtonClick;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnPrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
|
||||||
|
{
|
||||||
|
args.Cancel = true;
|
||||||
|
HandleLaunchAsync().SafeForget();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task HandleLaunchAsync()
|
||||||
|
{
|
||||||
|
// 在 UI 线程上获取 Tool 的引用,避免后续跨线程访问依赖属性
|
||||||
|
ToolInfo? tool = Tool;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
IsDownloading = true;
|
||||||
|
|
||||||
|
// 检查工具是否已下载
|
||||||
|
if (tool is not null && !thirdPartyToolService.IsToolDownloaded(tool))
|
||||||
|
{
|
||||||
|
// 下载工具
|
||||||
|
bool downloadSuccess = await thirdPartyToolService.DownloadToolAsync(tool, null).ConfigureAwait(false);
|
||||||
|
if (!downloadSuccess)
|
||||||
|
{
|
||||||
|
await contentDialogFactory.TaskContext.SwitchToMainThreadAsync();
|
||||||
|
IsDownloading = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 启动工具
|
||||||
|
if (tool is not null)
|
||||||
|
{
|
||||||
|
bool launchSuccess = await thirdPartyToolService.LaunchToolAsync(tool).ConfigureAwait(false);
|
||||||
|
if (launchSuccess)
|
||||||
|
{
|
||||||
|
await contentDialogFactory.TaskContext.SwitchToMainThreadAsync();
|
||||||
|
Hide();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
messenger.Send(InfoBarMessage.Error(ex));
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
await contentDialogFactory.TaskContext.SwitchToMainThreadAsync();
|
||||||
|
IsDownloading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
<shuxc:ScopedPage
|
<shuxc:ScopedPage
|
||||||
x:Class="Snap.Hutao.UI.Xaml.View.Page.LaunchGamePage"
|
x:Class="Snap.Hutao.UI.Xaml.View.Page.LaunchGamePage"
|
||||||
|
x:Name="PageRoot"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:cw="using:CommunityToolkit.WinUI"
|
xmlns:cw="using:CommunityToolkit.WinUI"
|
||||||
@@ -11,6 +12,7 @@
|
|||||||
xmlns:shsg="using:Snap.Hutao.Service.Game"
|
xmlns:shsg="using:Snap.Hutao.Service.Game"
|
||||||
xmlns:shsgp="using:Snap.Hutao.Service.Game.PathAbstraction"
|
xmlns:shsgp="using:Snap.Hutao.Service.Game.PathAbstraction"
|
||||||
xmlns:shux="using:Snap.Hutao.UI.Xaml"
|
xmlns:shux="using:Snap.Hutao.UI.Xaml"
|
||||||
|
xmlns:shwt="using:Snap.Hutao.Web.ThirdPartyTool"
|
||||||
xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
|
xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
|
||||||
xmlns:shuxba="using:Snap.Hutao.UI.Xaml.Behavior.Action"
|
xmlns:shuxba="using:Snap.Hutao.UI.Xaml.Behavior.Action"
|
||||||
xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
|
xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
|
||||||
@@ -558,13 +560,49 @@
|
|||||||
Margin="16"
|
Margin="16"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
|
cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
|
||||||
<Grid Style="{ThemeResource AcrylicGridCardStyle}">
|
<StackPanel Spacing="8">
|
||||||
<Grid.RowDefinitions>
|
<!-- 第三方注入工具 -->
|
||||||
<RowDefinition Height="auto"/>
|
<Grid Style="{ThemeResource AcrylicGridCardStyle}" Visibility="{Binding ThirdPartyTools.Value, Converter={StaticResource EmptyCollectionToVisibilityConverter}}">
|
||||||
<RowDefinition Height="auto"/>
|
<Grid Padding="16,12" ColumnSpacing="12">
|
||||||
<RowDefinition Height="auto"/>
|
<Grid.ColumnDefinitions>
|
||||||
<RowDefinition/>
|
<ColumnDefinition Width="auto"/>
|
||||||
</Grid.RowDefinitions>
|
<ColumnDefinition/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<TextBlock
|
||||||
|
Grid.Column="0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Style="{StaticResource BodyStrongTextBlockStyle}"
|
||||||
|
Text="{shuxm:ResourceString Name=ViewPageLaunchGameThirdPartyTools}"/>
|
||||||
|
<ItemsControl
|
||||||
|
Grid.Column="1"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
ItemsSource="{Binding ThirdPartyTools.Value, Mode=OneWay}">
|
||||||
|
<ItemsControl.ItemsPanel>
|
||||||
|
<ItemsPanelTemplate>
|
||||||
|
<StackPanel Orientation="Horizontal" Spacing="8"/>
|
||||||
|
</ItemsPanelTemplate>
|
||||||
|
</ItemsControl.ItemsPanel>
|
||||||
|
<ItemsControl.ItemTemplate>
|
||||||
|
<DataTemplate x:DataType="shwt:ToolInfo">
|
||||||
|
<Button
|
||||||
|
Padding="12,6"
|
||||||
|
Command="{Binding DataContext.ShowThirdPartyToolDialogCommand, ElementName=PageRoot}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
Content="{Binding Name}"
|
||||||
|
Style="{ThemeResource AccentButtonStyle}"/>
|
||||||
|
</DataTemplate>
|
||||||
|
</ItemsControl.ItemTemplate>
|
||||||
|
</ItemsControl>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid Style="{ThemeResource AcrylicGridCardStyle}">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="auto"/>
|
||||||
|
<RowDefinition Height="auto"/>
|
||||||
|
<RowDefinition Height="auto"/>
|
||||||
|
<RowDefinition/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
<Grid
|
<Grid
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Padding="16,8"
|
Padding="16,8"
|
||||||
@@ -923,6 +961,7 @@
|
|||||||
</ContentControl>
|
</ContentControl>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
</PivotItem>
|
</PivotItem>
|
||||||
</Pivot>
|
</Pivot>
|
||||||
|
|||||||
@@ -16,11 +16,13 @@ using Snap.Hutao.Service.Game.PathAbstraction;
|
|||||||
using Snap.Hutao.Service.Game.Scheme;
|
using Snap.Hutao.Service.Game.Scheme;
|
||||||
using Snap.Hutao.Service.Navigation;
|
using Snap.Hutao.Service.Navigation;
|
||||||
using Snap.Hutao.Service.Notification;
|
using Snap.Hutao.Service.Notification;
|
||||||
|
using Snap.Hutao.Service.ThirdPartyTool;
|
||||||
using Snap.Hutao.Service.User;
|
using Snap.Hutao.Service.User;
|
||||||
using Snap.Hutao.UI.Input.LowLevel;
|
using Snap.Hutao.UI.Input.LowLevel;
|
||||||
using Snap.Hutao.UI.Xaml.View.Dialog;
|
using Snap.Hutao.UI.Xaml.View.Dialog;
|
||||||
using Snap.Hutao.UI.Xaml.View.Window;
|
using Snap.Hutao.UI.Xaml.View.Window;
|
||||||
using Snap.Hutao.ViewModel.User;
|
using Snap.Hutao.ViewModel.User;
|
||||||
|
using Snap.Hutao.Web.ThirdPartyTool;
|
||||||
using System.Collections.Immutable;
|
using System.Collections.Immutable;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
||||||
@@ -54,6 +56,9 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel, IView
|
|||||||
|
|
||||||
public ImmutableArray<LaunchScheme> KnownSchemes { get; } = KnownLaunchSchemes.Values;
|
public ImmutableArray<LaunchScheme> KnownSchemes { get; } = KnownLaunchSchemes.Values;
|
||||||
|
|
||||||
|
private IObservableProperty<ImmutableArray<ToolInfo>> thirdPartyToolsField = new ObservableProperty<ImmutableArray<ToolInfo>>(ImmutableArray<ToolInfo>.Empty);
|
||||||
|
public IObservableProperty<ImmutableArray<ToolInfo>> ThirdPartyTools { get => thirdPartyToolsField; }
|
||||||
|
|
||||||
LaunchScheme? IViewModelSupportLaunchExecution.TargetScheme { get => TargetSchemeFilteredGameAccountsView.Scheme; }
|
LaunchScheme? IViewModelSupportLaunchExecution.TargetScheme { get => TargetSchemeFilteredGameAccountsView.Scheme; }
|
||||||
|
|
||||||
LaunchScheme? IViewModelSupportLaunchExecution.CurrentScheme { get => Shared.GetCurrentLaunchSchemeFromConfigurationFile(); }
|
LaunchScheme? IViewModelSupportLaunchExecution.CurrentScheme { get => Shared.GetCurrentLaunchSchemeFromConfigurationFile(); }
|
||||||
@@ -123,6 +128,20 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel, IView
|
|||||||
|
|
||||||
await HandleGamePathEntryChangeAsync().ConfigureAwait(false);
|
await HandleGamePathEntryChangeAsync().ConfigureAwait(false);
|
||||||
Shared.ResumeLaunchExecutionAsync(this).SafeForget();
|
Shared.ResumeLaunchExecutionAsync(this).SafeForget();
|
||||||
|
|
||||||
|
// 初始化第三方工具列表
|
||||||
|
try
|
||||||
|
{
|
||||||
|
ImmutableArray<ToolInfo> tools = await InitializeThirdPartyToolsAsync().ConfigureAwait(false);
|
||||||
|
SentrySdk.AddBreadcrumb($"Initialized {tools.Length} third party tools", category: "ThirdPartyTool");
|
||||||
|
thirdPartyToolsField.Value = tools;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
SentrySdk.AddBreadcrumb($"Failed to initialize third party tools: {ex.Message}", category: "ThirdPartyTool");
|
||||||
|
SentrySdk.CaptureException(ex);
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -302,4 +321,40 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel, IView
|
|||||||
|
|
||||||
await GameLifeCycle.TryKillGameProcessAsync(taskContext).ConfigureAwait(false);
|
await GameLifeCycle.TryKillGameProcessAsync(taskContext).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Command("ShowThirdPartyToolDialogCommand")]
|
||||||
|
private async Task ShowThirdPartyToolDialogAsync(ToolInfo tool)
|
||||||
|
{
|
||||||
|
SentrySdk.AddBreadcrumb(BreadcrumbFactory.CreateUI("Show third party tool dialog", "LaunchGameViewModel.Command"));
|
||||||
|
|
||||||
|
using (IServiceScope scope = serviceProvider.CreateScope())
|
||||||
|
{
|
||||||
|
ThirdPartyToolDialog dialog = await scope.ServiceProvider
|
||||||
|
.GetRequiredService<IContentDialogFactory>()
|
||||||
|
.CreateInstanceAsync<ThirdPartyToolDialog>(scope.ServiceProvider, tool);
|
||||||
|
|
||||||
|
await dialog.ShowAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async ValueTask<ImmutableArray<ToolInfo>> InitializeThirdPartyToolsAsync()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
SentrySdk.AddBreadcrumb("Starting to initialize third party tools", category: "ThirdPartyTool");
|
||||||
|
IThirdPartyToolService thirdPartyToolService = serviceProvider.GetRequiredService<IThirdPartyToolService>();
|
||||||
|
SentrySdk.AddBreadcrumb("Got IThirdPartyToolService instance", category: "ThirdPartyTool");
|
||||||
|
|
||||||
|
ImmutableArray<ToolInfo> tools = await thirdPartyToolService.GetToolsAsync().ConfigureAwait(false);
|
||||||
|
SentrySdk.AddBreadcrumb($"Got {tools.Length} tools from service", category: "ThirdPartyTool");
|
||||||
|
|
||||||
|
return tools;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
SentrySdk.AddBreadcrumb($"Failed to initialize third party tools: {ex.Message}", category: "ThirdPartyTool");
|
||||||
|
SentrySdk.CaptureException(ex);
|
||||||
|
return ImmutableArray<ToolInfo>.Empty;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
using Snap.Hutao.Web.Response;
|
||||||
|
using System.Collections.Immutable;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Web.ThirdPartyTool;
|
||||||
|
|
||||||
|
internal sealed class ToolApiResponse
|
||||||
|
{
|
||||||
|
[JsonPropertyName("code")]
|
||||||
|
public int Code { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("message")]
|
||||||
|
public string Message { get; set; } = default!;
|
||||||
|
|
||||||
|
[JsonPropertyName("data")]
|
||||||
|
public ImmutableArray<ToolInfo> Data { get; set; } = ImmutableArray<ToolInfo>.Empty;
|
||||||
|
}
|
||||||
19
src/Snap.Hutao/Snap.Hutao/Web/ThirdPartyTool/ToolInfo.cs
Normal file
19
src/Snap.Hutao/Snap.Hutao/Web/ThirdPartyTool/ToolInfo.cs
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Web.ThirdPartyTool;
|
||||||
|
|
||||||
|
internal sealed class ToolInfo
|
||||||
|
{
|
||||||
|
[JsonPropertyName("name")]
|
||||||
|
public string Name { get; set; } = default!;
|
||||||
|
|
||||||
|
[JsonPropertyName("desc")]
|
||||||
|
public string Description { get; set; } = default!;
|
||||||
|
|
||||||
|
[JsonPropertyName("url")]
|
||||||
|
public string Url { get; set; } = default!;
|
||||||
|
|
||||||
|
[JsonPropertyName("files")]
|
||||||
|
public List<string> Files { get; set; } = default!;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user