Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix detect game account crash

Browse Source
This commit is contained in:
DismissedLight
2023-09-26 22:26:01 +08:00
parent 4a1dccd7ac
commit bafee4ba18
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Snap.Hutao/Snap.Hutao/Service/Notification/IInfoBarService.cs
View File

@@ -22,7 +22,7 @@ internal interface IInfoBarService
/// </summary> /// </summary>
/// <param name="message">消息</param> /// <param name="message">消息</param>
/// <param name="delay">关闭延迟</param> /// <param name="delay">关闭延迟</param>
void Error(string message, int delay = 60000); void Error(string message, int delay = 30000);
/// <summary> /// <summary>
/// 显示错误消息 /// 显示错误消息
@@ -30,14 +30,14 @@ internal interface IInfoBarService
/// <param name="title">标题</param> /// <param name="title">标题</param>
/// <param name="message">消息</param> /// <param name="message">消息</param>
/// <param name="delay">关闭延迟</param> /// <param name="delay">关闭延迟</param>
void Error(string title, string message, int delay = 60000); void Error(string title, string message, int delay = 30000);
/// <summary> /// <summary>
/// 显示错误消息 /// 显示错误消息
/// </summary> /// </summary>
/// <param name="exception">异常</param> /// <param name="exception">异常</param>
/// <param name="delay">关闭延迟</param> /// <param name="delay">关闭延迟</param>
void Error(Exception exception, int delay = 60000); void Error(Exception exception, int delay = 30000);
/// <summary> /// <summary>
/// 显示错误消息 /// 显示错误消息
@@ -45,7 +45,7 @@ internal interface IInfoBarService
/// <param name="exception">异常</param> /// <param name="exception">异常</param>
/// <param name="title">标题</param> /// <param name="title">标题</param>
/// <param name="delay">关闭延迟</param> /// <param name="delay">关闭延迟</param>
void Error(Exception exception, string title, int delay = 60000); void Error(Exception exception, string title, int delay = 30000);
/// <summary> /// <summary>
/// 显示提示信息 /// 显示提示信息
@@ -82,7 +82,7 @@ internal interface IInfoBarService
/// </summary> /// </summary>
/// <param name="message">消息</param> /// <param name="message">消息</param>
/// <param name="delay">关闭延迟</param> /// <param name="delay">关闭延迟</param>
void Warning(string message, int delay = 30000); void Warning(string message, int delay = 15000);
/// <summary> /// <summary>
/// 显示警告信息 /// 显示警告信息
@@ -90,5 +90,5 @@ internal interface IInfoBarService
/// <param name="title">标题</param> /// <param name="title">标题</param>
/// <param name="message">消息</param> /// <param name="message">消息</param>
/// <param name="delay">关闭延迟</param> /// <param name="delay">关闭延迟</param>
void Warning(string title, string message, int delay = 30000); void Warning(string title, string message, int delay = 15000);
} }

4
src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs
View File

@@ -149,6 +149,10 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel
SelectedGameAccount ??= gameService.DetectCurrentGameAccount(); SelectedGameAccount ??= gameService.DetectCurrentGameAccount();
} }
} }
catch (UserdataCorruptedException ex)
{
infoBarService.Error(ex);
}
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
} }

9
src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModelSlim.cs
View File

@@ -1,6 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved. // Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license. // Licensed under the MIT license.
using Snap.Hutao.Core.ExceptionService;
using Snap.Hutao.Model.Entity; using Snap.Hutao.Model.Entity;
using Snap.Hutao.Service.Game; using Snap.Hutao.Service.Game;
using Snap.Hutao.Service.Notification; using Snap.Hutao.Service.Notification;
@@ -17,6 +18,7 @@ internal sealed partial class LaunchGameViewModelSlim : Abstraction.ViewModelSli
{ {
private readonly IGameService gameService; private readonly IGameService gameService;
private readonly ITaskContext taskContext; private readonly ITaskContext taskContext;
private readonly IInfoBarService infoBarService;
private ObservableCollection<GameAccount>? gameAccounts; private ObservableCollection<GameAccount>? gameAccounts;
private GameAccount? selectedGameAccount; private GameAccount? selectedGameAccount;
@@ -38,9 +40,16 @@ internal sealed partial class LaunchGameViewModelSlim : Abstraction.ViewModelSli
await taskContext.SwitchToMainThreadAsync(); await taskContext.SwitchToMainThreadAsync();
GameAccounts = accounts; GameAccounts = accounts;
try
{
// Try set to the current account. // Try set to the current account.
SelectedGameAccount ??= gameService.DetectCurrentGameAccount(); SelectedGameAccount ??= gameService.DetectCurrentGameAccount();
} }
catch (UserdataCorruptedException ex)
{
infoBarService.Error(ex);
}
}
[Command("LaunchCommand", AllowConcurrentExecutions = true)] [Command("LaunchCommand", AllowConcurrentExecutions = true)]
private async Task LaunchAsync() private async Task LaunchAsync()