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

refactor: TaskSettingVisibilityInfo.Current -> Instance

Browse Source
This commit is contained in:
status102
2025-07-17 23:41:10 +08:00
parent f4864c7e5e
commit b01cfaf9c4
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs
View File

@@ -57,7 +57,7 @@ namespace MaaWpfGui.Models
public bool Custom { get => _custom; set => SetAndNotify(ref _custom, value); }
public static TaskSettingVisibilityInfo Current { get; } = new();
public static TaskSettingVisibilityInfo Instance { get; } = new();
// 长草任务当前选中
public int CurrentIndex { get; set; }

2
src/MaaWpfGui/ViewModels/DragItemViewModel.cs
View File

@@ -150,7 +150,7 @@ namespace MaaWpfGui.ViewModels
set
{
SetAndNotify(ref _enableSetting, value);
TaskSettingVisibilityInfo.Current.Set(OriginalName, value);
TaskSettingVisibilityInfo.Instance.Set(OriginalName, value);
}
}
}

4
src/MaaWpfGui/ViewModels/TaskViewModel.cs
View File

@@ -87,13 +87,13 @@ public abstract class TaskViewModel : PropertyChangedBase
protected T? GetTaskConfig<T>()
where T : BaseTask
{
return ConfigFactory.CurrentConfig.TaskQueue[TaskSettingVisibilityInfo.Current.CurrentIndex] as T;
return ConfigFactory.CurrentConfig.TaskQueue[TaskSettingVisibilityInfo.Instance.CurrentIndex] as T;
}
protected bool SetTaskConfig<T>(Func<T, bool> isEqual, Action<T> @setValue, [CallerMemberName] string propertyName = "")
where T : BaseTask
{
if (ConfigFactory.CurrentConfig.TaskQueue[TaskSettingVisibilityInfo.Current.CurrentIndex] is T task)
if (ConfigFactory.CurrentConfig.TaskQueue[TaskSettingVisibilityInfo.Instance.CurrentIndex] is T task)
{
if (!isEqual(task))
{

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

@@ -52,7 +52,7 @@ namespace MaaWpfGui.ViewModels.UI
/// <summary>
/// Gets the visibility of task setting views.
/// </summary>
public TaskSettingVisibilityInfo TaskSettingVisibilities { get; } = TaskSettingVisibilityInfo.Current;
public TaskSettingVisibilityInfo TaskSettingVisibilities { get; } = TaskSettingVisibilityInfo.Instance;
#region 设置界面Model

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

@@ -70,7 +70,7 @@ namespace MaaWpfGui.ViewModels.UI
/// <summary>
/// Gets the visibility of task setting views.
/// </summary>
public static TaskSettingVisibilityInfo TaskSettingVisibilities => TaskSettingVisibilityInfo.Current;
public static TaskSettingVisibilityInfo TaskSettingVisibilities => TaskSettingVisibilityInfo.Instance;
public static SettingsViewModel TaskSettingDataContext => Instances.SettingsViewModel;
@@ -167,7 +167,7 @@ namespace MaaWpfGui.ViewModels.UI
set
{
SetAndNotify(ref _enableAfterActionSetting, value);
TaskSettingVisibilityInfo.Current.Set("AfterAction", value);
TaskSettingVisibilityInfo.Instance.Set("AfterAction", value);
}
}

2
src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs
View File

@@ -52,7 +52,7 @@ public class InfrastSettingsUserControlModel : TaskViewModel
/// <summary>
/// Gets the visibility of task setting views.
/// </summary>
public static TaskSettingVisibilityInfo TaskSettingVisibilities => TaskSettingVisibilityInfo.Current;
public static TaskSettingVisibilityInfo TaskSettingVisibilities => TaskSettingVisibilityInfo.Instance;
public void InitInfrast()
{