From 0de4aff03a948acd8d56c5e94c7a748ca252c394 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Sat, 26 Aug 2023 00:14:18 +0800
Subject: [PATCH] fix dailynote refresh time notify

---
 .../Snap.Hutao/Model/Entity/DailyNoteEntry.cs         |  2 +-
 .../Snap.Hutao/Resource/Localization/SH.Designer.cs   |  9 +++++++++
 .../Snap.Hutao/Resource/Localization/SH.resx          |  3 +++
 src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj           |  4 ----
 .../ViewModel/DailyNote/DailyNoteViewModel.cs         | 11 ++++++++++-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs
index 83b77abd..c2d5f859 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs
@@ -136,6 +136,6 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom<DailyNoteE
         OnPropertyChanged(nameof(DailyNote));
 
         RefreshTime = DateTimeOffset.Now;
-        OnPropertyChanged(nameof(RefreshTime));
+        OnPropertyChanged(nameof(RefreshTimeFormatted));
     }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
index 5d7eef09..62ca31ba 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
@@ -2643,6 +2643,15 @@ namespace Snap.Hutao.Resource.Localization {
             }
         }
         
+        /// <summary>
+        ///   查找类似 正在获取实时便笺信息，请稍候 的本地化字符串。
+        /// </summary>
+        internal static string ViewModelDailyNoteRequestProgressTitle {
+            get {
+                return ResourceManager.GetString("ViewModelDailyNoteRequestProgressTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 成功保存到指定位置 的本地化字符串。
         /// </summary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index 85bb5574..5877f6df 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -1034,6 +1034,9 @@
   <data name="ViewModelDailyNoteRegisterTaskFail" xml:space="preserve">
     <value>注册计划任务失败，请使用管理员模式重试</value>
   </data>
+  <data name="ViewModelDailyNoteRequestProgressTitle" xml:space="preserve">
+    <value>正在获取实时便笺信息，请稍候</value>
+  </data>
   <data name="ViewModelExportSuccessMessage" xml:space="preserve">
     <value>成功保存到指定位置</value>
   </data>
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index c644ca09..ceecec06 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -255,10 +255,6 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.6.11" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.18-beta">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs
index 30db6099..7f781ce2 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs
@@ -1,6 +1,8 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.UI.Xaml.Controls;
+using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core;
 using Snap.Hutao.Factory.Abstraction;
 using Snap.Hutao.Model.Entity;
@@ -89,7 +91,14 @@ internal sealed partial class DailyNoteViewModel : Abstraction.ViewModel
     {
         if (userAndUid is not null)
         {
-            await dailyNoteService.AddDailyNoteAsync(userAndUid).ConfigureAwait(false);
+            ContentDialog dialog = await contentDialogFactory
+                .CreateForIndeterminateProgressAsync(SH.ViewModelDailyNoteRequestProgressTitle)
+                .ConfigureAwait(false);
+
+            using (await dialog.BlockAsync(taskContext).ConfigureAwait(false))
+            {
+                await dailyNoteService.AddDailyNoteAsync(userAndUid).ConfigureAwait(false);
+            }
         }
     }