diff --git a/BetterGenshinImpact/View/Pages/SchedulerPage.xaml b/BetterGenshinImpact/View/Pages/SchedulerPage.xaml index e3feb218..f0a7b2ce 100644 --- a/BetterGenshinImpact/View/Pages/SchedulerPage.xaml +++ b/BetterGenshinImpact/View/Pages/SchedulerPage.xaml @@ -140,34 +140,77 @@ - + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - @@ -179,44 +222,73 @@ - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/BetterGenshinImpact/View/Pages/SchedulerPage.xaml.cs b/BetterGenshinImpact/View/Pages/SchedulerPage.xaml.cs index d8a34c5d..00638857 100644 --- a/BetterGenshinImpact/View/Pages/SchedulerPage.xaml.cs +++ b/BetterGenshinImpact/View/Pages/SchedulerPage.xaml.cs @@ -1,11 +1,17 @@ using System.Windows.Controls; +using BetterGenshinImpact.ViewModel.Pages; namespace BetterGenshinImpact.View.Pages; public partial class SchedulerPage { - public SchedulerPage() + public SchedulerViewModel ViewModel { get; } + + + public SchedulerPage(SchedulerViewModel viewModel) { + DataContext = ViewModel = viewModel; + InitializeComponent(); } } \ No newline at end of file diff --git a/BetterGenshinImpact/ViewModel/Pages/SchedulerViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/SchedulerViewModel.cs index 8a50efc8..a985c360 100644 --- a/BetterGenshinImpact/ViewModel/Pages/SchedulerViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Pages/SchedulerViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.ObjectModel; +using BetterGenshinImpact.Model; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; @@ -28,6 +29,17 @@ public partial class SchedulerViewModel : ViewModel // 任务列表 [ObservableProperty] private ObservableCollection _tasks = new(); + + [ObservableProperty] private ObservableCollection _taskList = + [ + new("领取邮件"), + new("合成树脂"), + // new ("每日委托"), + new("自动秘境"), + ]; + + + [ObservableProperty] private OneDragonTaskItem? _selectedTask; // 命令 [RelayCommand]