impl #1100

src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs

@@ -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";

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx

@@ -1361,18 +1361,6 @@
   <data name="ViewDialogSettingDeleteUserDataTitle" xml:space="preserve">
     <value>是否永久删除用户数据</value>
   </data>
-  <data name="ViewDialogSpiralAbyssUploadRecordHomaNotLoginCloseButtonText" xml:space="preserve">
-    <value>前往登录</value>
-  </data>
-  <data name="ViewDialogSpiralAbyssUploadRecordHomaNotLoginHint" xml:space="preserve">
-    <value>当前未登录胡桃账号，上传深渊数据无法获赠胡桃云时长</value>
-  </data>
-  <data name="ViewDialogSpiralAbyssUploadRecordHomaNotLoginPrimaryButtonText" xml:space="preserve">
-    <value>继续上传</value>
-  </data>
-  <data name="ViewDialogSpiralAbyssUploadRecordHomaNotLoginTitle" xml:space="preserve">
-    <value>上传深渊数据</value>
-  </data>
   <data name="ViewDialogUpdatePackageDownloadUpdatelogLinkContent" xml:space="preserve">
     <value>查看更新日志</value>
   </data>
@@ -1745,6 +1733,12 @@
   <data name="ViewModelSettingSetGamePathDatabaseFailedTitle" xml:space="preserve">
     <value>保存游戏路径失败</value>
   </data>
+  <data name="ViewModelSpiralAbyssUploadRecordHomaNotLoginContent" xml:space="preserve">
+    <value>当前未登录胡桃账号，上传深渊数据无法获赠胡桃云时长</value>
+  </data>
+  <data name="ViewModelSpiralAbyssUploadRecordHomaNotLoginTitle" xml:space="preserve">
+    <value>上传深渊数据</value>
+  </data>
   <data name="ViewModelUserAdded" xml:space="preserve">
     <value>用户 [{0}] 添加成功</value>
   </data>
@@ -2594,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>

src/Snap.Hutao/Snap.Hutao/Service/AppOptions.cs

@@ -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);

src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj

@@ -181,7 +181,6 @@
     <None Remove="View\Dialog\LaunchGameConfigurationFixDialog.xaml" />
     <None Remove="View\Dialog\LaunchGamePackageConvertDialog.xaml" />
     <None Remove="View\Dialog\ReconfirmDialog.xaml" />
-    <None Remove="View\Dialog\SpiralAbyssUploadRecordHomaNotLoginDialog.xaml" />
     <None Remove="View\Dialog\UpdatePackageDownloadConfirmDialog.xaml" />
     <None Remove="View\Dialog\UserDialog.xaml" />
     <None Remove="View\Dialog\UserQRCodeDialog.xaml" />
@@ -355,11 +354,6 @@
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
-  <ItemGroup>
-    <Page Update="View\Dialog\SpiralAbyssUploadRecordHomaNotLoginDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <Page Update="View\Dialog\UpdatePackageDownloadConfirmDialog.xaml">
       <Generator>MSBuild:Compile</Generator>

src/Snap.Hutao/Snap.Hutao/View/Dialog/SpiralAbyssUploadRecordHomaNotLoginDialog.xaml

@@ -1,16 +0,0 @@
-<ContentDialog
-    x:Class="Snap.Hutao.View.Dialog.SpiralAbyssUploadRecordHomaNotLoginDialog"
-    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:shcm="using:Snap.Hutao.Control.Markup"
-    Title="{shcm:ResourceString Name=ViewDialogSpiralAbyssUploadRecordHomaNotLoginTitle}"
-    CloseButtonText="{shcm:ResourceString Name=ViewDialogSpiralAbyssUploadRecordHomaNotLoginCloseButtonText}"
-    DefaultButton="Close"
-    PrimaryButtonText="{shcm:ResourceString Name=ViewDialogSpiralAbyssUploadRecordHomaNotLoginPrimaryButtonText}"
-    Style="{StaticResource DefaultContentDialogStyle}"
-    mc:Ignorable="d">
-
-    <TextBlock Text="{shcm:ResourceString Name=ViewDialogSpiralAbyssUploadRecordHomaNotLoginHint}"/>
-</ContentDialog>

src/Snap.Hutao/Snap.Hutao/View/Dialog/SpiralAbyssUploadRecordHomaNotLoginDialog.xaml.cs

@@ -1,24 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml.Controls;
-
-namespace Snap.Hutao.View.Dialog;
-
-internal sealed partial class SpiralAbyssUploadRecordHomaNotLoginDialog : ContentDialog
-{
-    private readonly ITaskContext taskContext;
-
-    public SpiralAbyssUploadRecordHomaNotLoginDialog(IServiceProvider serviceProvider)
-    {
-        InitializeComponent();
-
-        taskContext = serviceProvider.GetRequiredService<ITaskContext>();
-    }
-
-    public async ValueTask<bool> ConfirmAsync()
-    {
-        await taskContext.SwitchToMainThreadAsync();
-        return await ShowAsync() is ContentDialogResult.Primary;
-    }
-}

src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml

@@ -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>

src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs

@@ -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
             {

src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/HutaoCloudViewModel.cs

@@ -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)
     {

src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs

@@ -5,13 +5,11 @@ 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.Navigation;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.SpiralAbyss;
 using Snap.Hutao.Service.User;
-using Snap.Hutao.View.Dialog;
-using Snap.Hutao.View.Page;
 using Snap.Hutao.ViewModel.Complex;
 using Snap.Hutao.ViewModel.User;
 using Snap.Hutao.Web.Hutao.Response;
@@ -32,12 +30,12 @@ internal sealed partial class SpiralAbyssRecordViewModel : Abstraction.ViewModel
     private readonly ISpiralAbyssRecordService spiralAbyssRecordService;
     private readonly IContentDialogFactory contentDialogFactory;
     private readonly HutaoSpiralAbyssClient spiralAbyssClient;
-    private readonly INavigationService navigationService;
     private readonly IInfoBarService infoBarService;
     private readonly ITaskContext taskContext;
     private readonly IUserService userService;
     private readonly HutaoDatabaseViewModel hutaoDatabaseViewModel;
     private readonly HutaoUserOptions hutaoUserOptions;
+    private readonly AppOptions appOptions;
 
     private ObservableCollection<SpiralAbyssView>? spiralAbyssEntries;
     private SpiralAbyssView? selectedView;
@@ -128,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);
+                }
             }
         }
     }
@@ -139,42 +142,45 @@ internal sealed partial class SpiralAbyssRecordViewModel : Abstraction.ViewModel
         {
             if (!hutaoUserOptions.IsLoggedIn)
             {
-                SpiralAbyssUploadRecordHomaNotLoginDialog dialog = await contentDialogFactory
-                    .CreateInstanceAsync<SpiralAbyssUploadRecordHomaNotLoginDialog>()
+                ContentDialogResult result = await contentDialogFactory
+                    .CreateForConfirmCancelAsync(SH.ViewModelSpiralAbyssUploadRecordHomaNotLoginTitle, SH.ViewModelSpiralAbyssUploadRecordHomaNotLoginContent)
                     .ConfigureAwait(false);
 
-                if (!await dialog.ConfirmAsync().ConfigureAwait(false))
+                if (result is not ContentDialogResult.Primary)
                 {
-                    await taskContext.SwitchToMainThreadAsync();
-                    await navigationService.NavigateAsync<SettingPage>(INavigationAwaiter.Default, true).ConfigureAwait(false);
                     return;
                 }
             }
 
-            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());
+                }
+            }
+        }
+    }
+}