fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 重构定时器和重启询问 (#10078)

Browse Source
This commit is contained in:
uye
2024-08-22 13:15:22 +08:00
committed by GitHub
parent b25f733e62
commit 3f1d293a8d
2 changed files with 96 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
View File

@@ -338,47 +338,76 @@ namespace MaaWpfGui.ViewModels.UI
DateTime currentTime = DateTime.Now;
currentTime = new DateTime(currentTime.Year, currentTime.Month, currentTime.Day, currentTime.Hour, currentTime.Minute, 0);
if (NeedToUpdateDatePrompt())
{
UpdateDatePrompt();
UpdateStageList(false);
// 随机延迟，防止同时更新
var delayTime = new Random().Next(0, 60 * 60 * 1000);
_ = Task.Run(async () =>
{
await Task.Delay(delayTime);
await _runningState.UntilIdleAsync(60000);
await _stageManager.UpdateStageWeb();
UpdateDatePrompt();
UpdateStageList(false);
});
}
if (NeedToCheckForUpdates())
{
if (Instances.SettingsViewModel.UpdateAutoCheck)
{
// 随机延迟，防止同时更新
var delayTime = new Random().Next(0, 60 * 60 * 1000);
_ = Task.Run(async () =>
{
await Task.Delay(delayTime);
_ = Instances.SettingsViewModel.ManualUpdate();
});
}
}
HandleDatePromptUpdate();
HandleCheckForUpdates();
RefreshCustomInfrastPlanIndexByPeriod();
if (!_runningState.GetIdle() && !Instances.SettingsViewModel.ForceScheduledStart && !Instances.SettingsViewModel.CustomConfig)
await HandleTimerLogic(currentTime);
}
private static int CalculateRandomDelay()
{
Random random = new Random();
int delayTime = random.Next(0, 60 * 60 * 1000);
return delayTime;
}
private bool _isUpdatingDatePrompt;
private void HandleDatePromptUpdate()
{
if (!NeedToUpdateDatePrompt() || _isUpdatingDatePrompt)
{
return;
}
var timeToStart = false;
var timeToChangeConfig = false;
var configIndex = 0;
_isUpdatingDatePrompt = true;
UpdateDatePrompt();
UpdateStageList(false);
var delayTime = CalculateRandomDelay();
_ = Task.Run(async () =>
{
await Task.Delay(delayTime);
await _runningState.UntilIdleAsync(60000);
await _stageManager.UpdateStageWeb();
UpdateDatePrompt();
UpdateStageList(false);
_isUpdatingDatePrompt = false;
});
}
private bool _isCheckingForUpdates;
private void HandleCheckForUpdates()
{
if (!NeedToCheckForUpdates() || _isCheckingForUpdates)
{
return;
}
if (!Instances.SettingsViewModel.UpdateAutoCheck)
{
return;
}
_isCheckingForUpdates = true;
var delayTime = CalculateRandomDelay();
_ = Task.Run(async () =>
{
await Task.Delay(delayTime);
await Instances.SettingsViewModel.ManualUpdate();
_isCheckingForUpdates = false;
});
}
private static (bool timeToStart, bool timeToChangeConfig, int configIndex) CheckTimers(DateTime currentTime)
{
bool timeToStart = false;
bool timeToChangeConfig = false;
int configIndex = 0;
for (int i = 0; i < 8; ++i)
{
if (!Instances.SettingsViewModel.TimerModels.Timers[i].IsOn)
@@ -417,28 +446,46 @@ namespace MaaWpfGui.ViewModels.UI
}
}
if (timeToChangeConfig)
{
if (Instances.SettingsViewModel.CustomConfig &&
(_runningState.GetIdle() || Instances.SettingsViewModel.ForceScheduledStart))
{
// CurrentConfiguration设置后会重启
Instances.SettingsViewModel.CurrentConfiguration = Instances.SettingsViewModel.TimerModels.Timers[configIndex].TimerConfig;
return;
}
}
if (!timeToStart)
return (timeToStart, timeToChangeConfig, configIndex);
}
private async Task HandleTimerLogic(DateTime currentTime)
{
if (!_runningState.GetIdle() && !Instances.SettingsViewModel.ForceScheduledStart)
{
return;
}
var (timeToStart, timeToChangeConfig, configIndex) = CheckTimers(currentTime);
if (timeToChangeConfig)
{
HandleConfigChange(configIndex);
return;
}
if (timeToStart)
{
await HandleScheduledStart(configIndex);
}
}
private void HandleConfigChange(int configIndex)
{
if (Instances.SettingsViewModel.CustomConfig &&
(_runningState.GetIdle() || Instances.SettingsViewModel.ForceScheduledStart))
{
Instances.SettingsViewModel.CurrentConfiguration = Instances.SettingsViewModel.TimerModels.Timers[configIndex].TimerConfig;
}
}
private async Task HandleScheduledStart(int configIndex)
{
if (Instances.SettingsViewModel.ForceScheduledStart)
{
// 什么时候会遇到这种情况？
if (Instances.SettingsViewModel.CustomConfig &&
Instances.SettingsViewModel.CurrentConfiguration != Instances.SettingsViewModel.TimerModels.Timers[configIndex].TimerConfig)
{
_logger.Warning($"Scheduled start skipped: Custom configuration is enabled, but the current configuration does not match the scheduled timer configuration (Timer Index: {configIndex}). Current Configuration: {Instances.SettingsViewModel.CurrentConfiguration}, Scheduled Configuration: {Instances.SettingsViewModel.TimerModels.Timers[configIndex].TimerConfig}");
return;
}

2
src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
View File

@@ -700,6 +700,8 @@ namespace MaaWpfGui.ViewModels.UI
return;
}
await _runningState.UntilIdleAsync(10000);
var result = MessageBoxHelper.Show(
LocalizationHelper.GetString("NewVersionDownloadCompletedDesc"),
LocalizationHelper.GetString("NewVersionDownloadCompletedTitle"),