Fun/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact.git synced 2026-03-15 07:43:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 通知->全局通知设置->添加新选项“手动停止时不通知”，允许用户选择手动停止时是否发送通知 (#2195)

Browse Source
This commit is contained in:
bling-yshs
2025-09-16 10:25:40 +08:00
committed by GitHub
parent aa7f8b78e3
commit cd69a255dc
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
BetterGenshinImpact/Core/Script/CancellationContext.cs
View File

@@ -6,15 +6,26 @@ namespace BetterGenshinImpact.Core.Script;
public class CancellationContext : Singleton<CancellationContext>
{
public CancellationTokenSource Cts { get; set; } = new();
public bool IsManualStop { get; private set; }
private bool disposed;
public void Set()
{
Cts = new CancellationTokenSource();
IsManualStop = false;
disposed = false;
}
public void ManualCancel()
{
if (!disposed)
{
IsManualStop = true;
Cts.Cancel();
}
}
public void Cancel()
{
if (!disposed)

5
BetterGenshinImpact/Service/ScriptService.cs
View File

@@ -429,7 +429,10 @@ public partial class ScriptService : IScriptService
if (!fisrt&&!RunnerContext.Instance.IsPreExecution)
{
Notify.Event(NotificationEvent.GroupEnd).Success($"配置组{groupName}结束");
if (CancellationContext.Instance.IsManualStop is false)
{
Notify.Event(NotificationEvent.GroupEnd).Success($"配置组{groupName}结束");
}
}
if (taskProgress != null)

2
BetterGenshinImpact/ViewModel/Pages/HotKeyPageViewModel.cs
View File

@@ -218,7 +218,7 @@ public partial class HotKeyPageViewModel : ObservableObject, IViewModel
nameof(Config.HotKeyConfig.CancelTaskHotkey),
Config.HotKeyConfig.CancelTaskHotkey,
Config.HotKeyConfig.CancelTaskHotkeyType,
(_, _) => { CancellationContext.Instance.Cancel(); }
(_, _) => { CancellationContext.Instance.ManualCancel(); }
));
systemDirectory.Children.Add(new HotKeySettingModel(
"暂停当前脚本/独立任务",

10
BetterGenshinImpact/ViewModel/Pages/OneDragonFlowViewModel.cs
View File

@@ -665,7 +665,10 @@ public partial class OneDragonFlowViewModel : ViewModel
if (CancellationContext.Instance.Cts.IsCancellationRequested)
{
_logger.LogInformation("任务被取消，退出执行");
Notify.Event(NotificationEvent.DragonEnd).Success("一条龙和配置组任务结束");
if (CancellationContext.Instance.IsManualStop is false)
{
Notify.Event(NotificationEvent.DragonEnd).Success("一条龙和配置组任务结束");
}
return; // 后续的检查任务也不执行
}
}
@@ -676,7 +679,10 @@ public partial class OneDragonFlowViewModel : ViewModel
{
await new CheckRewardsTask().Start(CancellationContext.Instance.Cts.Token);
await Task.Delay(500);
Notify.Event(NotificationEvent.DragonEnd).Success("一条龙和配置组任务结束");
if (CancellationContext.Instance.IsManualStop is false)
{
Notify.Event(NotificationEvent.DragonEnd).Success("一条龙和配置组任务结束");
}
_logger.LogInformation("一条龙和配置组任务结束");
// 执行完成后操作