Compare commits

...

1 Commits

Author SHA1 Message Date
qhy040404
37767261cd impl #1100 2024-04-26 11:21:09 +08:00
7 changed files with 120 additions and 50 deletions

View File

@@ -16,6 +16,9 @@ internal sealed partial class SettingEntry
public const string ElementTheme = "ElementTheme";
public const string BackgroundImageType = "BackgroundImageType";
public const string IsAutoUploadGachaLogEnabled = "IsAutoUploadGachaLogEnabled";
public const string IsAutoUploadSpiralAbyssRecordEnabled = "IsAutoUploadSpiralAbyssRecordEnabled";
public const string AnnouncementRegion = "AnnouncementRegion";
public const string IsEmptyHistoryWishVisible = "IsEmptyHistoryWishVisible";

View File

@@ -2588,6 +2588,24 @@
<data name="ViewpageSettingHomeHeader" xml:space="preserve">
<value>主页</value>
</data>
<data name="ViewPageSettingHutaoCloudAutoUploadDescription" xml:space="preserve">
<value>登录胡桃通行证后自动上传至胡桃云</value>
</data>
<data name="ViewPageSettingHutaoCloudAutoUploadHeader" xml:space="preserve">
<value>自动上传</value>
</data>
<data name="ViewPageSettingHutaoCloudGachaLogAutoUploadDescription" xml:space="preserve">
<value>刷新祈愿记录后自动上传至胡桃云,需要有效的胡桃云服务</value>
</data>
<data name="ViewPageSettingHutaoCloudGachaLogAutoUploadHeader" xml:space="preserve">
<value>自动上传祈愿记录</value>
</data>
<data name="ViewPageSettingHutaoCloudSpiralAbyssAutoUploadDescription" xml:space="preserve">
<value>刷新深境螺旋数据后自动上传至胡桃云</value>
</data>
<data name="ViewPageSettingHutaoCloudSpiralAbyssAutoUploadHeader" xml:space="preserve">
<value>自动上传深境螺旋数据</value>
</data>
<data name="ViewPageSettingHutaoPassportDangerZoneDescription" xml:space="preserve">
<value>三思而后行</value>
</data>

View File

@@ -15,6 +15,8 @@ namespace Snap.Hutao.Service;
[Injection(InjectAs.Singleton)]
internal sealed partial class AppOptions : DbStoreOptions
{
private bool? isAutoUploadGachaLogEnabled;
private bool? isAutoUploadSpiralAbyssRecordEnabled;
private bool? isEmptyHistoryWishVisible;
private bool? isUnobtainedWishItemVisible;
private BackdropType? backdropType;
@@ -23,6 +25,18 @@ internal sealed partial class AppOptions : DbStoreOptions
private Region? region;
private string? geetestCustomCompositeUrl;
public bool IsAutoUploadGachaLogEnabled
{
get => GetOption(ref isAutoUploadGachaLogEnabled, SettingEntry.IsAutoUploadGachaLogEnabled, false);
set => SetOption(ref isAutoUploadGachaLogEnabled, SettingEntry.IsAutoUploadGachaLogEnabled, value);
}
public bool IsAutoUploadSpiralAbyssRecordEnabled
{
get => GetOption(ref isAutoUploadSpiralAbyssRecordEnabled, SettingEntry.IsAutoUploadSpiralAbyssRecordEnabled, false);
set => SetOption(ref isAutoUploadSpiralAbyssRecordEnabled, SettingEntry.IsAutoUploadSpiralAbyssRecordEnabled, value);
}
public bool IsEmptyHistoryWishVisible
{
get => GetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible, false);

View File

@@ -265,6 +265,22 @@
</cwc:SettingsExpander.Items>
</cwc:SettingsExpander>
</ScrollViewer>
<ScrollViewer>
<cwc:SettingsExpander
Description="{shcm:ResourceString Name=ViewPageSettingHutaoCloudAutoUploadDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoCloudAutoUploadHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE898;}"
IsExpanded="True">
<cwc:SettingsExpander.Items>
<cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageSettingHutaoCloudGachaLogAutoUploadDescription}" Header="{shcm:ResourceString Name=ViewPageSettingHutaoCloudGachaLogAutoUploadHeader}">
<ToggleSwitch IsOn="{Binding AppOptions.IsAutoUploadGachaLogEnabled, Mode=TwoWay}"/>
</cwc:SettingsCard>
<cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageSettingHutaoCloudSpiralAbyssAutoUploadDescription}" Header="{shcm:ResourceString Name=ViewPageSettingHutaoCloudSpiralAbyssAutoUploadHeader}">
<ToggleSwitch IsOn="{Binding AppOptions.IsAutoUploadSpiralAbyssRecordEnabled, Mode=TwoWay}"/>
</cwc:SettingsCard>
</cwc:SettingsExpander.Items>
</cwc:SettingsExpander>
</ScrollViewer>
</StackPanel>
</Border>
</Border>

View File

@@ -11,6 +11,7 @@ using Snap.Hutao.Factory.Picker;
using Snap.Hutao.Factory.Progress;
using Snap.Hutao.Model.Entity;
using Snap.Hutao.Model.InterChange.GachaLog;
using Snap.Hutao.Service;
using Snap.Hutao.Service.GachaLog;
using Snap.Hutao.Service.GachaLog.QueryProvider;
using Snap.Hutao.Service.Notification;
@@ -38,6 +39,7 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel
private readonly IInfoBarService infoBarService;
private readonly JsonSerializerOptions options;
private readonly ITaskContext taskContext;
private readonly AppOptions appOptions;
private ObservableCollection<GachaArchive>? archives;
private GachaArchive? selectedArchive;
@@ -198,6 +200,11 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel
{
await SetSelectedArchiveAndUpdateStatisticsAsync(gachaLogService.CurrentArchive, true).ConfigureAwait(false);
await hideToken.DisposeAsync().ConfigureAwait(false);
if (HutaoCloudViewModel.Options.IsCloudServiceAllowed && appOptions.IsAutoUploadGachaLogEnabled)
{
await HutaoCloudViewModel.UploadAsync(gachaLogService.CurrentArchive).ConfigureAwait(false);
}
}
else
{

View File

@@ -47,6 +47,35 @@ internal sealed partial class HutaoCloudViewModel : Abstraction.ViewModel
/// </summary>
internal ICommand RetrieveCommand { get; set; }
[Command("UploadCommand")]
internal async Task UploadAsync(GachaArchive? gachaArchive)
{
if (gachaArchive is not null)
{
ContentDialog dialog = await contentDialogFactory
.CreateForIndeterminateProgressAsync(SH.ViewModelGachaLogUploadToHutaoCloudProgress)
.ConfigureAwait(false);
bool isOk;
string message;
using (await dialog.BlockAsync(taskContext).ConfigureAwait(false))
{
(isOk, message) = await hutaoCloudService.UploadGachaItemsAsync(gachaArchive).ConfigureAwait(false);
}
if (isOk)
{
infoBarService.Success(message);
await RefreshUidCollectionAsync().ConfigureAwait(false);
}
else
{
infoBarService.Warning(message);
}
}
}
/// <summary>
/// 异步获取祈愿记录
/// </summary>
@@ -77,35 +106,6 @@ internal sealed partial class HutaoCloudViewModel : Abstraction.ViewModel
await Windows.System.Launcher.LaunchUriAsync("https://afdian.net/item/80d3b9decf9011edb5f452540025c377".ToUri());
}
[Command("UploadCommand")]
private async Task UploadAsync(GachaArchive? gachaArchive)
{
if (gachaArchive is not null)
{
ContentDialog dialog = await contentDialogFactory
.CreateForIndeterminateProgressAsync(SH.ViewModelGachaLogUploadToHutaoCloudProgress)
.ConfigureAwait(false);
bool isOk;
string message;
using (await dialog.BlockAsync(taskContext).ConfigureAwait(false))
{
(isOk, message) = await hutaoCloudService.UploadGachaItemsAsync(gachaArchive).ConfigureAwait(false);
}
if (isOk)
{
infoBarService.Success(message);
await RefreshUidCollectionAsync().ConfigureAwait(false);
}
else
{
infoBarService.Warning(message);
}
}
}
[Command("DeleteCommand")]
private async Task DeleteAsync(string? uid)
{

View File

@@ -5,6 +5,7 @@ using CommunityToolkit.Mvvm.Messaging;
using Microsoft.UI.Xaml.Controls;
using Snap.Hutao.Factory.ContentDialog;
using Snap.Hutao.Message;
using Snap.Hutao.Service;
using Snap.Hutao.Service.Hutao;
using Snap.Hutao.Service.Notification;
using Snap.Hutao.Service.SpiralAbyss;
@@ -34,6 +35,7 @@ internal sealed partial class SpiralAbyssRecordViewModel : Abstraction.ViewModel
private readonly IUserService userService;
private readonly HutaoDatabaseViewModel hutaoDatabaseViewModel;
private readonly HutaoUserOptions hutaoUserOptions;
private readonly AppOptions appOptions;
private ObservableCollection<SpiralAbyssView>? spiralAbyssEntries;
private SpiralAbyssView? selectedView;
@@ -124,6 +126,11 @@ internal sealed partial class SpiralAbyssRecordViewModel : Abstraction.ViewModel
await taskContext.SwitchToMainThreadAsync();
SelectedView = SpiralAbyssEntries.FirstOrDefault(s => s.Engaged);
if (hutaoUserOptions.IsLoggedIn && appOptions.IsAutoUploadSpiralAbyssRecordEnabled)
{
await UploadSpiralAbyssRecordCoreAsync(userAndUid).ConfigureAwait(false);
}
}
}
}
@@ -145,30 +152,35 @@ internal sealed partial class SpiralAbyssRecordViewModel : Abstraction.ViewModel
}
}
SimpleRecord? record = await spiralAbyssClient.GetPlayerRecordAsync(userAndUid).ConfigureAwait(false);
if (record is not null)
{
Web.Response.Response response = await spiralAbyssClient.UploadRecordAsync(record).ConfigureAwait(false);
if (response is { ReturnCode: 0 })
{
if (response is ILocalizableResponse localizableResponse)
{
infoBarService.Success(localizableResponse.GetLocalizationMessage());
}
}
else
{
if (response is ILocalizableResponse localizableResponse)
{
infoBarService.Warning(localizableResponse.GetLocalizationMessage());
}
}
}
await UploadSpiralAbyssRecordCoreAsync(userAndUid).ConfigureAwait(false);
}
else
{
infoBarService.Warning(SH.MustSelectUserAndUid);
}
}
}
private async ValueTask UploadSpiralAbyssRecordCoreAsync(UserAndUid userAndUid)
{
SimpleRecord? record = await spiralAbyssClient.GetPlayerRecordAsync(userAndUid).ConfigureAwait(false);
if (record is not null)
{
Web.Response.Response response = await spiralAbyssClient.UploadRecordAsync(record).ConfigureAwait(false);
if (response is { ReturnCode: 0 })
{
if (response is ILocalizableResponse localizableResponse)
{
infoBarService.Success(localizableResponse.GetLocalizationMessage());
}
}
else
{
if (response is ILocalizableResponse localizableResponse)
{
infoBarService.Warning(localizableResponse.GetLocalizationMessage());
}
}
}
}
}