执行调度器任务增加继续执行功能 (#1658)

* 完全跳过的配置组，不发送通知。给周期配置增加说明。

* 启动参数增加 --no-single ，允许多开，实现特殊需求（重启需要）。增加了一个重启bgi的方法。增加了任务进度的功能，执行调度器任务时，会记录当前任务执行位置，当关闭后（比如F11），下次可以通过继续菜单，选择记录，从上次关闭任务处执行。

* 调整继续执行，最后一次成功的下一个任务执行

* 设置，其他设置，增加了调度器任务，遇到异常时，连续累计一定次数时，重启BGI，和可配置的重启游戏。

* 连续任务支持循环，右键支持从连续的某一个任务开始执行。修改了一些配置变量的写法，使之不会保存到json文件中。

Author: mfkvfhpdx

BetterGenshinImpact/Core/Config/AllConfig.cs

@@ -74,7 +74,13 @@ public partial class AllConfig : ObservableObject
 
     [ObservableProperty]
     private List<ValueTuple<string, int, string, string>> _nextScheduledTask = [];
-
+    
+    /// <summary>
+    /// 连续执行任务时，从此任务开始执行
+    /// </summary>
+    [JsonIgnore]
+    public string NextScriptGroupName { get; set; }= string.Empty;
+    
     /// <summary>
     /// 一条龙选中使用的配置
     /// </summary>

BetterGenshinImpact/Core/Config/OtherConfig.cs

@@ -1,4 +1,5 @@
 using System;
+using System.DirectoryServices.ActiveDirectory;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterGenshinImpact.Core.Config;
@@ -13,7 +14,25 @@ public partial class OtherConfig : ObservableObject
     //自动领取派遣任务城市
     [ObservableProperty]
     private string _autoFetchDispatchAdventurersGuildCountry = "无";
+    [ObservableProperty]
+    private AutoRestart _autoRestartConfig = new();
+    public partial class AutoRestart : ObservableObject
+    {
+        [ObservableProperty]
+        private bool _enabled = false;
+        
+        //调度器任务连续异常退出几次任务自动重启
+        [ObservableProperty]
+        private int _failureCount = 5;
+        
+        //是否同时重启游戏，需开启首页启动配置：同时启动原神、自动进入游戏，此配置才会生效
+        [ObservableProperty]
+        private bool _restartGameTogether = false;
+        
+    }
 
+    //public partial class OtherConfig : ObservableObject
+    
     /// <summary>
     /// 游戏语言名称
     /// </summary>

BetterGenshinImpact/Core/Script/Group/ScriptGroup.cs

@@ -1,11 +1,10 @@
-using BetterGenshinImpact.Service;
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
-using System.Text.Json;
-
+using BetterGenshinImpact.Service;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Newtonsoft.Json;
+using JsonSerializer = System.Text.Json.JsonSerializer;
 namespace BetterGenshinImpact.Core.Script.Group;
 
 /// <summary>
@@ -24,6 +23,14 @@ public partial class ScriptGroup : ObservableObject
     [ObservableProperty]
     private ObservableCollection<ScriptGroupProject> _projects = [];
 
+    [System.Text.Json.Serialization.JsonIgnore]
+    public bool NextFlag
+    {
+        get => _nextFlag;
+        set => SetProperty(ref _nextFlag, value);
+    }
+    private bool _nextFlag;
+
     public ScriptGroup()
     {
         Projects.CollectionChanged += ProjectsCollectionChanged;
@@ -41,7 +48,7 @@ public string ToJson()
 
     public static ScriptGroup FromJson(string json)
     {
-        var group = Newtonsoft.Json.JsonConvert.DeserializeObject<ScriptGroup>(json) ?? throw new Exception("解析配置组JSON配置失败");
+        var group = JsonConvert.DeserializeObject<ScriptGroup>(json) ?? throw new Exception("解析配置组JSON配置失败");
         ResetGroupInfo(group);
         return group;
     }

BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs

@@ -72,12 +72,29 @@ public partial class ScriptGroupProject : ObservableObject
     [JsonIgnore]
     public ScriptGroup? GroupInfo { get; set; }
 
+    private bool? _nextFlag = false;
+    private bool? _skipFlag = false;
+
     /// <summary>
     /// 下一个从此执行标志
     /// </summary>
     [JsonIgnore]
-    [ObservableProperty]
-    public bool? _nextFlag = false;
+    public bool? NextFlag
+    {
+        get => _nextFlag;
+        set => SetProperty(ref _nextFlag, value);
+    }
+
+    /// <summary>
+    /// 直接跳过标志
+    /// </summary>
+    [JsonIgnore]
+    public bool? SkipFlag
+    {
+        get => _skipFlag;
+        set => SetProperty(ref _skipFlag, value);
+    }
+    
 
     [ObservableProperty]
     private bool? _allowJsNotification = true;

BetterGenshinImpact/GameTask/RunnerContext.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
-using BetterGenshinImpact.GameTask.AutoFight.Model;
-using BetterGenshinImpact.Model;
-using Microsoft.Extensions.Logging;
 using System.Threading;
 using System.Threading.Tasks;
+using BetterGenshinImpact.GameTask.AutoFight.Model;
 using BetterGenshinImpact.GameTask.AutoPathing.Suspend;
 using BetterGenshinImpact.GameTask.Common.Job;
-using OpenCvSharp;
-using Wpf.Ui.Controls;
+using BetterGenshinImpact.Model;
+using Microsoft.Extensions.Logging;
 using static BetterGenshinImpact.GameTask.Common.TaskControl;
 
 namespace BetterGenshinImpact.GameTask;
@@ -23,6 +21,8 @@ public class RunnerContext : Singleton<RunnerContext>
     /// </summary>
     public bool IsContinuousRunGroup { get; set; }
 
+    public TaskProgress.TaskProgress? taskProgress  { get; set; }
+    
     /// <summary>
     /// 暂停逻辑
     /// </summary>
@@ -112,6 +112,7 @@ public void Reset()
         isAutoFetchDispatch = false;
         SuspendableDictionary.Clear();
         AutoPickTriggerStopCount = 0;
+        taskProgress = null;
     }
 
     /// <summary>

BetterGenshinImpact/GameTask/SystemControl.cs

@@ -185,7 +185,25 @@ public static void ActivateWindow()
 
         ActivateWindow(TaskContext.Instance().GameHandle);
     }
+    public static void RestartApplication(string[] newArgs)
+    {
+        // 获取当前程序路径
+        string exePath = Process.GetCurrentProcess().MainModule.FileName;
+
+        // 构建参数字符串
+        string arguments = string.Join(" ", [..newArgs,"--no-single"]);
+
+        // 启动新进程
+        Process.Start(new ProcessStartInfo
+        {
+            FileName = exePath,
+            Arguments = arguments,
+            UseShellExecute = false
+        });
 
+        // 关闭当前程序
+        Environment.Exit(0);
+    }
     public static void FocusWindow(nint hWnd)
     {
         if (User32.IsWindow(hWnd))

BetterGenshinImpact/GameTask/TaskProgress/TaskProgress.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using BetterGenshinImpact.Service;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace BetterGenshinImpact.GameTask.TaskProgress;
+
+public partial class TaskProgress : ObservableObject
+{
+
+    [ObservableProperty] private List<string> _scriptGroupNames = new();
+
+    [ObservableProperty] private string? _lastScriptGroupName;
+    [ObservableProperty] private ScriptGroupProjectInfo? _lastSuccessScriptGroupProjectInfo;
+    [ObservableProperty] private string? _currentScriptGroupName;
+    [ObservableProperty] private ScriptGroupProjectInfo? _currentScriptGroupProjectInfo;
+    [ObservableProperty] private string _name = DateTime.Now.ToString("yyyyMMddHHmmss");
+    [ObservableProperty] private DateTime _startTime = DateTime.Now;
+    [ObservableProperty] private DateTime? _endTime = null;
+    [ObservableProperty] private List<ScriptGroupProjectInfo>? _history = new();
+    [ObservableProperty] private bool _loop = false;
+    //记录完成了几圈
+    [ObservableProperty] private int _loopCount = 0;
+    private int _consecutiveFailureCount = 0;
+    
+    private Progress? _next;
+    /// <summary>
+    /// 连续失败次数
+    /// </summary>
+    [JsonIgnore]
+    public int ConsecutiveFailureCount
+    {
+        get => _consecutiveFailureCount;
+        set => SetProperty(ref _consecutiveFailureCount, value);
+    }
+
+    /// <summary>
+    /// 进度信息，如果next不为空，则从next执行
+    /// </summary>
+    [JsonIgnore]
+    public Progress? Next
+    {
+        get => _next;
+        set => SetProperty(ref _next, value);
+    }
+    public partial class Progress : ObservableObject
+    {
+        [ObservableProperty] private string _groupName  = string.Empty;
+        [ObservableProperty] private int _index  = 0;
+        [ObservableProperty] private string _projectName = string.Empty;
+        [ObservableProperty] private string _folderName  = string.Empty;
+    }
+    public partial class ScriptGroupProjectInfo : ObservableObject
+    {
+        [ObservableProperty] private string _groupName = string.Empty;
+        [ObservableProperty] private bool _taskEnd  = false;
+        [ObservableProperty] private int _index  = 0;
+        [ObservableProperty] private string _name = string.Empty;
+        [ObservableProperty] private string _folderName  = string.Empty;
+        [ObservableProperty] private DateTime _startTime = DateTime.Now;
+        [ObservableProperty] private DateTime? _endTime = null;
+        //状态 1 成功  2 失败
+        [ObservableProperty] private int _status  = 1;
+    }
+    public string ToJson()
+    {
+        return JsonSerializer.Serialize(this, ConfigService.JsonOptions);
+    }
+}