Fun/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact.git synced 2026-05-21 09:45:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复DPI缩放获取和定时触发器同步问题

Browse Source 
修复 DpiHelper 在未初始化窗口句柄时获取 DPI 缩放值的问题，现在能正确处理多显示器场景。重构 QuartzSchedulerService 的触发器同步逻辑，确保定时任务正确更新。在添加/编辑触发器时增加 Cron 表达式格式校验，避免无效表达式导致调度失败。同时修复 ScriptService 中任务启动时的线程调度问题。
This commit is contained in:
辉鸭蛋
2026-05-09 02:50:52 +08:00
parent 5a6b074759
commit 769e08edfd
7 changed files with 279 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
BetterGenshinImpact/ViewModel/Windows/GearTask/AddTriggerDialogViewModel.cs
View File

@@ -1,24 +1,26 @@
using System;
using System.Collections.ObjectModel;
using System.Linq;
using System.ComponentModel;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using BetterGenshinImpact.ViewModel.Pages.Component;
using BetterGenshinImpact.Model.Gear.Triggers;
using BetterGenshinImpact.Model;
using BetterGenshinImpact.Service;
using Microsoft.Extensions.Logging;
using Wpf.Ui.Violeta.Controls;
using BetterGenshinImpact.Helpers.Extensions;
using System.ComponentModel;
using BetterGenshinImpact.Model;
using BetterGenshinImpact.Model.Gear.Triggers;
using BetterGenshinImpact.Service;
using BetterGenshinImpact.View.Windows;
using BetterGenshinImpact.ViewModel.Pages.Component;
using Microsoft.Extensions.Logging;
using Quartz;
namespace BetterGenshinImpact.ViewModel.Windows.GearTask;
/// <summary>
/// 新增触发器对话框 ViewModel
/// 新增/编辑触发器对话框 ViewModel。
/// </summary>
public partial class AddTriggerDialogViewModel : ObservableObject
{
private const string DefaultCronExpression = "1 0 4 * * ?";
private readonly GearTaskStorageService _storageService;
private readonly ILogger<AddTriggerDialogViewModel> _logger;
@@ -32,7 +34,7 @@ public partial class AddTriggerDialogViewModel : ObservableObject
private TriggerType _selectedTriggerType = TriggerType.Timed;
[ObservableProperty]
private string _cronExpression = "1 0 4 * * ?"; // 默认每天 04:00:01
private string _cronExpression = DefaultCronExpression;
[ObservableProperty]
private CronInputMode _selectedCronInputMode = CronInputMode.Preset;
@@ -106,33 +108,25 @@ public partial class AddTriggerDialogViewModel : ObservableObject
LoadAvailableTaskDefinitions();
}
/// <summary>
/// 构造函数，用于指定触发器类型
/// </summary>
public AddTriggerDialogViewModel(GearTaskStorageService storageService, ILogger<AddTriggerDialogViewModel> logger, TriggerType? predefinedType = null)
public AddTriggerDialogViewModel(
GearTaskStorageService storageService,
ILogger<AddTriggerDialogViewModel> logger,
TriggerType? predefinedType = null)
: this(storageService, logger)
{
_storageService = storageService;
_logger = logger;
// 如果指定了预定义类型，则设置并禁用选择
if (predefinedType.HasValue)
{
SelectedTriggerType = predefinedType.Value;
IsTriggerTypeSelectionEnabled = false;
}
// 生成默认名称
GenerateDefaultName();
// 加载可用的任务定义
LoadAvailableTaskDefinitions();
}
public AddTriggerDialogViewModel(GearTaskStorageService storageService, ILogger<AddTriggerDialogViewModel> logger, GearTriggerViewModel existingTrigger)
public AddTriggerDialogViewModel(
GearTaskStorageService storageService,
ILogger<AddTriggerDialogViewModel> logger,
GearTriggerViewModel existingTrigger)
: this(storageService, logger)
{
_storageService = storageService;
_logger = logger;
DialogTitle = "编辑触发器";
IsTriggerTypeSelectionEnabled = false;
@@ -142,21 +136,16 @@ public partial class AddTriggerDialogViewModel : ObservableObject
SelectedTaskDefinitionName = existingTrigger.TaskDefinitionName;
CronExpression = existingTrigger.TriggerType == TriggerType.Timed
? (existingTrigger.CronExpression ?? CronExpression)
: CronExpression;
? existingTrigger.CronExpression ?? DefaultCronExpression
: DefaultCronExpression;
SelectedCronInputMode = existingTrigger.TriggerType == TriggerType.Timed
? CronInputMode.Manual
: CronInputMode.Preset;
SelectedHotkey = existingTrigger.TriggerType == TriggerType.Hotkey
? existingTrigger.Hotkey
: null;
SelectedHotkey = existingTrigger.TriggerType == TriggerType.Hotkey ? existingTrigger.Hotkey : null;
HotkeyType = existingTrigger.TriggerType == TriggerType.Hotkey
? existingTrigger.HotkeyType
: HotKeyTypeEnum.KeyboardMonitor;
LoadAvailableTaskDefinitions();
}
/// <summary>
@@ -188,9 +177,9 @@ public partial class AddTriggerDialogViewModel : ObservableObject
AvailableTaskDefinitions.Add(taskDefinition.Name);
}
}
_logger.LogInformation("已加载 {Count} 个可用的任务定义", AvailableTaskDefinitions.Count);
// 如果有任务定义，默认选择第一个
if (AvailableTaskDefinitions.Count > 0 && string.IsNullOrWhiteSpace(SelectedTaskDefinitionName))
{
@@ -229,44 +218,42 @@ public partial class AddTriggerDialogViewModel : ObservableObject
partial void OnSelectedCronInputModeChanged(CronInputMode value)
{
if (SelectedTriggerType != TriggerType.Timed)
if (SelectedTriggerType == TriggerType.Timed && string.IsNullOrWhiteSpace(CronExpression))
{
return;
}
if (string.IsNullOrWhiteSpace(CronExpression))
{
CronExpression = "1 0 4 * * ?";
CronExpression = DefaultCronExpression;
}
}
/// <summary>
/// 确认创建触发器
/// </summary>
[RelayCommand]
private void Confirm()
{
if (string.IsNullOrWhiteSpace(TriggerName))
{
Toast.Error("请输入触发器名称");
ThemedMessageBox.Error("请输入触发器名称", "保存失败");
return;
}
if (SelectedTriggerType == TriggerType.Timed && string.IsNullOrWhiteSpace(CronExpression))
{
Toast.Error(SelectedCronInputMode == CronInputMode.Manual
var message = SelectedCronInputMode == CronInputMode.Manual
? "请输入 Cron 表达式"
: "请先完成定时选择");
: "请先完成定时选择";
ThemedMessageBox.Error(message, "保存失败");
return;
}
if (SelectedTriggerType == TriggerType.Timed && !IsValidCronExpression(CronExpression, out var cronErrorMessage))
{
ThemedMessageBox.Error(cronErrorMessage, "Cron 表达式错误");
return;
}
if (SelectedTriggerType == TriggerType.Hotkey && SelectedHotkey == null)
{
Toast.Error("请选择热键");
ThemedMessageBox.Error("请选择热键", "保存失败");
return;
}
// 创建触发器 ViewModel
CreatedTrigger = new GearTriggerViewModel(TriggerName, SelectedTriggerType)
{
IsEnabled = IsEnabled,
@@ -294,7 +281,9 @@ public partial class AddTriggerDialogViewModel : ObservableObject
[RelayCommand]
private void SwitchHotKeyType()
{
HotkeyType = HotkeyType == HotKeyTypeEnum.GlobalRegister ? HotKeyTypeEnum.KeyboardMonitor : HotKeyTypeEnum.GlobalRegister;
HotkeyType = HotkeyType == HotKeyTypeEnum.GlobalRegister
? HotKeyTypeEnum.KeyboardMonitor
: HotKeyTypeEnum.GlobalRegister;
}
/// <summary>
@@ -303,8 +292,33 @@ public partial class AddTriggerDialogViewModel : ObservableObject
[RelayCommand]
private void SelectHotkey()
{
// 移除旧的示例代码，现在使用HotKeyTextBox直接设置
// HotKeyTextBox会直接绑定到SelectedHotkey属性
}
private static bool IsValidCronExpression(string? cronExpression, out string errorMessage)
{
errorMessage = string.Empty;
if (string.IsNullOrWhiteSpace(cronExpression))
{
errorMessage = "Cron 表达式不能为空";
return false;
}
try
{
_ = new CronExpression(cronExpression);
return true;
}
catch (FormatException ex)
{
errorMessage = $"Cron 表达式格式无效：{ex.Message}";
return false;
}
catch (Exception ex)
{
errorMessage = $"Cron 表达式校验失败：{ex.Message}";
return false;
}
}
}
@@ -312,6 +326,7 @@ public enum CronInputMode
{
[Description("可视化选择")]
Preset,
[Description("手动 Cron")]
Manual
}