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

rft: 删除 TaskItemViewModel 构造函数的 name 参数

Browse Source 
Name getter 已改为从配置动态读取 NameOrTaskType，构造时传入的 name
不再有任何作用，删除该参数及三处调用点的实参。
This commit is contained in:
uye
2026-06-24 23:09:05 +08:00
parent 06493228aa
commit 4c3967e8e6
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,10 +26,8 @@ namespace MaaWpfGui.ViewModels;
public class TaskItemViewModel : PropertyChangedBase, IDisposable
{
public TaskItemViewModel(string name, bool? isCheckedWithNull = true)
public TaskItemViewModel(bool? isCheckedWithNull = true)
{
// name 仅用于兼容旧调用方，显示名始终从配置动态读取（见 Name getter），
// 这样语言切换、任务增删导致 Index 变化时都能拿到最新值。
_isEnable = isCheckedWithNull;
Instances.AsstProxy.OnTaskStatusChanged += OnTaskStatusChanged;
PropertyDependsOnUtility.InitializePropertyDependencies(this);

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

@@ -1013,7 +1013,7 @@ public class TaskQueueViewModel : Screen
var task = ConfigFactory.CurrentConfig.TaskQueue.ElementAt(i);
if (task is not null)
{
taskqueue.Add(new TaskItemViewModel(task.NameOrTaskType, task.IsEnable) { Index = i });
taskqueue.Add(new TaskItemViewModel(task.IsEnable) { Index = i });
}
}
@@ -1374,7 +1374,7 @@ public class TaskQueueViewModel : Screen
if (Activator.CreateInstance(taskName) is BaseTask task)
{
ConfigFactory.CurrentConfig.TaskQueue.Add(task);
TaskItemViewModels.Add(new TaskItemViewModel(task.NameOrTaskType));
TaskItemViewModels.Add(new TaskItemViewModel());
AchievementTrackerHelper.Instance.Unlock(AchievementIds.QueueExpansion);
AchievementTrackerHelper.Instance.TrackManualTaskAddition(
task.TaskType.ToString(),
@@ -1485,7 +1485,7 @@ public class TaskQueueViewModel : Screen
}
newTask.Name = newTask.NameOrTaskType + " (2)";
ConfigFactory.CurrentConfig.TaskQueue.Insert(index + 1, newTask);
TaskItemViewModels.Insert(index + 1, new TaskItemViewModel(newTask.NameOrTaskType));
TaskItemViewModels.Insert(index + 1, new TaskItemViewModel());
AddLog(LocalizationHelper.GetStringFormat("TaskCopied", newTask.NameOrTaskType), UiLogColor.Info);
}