From b35355f9a3ca68f458f1a03725371a830aa2d977 Mon Sep 17 00:00:00 2001 From: qhy040404 Date: Thu, 11 Jan 2024 20:39:02 +0800 Subject: [PATCH 1/2] improve daily note information --- .../Core/Shell/ScheduleTaskInterop.cs | 2 +- .../Resource/Localization/SH.en.resx | 38 +++++++++---------- .../Resource/Localization/SH.id.resx | 38 +++++++++---------- .../Resource/Localization/SH.ja.resx | 38 +++++++++---------- .../Resource/Localization/SH.ko.resx | 38 +++++++++---------- .../Snap.Hutao/Resource/Localization/SH.resx | 6 +-- .../Resource/Localization/SH.ru.resx | 38 +++++++++---------- .../Resource/Localization/SH.zh-Hant.resx | 38 +++++++++---------- .../Service/DailyNote/DailyNoteOptions.cs | 10 +++-- 9 files changed, 124 insertions(+), 122 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs b/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs index 77e5c5b9..6d477c25 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs @@ -68,7 +68,7 @@ internal sealed class ScheduleTaskInterop : IScheduleTaskInterop public bool IsDailyNoteRefreshEnabled() { - return WScriptExists(DailyNoteRefreshScriptName, out _); + return TaskService.Instance.RootFolder.Tasks.SingleOrDefault(task => task.Name is DailyNoteRefreshTaskName) is not null; } /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx index 49d8093d..b677e276 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx @@ -60,45 +60,45 @@ : and then encoded with base64 encoding. --> - + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -1451,6 +1451,9 @@ HoYoLab account does not support Realtime Notes verification + + Failed to modify Scheduled Task + 30 min | 3.75 Resin @@ -1466,9 +1469,6 @@ 8 min | 1 Resin - - Failed to add Scheduled Task, please try again in administrator mode - Fetching Realtime Notes data, please wait diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx index f3cf4842..c6d6a5f7 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx @@ -60,45 +60,45 @@ : and then encoded with base64 encoding. --> - + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -1451,6 +1451,9 @@ Akun HoYoLab tidak mendukung verifikasi Catatan Realtime. + + Gagal mengubah tugas terjadwal + 30 min | 3.75 Resin @@ -1466,9 +1469,6 @@ 8 min | 1 Resin - - Gagal menambahkan Tugas Terjadwal, silakan coba lagi dalam mode administrator. - Mengambil data Catatan Realtime, mohon tunggu. diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx index bf856477..c4ea021e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx @@ -60,45 +60,45 @@ : and then encoded with base64 encoding. --> - + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -1451,6 +1451,9 @@ HoYoLabユーザーのリアルタイムノートはサポートしていません。 + + スケジュールされたタスクの変更に失敗しました + 30 分 | 3.75樹脂 @@ -1466,9 +1469,6 @@ 8 分 | 1樹脂 - - タスク スケジューラーへの追加に失敗しました。管理者モードで再度お試しください。 - リアルタイムノートの情報を取得中、しばらくお待ちください diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx index 1fe9ab3f..a70d6905 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx @@ -60,45 +60,45 @@ : and then encoded with base64 encoding. --> - + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -1451,6 +1451,9 @@ HoYoLab 계정은 실시간 메모 확인 기능을 지원하지 않습니다 + + 예약된 작업을 수정하지 못했습니다 + 30분 | 3.75 레진 @@ -1466,9 +1469,6 @@ 8분 | 1 레진 - - 작업 등록에 실패했습니다. 관리자 모드로 실행하세요 - 正在获取实时便笺信息，请稍候 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index a8a9a30a..b801ff1a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -1451,6 +1451,9 @@ HoYoLab 账号不支持验证实时便笺 + + 修改计划任务失败 + 30 分钟 | 3.75 树脂 @@ -1466,9 +1469,6 @@ 8 分钟 | 1 树脂 - - 注册计划任务失败，请使用管理员模式重试 - 正在获取实时便笺信息，请稍候 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx index 2fb04aba..42ad5510 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx @@ -60,45 +60,45 @@ : and then encoded with base64 encoding. --> - + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -1451,6 +1451,9 @@ HoYoLab 账号不支持验证实时便笺 + + 修改计划任务失败 + 30 分钟 | 3.75 树脂 @@ -1466,9 +1469,6 @@ 8 分钟 | 1 树脂 - - 注册计划任务失败，请使用管理员模式重试 - 正在获取实时便笺信息，请稍候 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx index 9e48b0de..e0445e40 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx @@ -60,45 +60,45 @@ : and then encoded with base64 encoding. --> - + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -1451,6 +1451,9 @@ HoYoLAB 賬號不支持驗證實时便箋 + + 修改計劃任務失敗 + 30 分鐘 | 3.75 樹脂 @@ -1466,9 +1469,6 @@ 8 分鐘 | 1 樹脂 - - 注冊計劃任務失敗，請以管理員模式重試 - 正在獲取實時便箋信息，請稍候 diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs index cb80b85b..2d34e0f9 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs @@ -60,14 +60,16 @@ internal sealed partial class DailyNoteOptions : DbStoreOptions { if (!scheduleTaskInterop.RegisterForDailyNoteRefresh(SelectedRefreshTime.Value)) { - serviceProvider.GetRequiredService().Warning(SH.ViewModelDailyNoteRegisterTaskFail); - return; + serviceProvider.GetRequiredService().Warning(SH.ViewModelDailyNoteModifyTaskFail); } } } else { - scheduleTaskInterop.UnregisterForDailyNoteRefresh(); + if (!scheduleTaskInterop.UnregisterForDailyNoteRefresh()) + { + serviceProvider.GetRequiredService().Warning(SH.ViewModelDailyNoteModifyTaskFail); + } } OnPropertyChanged(); @@ -106,7 +108,7 @@ internal sealed partial class DailyNoteOptions : DbStoreOptions } else { - serviceProvider.GetRequiredService().Warning(SH.ViewModelDailyNoteRegisterTaskFail); + serviceProvider.GetRequiredService().Warning(SH.ViewModelDailyNoteModifyTaskFail); } } } From 7cc96f94f2210e7bb498b7b5bdf17166ea56ec9c Mon Sep 17 00:00:00 2001 From: qhy040404 Date: Fri, 12 Jan 2024 09:30:11 +0800 Subject: [PATCH 2/2] code style --- src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs b/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs index 6d477c25..738bcadd 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs @@ -68,7 +68,7 @@ internal sealed class ScheduleTaskInterop : IScheduleTaskInterop public bool IsDailyNoteRefreshEnabled() { - return TaskService.Instance.RootFolder.Tasks.SingleOrDefault(task => task.Name is DailyNoteRefreshTaskName) is not null; + return TaskService.Instance.RootFolder.Tasks.Any(task => task.Name is DailyNoteRefreshTaskName); } ///