diff --git a/PetWash.Api/petwash.db b/PetWash.Api/petwash.db index dfb9fc0..6dda168 100644 Binary files a/PetWash.Api/petwash.db and b/PetWash.Api/petwash.db differ diff --git a/PetWash.Api/petwash.db-shm b/PetWash.Api/petwash.db-shm index 233d50f..a2cf246 100644 Binary files a/PetWash.Api/petwash.db-shm and b/PetWash.Api/petwash.db-shm differ diff --git a/PetWash.Api/petwash.db-wal b/PetWash.Api/petwash.db-wal index 1083c1e..cf57725 100644 Binary files a/PetWash.Api/petwash.db-wal and b/PetWash.Api/petwash.db-wal differ diff --git a/PetWashControl/Images/liuc.png b/PetWashControl/Images/liuc.png new file mode 100644 index 0000000..bb66480 Binary files /dev/null and b/PetWashControl/Images/liuc.png differ diff --git a/PetWashControl/Images/liuc1.png b/PetWashControl/Images/liuc1.png new file mode 100644 index 0000000..da2fc3f Binary files /dev/null and b/PetWashControl/Images/liuc1.png differ diff --git a/PetWashControl/PetWashControl.csproj b/PetWashControl/PetWashControl.csproj index e46978f..88c31f2 100644 --- a/PetWashControl/PetWashControl.csproj +++ b/PetWashControl/PetWashControl.csproj @@ -20,6 +20,7 @@ + diff --git a/PetWashControl/ViewModels/MainViewModel.cs b/PetWashControl/ViewModels/MainViewModel.cs index 0fff09d..a07fb52 100644 --- a/PetWashControl/ViewModels/MainViewModel.cs +++ b/PetWashControl/ViewModels/MainViewModel.cs @@ -85,6 +85,9 @@ public partial class MainViewModel : ObservableObject [ObservableProperty] private string _currentDayOfWeek = DateTime.Now.ToString("dddd", new System.Globalization.CultureInfo("zh-CN")); + [ObservableProperty] + private bool _isInstructionDialogOpen; + private readonly System.Timers.Timer _carouselTimer; private readonly System.Timers.Timer _clockTimer; private readonly string[] _carouselImages = { "/Images/dog.png", "/Images/dog1.png", "/Images/dog2.png" }; @@ -203,6 +206,20 @@ public partial class MainViewModel : ObservableObject _logger.LogInfo($"切换到设置界面，之前的视图: {_previousView}"); } + [RelayCommand] + private void ShowInstruction() + { + IsInstructionDialogOpen = true; + _logger.LogInfo("显示使用说明"); + } + + [RelayCommand] + private void CloseInstruction() + { + IsInstructionDialogOpen = false; + _logger.LogInfo("关闭使用说明"); + } + [RelayCommand] private void BackToIdle() { diff --git a/PetWashControl/Views/MainWindow.xaml b/PetWashControl/Views/MainWindow.xaml index c9e80d8..9997d00 100644 --- a/PetWashControl/Views/MainWindow.xaml +++ b/PetWashControl/Views/MainWindow.xaml @@ -551,7 +551,8 @@ + + + + + + + + + + + + + + + + + + + + +