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 #1087 and improve some null checks

Browse Source
This commit is contained in:
DismissedLight
2023-11-11 12:55:47 +08:00
parent 39831b0ae1
commit 2b93d31788
6 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Snap.Hutao/Snap.Hutao/Control/Behavior/InvokeCommandOnLoadedBehavior.cs
View File

@@ -35,6 +35,11 @@ internal sealed partial class InvokeCommandOnLoadedBehavior : BehaviorBase<UIEle
private void TryExecuteCommand()
{
if (AssociatedObject is null)
{
return;
}
if (executed)
{
return;

5
src/Snap.Hutao/Snap.Hutao/Control/Behavior/OpenAttachedFlyoutAction.cs
View File

@@ -16,6 +16,11 @@ internal sealed class OpenAttachedFlyoutAction : DependencyObject, IAction
/// <inheritdoc/>
public object Execute(object sender, object parameter)
{
if (sender is null)
{
return default!;
}
FlyoutBase.ShowAttachedFlyout(sender as FrameworkElement);
return default!;
}

4
src/Snap.Hutao/Snap.Hutao/Control/Brush/SegmentedBar.cs
View File

@@ -35,9 +35,9 @@ internal sealed partial class SegmentedBar : ContentControl
double offset = 0;
foreach (ref readonly IColorSegment segment in CollectionsMarshal.AsSpan(list))
{
collection.Add(new GradientStop() { Color = segment.Color, Offset = offset, });
collection.Add(new() { Color = segment.Color, Offset = offset, });
offset += segment.Value / total;
collection.Add(new GradientStop() { Color = segment.Color, Offset = offset, });
collection.Add(new() { Color = segment.Color, Offset = offset, });
}
}
}

1
src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/ServiceProviderExtension.cs
View File

@@ -1,6 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using Microsoft.UI.Xaml.Controls;
using System.Runtime.CompilerServices;
namespace Snap.Hutao.Core.DependencyInjection;

2
src/Snap.Hutao/Snap.Hutao/Service/Game/Account/GameAccountService.cs
View File

@@ -108,7 +108,7 @@ internal sealed partial class GameAccountService : IGameAccountService
public async ValueTask ModifyGameAccountAsync(GameAccount gameAccount)
{
await taskContext.SwitchToMainThreadAsync();
LaunchGameAccountNameDialog dialog = serviceProvider.CreateInstance<LaunchGameAccountNameDialog>();
LaunchGameAccountNameDialog dialog = await contentDialogFactory.CreateInstanceAsync<LaunchGameAccountNameDialog>().ConfigureAwait(false);
(bool isOk, string name) = await dialog.GetInputNameAsync().ConfigureAwait(true);
if (isOk)

27
src/Snap.Hutao/Snap.Hutao/Web/ApiEndpoints.cs
View File

@@ -16,30 +16,6 @@ namespace Snap.Hutao.Web;
[SuppressMessage("", "SA1124")]
internal static class ApiEndpoints
{
#region ApiGeetest
/// <summary>
/// 获取GT码
/// </summary>
/// <param name="gt">gt</param>
/// <returns>GT码Url</returns>
public static string GeetestGetType(string gt)
{
return $"{ApiGeetest}/gettype.php?gt={gt}";
}
/// <summary>
/// 验证接口
/// </summary>
/// <param name="gt">gt</param>
/// <param name="challenge">challenge流水号</param>
/// <returns>验证接口Url</returns>
public static string GeetestAjax(string gt, string challenge)
{
return $"{ApiV6Geetest}/ajax.php?gt={gt}&challenge={challenge}&lang=zh-cn&pt=3&client_type=web_mobile";
}
#endregion
#region ApiTakumiAuthApi
/// <summary>
@@ -397,9 +373,6 @@ internal static class ApiEndpoints
#endregion
#region Hosts | Queries
private const string ApiGeetest = "https://api.geetest.com";
private const string ApiV6Geetest = "https://apiv6.geetest.com";
private const string ApiTakumi = "https://api-takumi.mihoyo.com";
private const string ApiTakumiAuthApi = $"{ApiTakumi}/auth/api";
private const string ApiTaKumiBindingApi = $"{ApiTakumi}/binding/api";