diff --git a/BetterGenshinImpact/App.xaml.cs b/BetterGenshinImpact/App.xaml.cs index 20cbef5b..4c185a7e 100644 --- a/BetterGenshinImpact/App.xaml.cs +++ b/BetterGenshinImpact/App.xaml.cs @@ -83,6 +83,7 @@ public partial class App : Application services.AddView(); services.AddView(); services.AddView(); + services.AddView(); // My Services services.AddSingleton(); diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj index 74a47ac6..9b2bd09b 100644 --- a/BetterGenshinImpact/BetterGenshinImpact.csproj +++ b/BetterGenshinImpact/BetterGenshinImpact.csproj @@ -144,6 +144,7 @@ + diff --git a/BetterGenshinImpact/Core/MouseKeyMonitor.cs b/BetterGenshinImpact/Core/Monitor/MouseKeyMonitor.cs similarity index 98% rename from BetterGenshinImpact/Core/MouseKeyMonitor.cs rename to BetterGenshinImpact/Core/Monitor/MouseKeyMonitor.cs index 0082d6ea..502d9744 100644 --- a/BetterGenshinImpact/Core/MouseKeyMonitor.cs +++ b/BetterGenshinImpact/Core/Monitor/MouseKeyMonitor.cs @@ -8,7 +8,7 @@ using System.Windows.Forms; using Vanara.PInvoke; using Timer = System.Timers.Timer; -namespace BetterGenshinImpact.Core; +namespace BetterGenshinImpact.Core.Monitor; public class MouseKeyMonitor { @@ -32,9 +32,9 @@ public class MouseKeyMonitor private DateTime _firstSpaceKeyDownTime = DateTime.MaxValue; private IKeyboardMouseEvents? _globalHook; - private IntPtr _hWnd; + private nint _hWnd; - public void Subscribe(IntPtr gameHandle) + public void Subscribe(nint gameHandle) { _hWnd = gameHandle; // Note: for the application hook, use the Hook.AppEvents() instead diff --git a/BetterGenshinImpact/View/MainWindow.xaml b/BetterGenshinImpact/View/MainWindow.xaml index f90b906f..b89bc3d1 100644 --- a/BetterGenshinImpact/View/MainWindow.xaml +++ b/BetterGenshinImpact/View/MainWindow.xaml @@ -81,7 +81,17 @@ Visibility="{markup:Converter Value={x:Static helpers:RuntimeHelper.IsDebuggerAttached}, Converter={StaticResource BooleanToVisibilityConverter}}"> - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BetterGenshinImpact/View/Pages/KeyMouseRecordPage.xaml.cs b/BetterGenshinImpact/View/Pages/KeyMouseRecordPage.xaml.cs new file mode 100644 index 00000000..e952bfc1 --- /dev/null +++ b/BetterGenshinImpact/View/Pages/KeyMouseRecordPage.xaml.cs @@ -0,0 +1,18 @@ +using BetterGenshinImpact.ViewModel.Pages; +using System.Windows.Controls; + +namespace BetterGenshinImpact.View.Pages; + +/// +/// KeyMouseRecordPage.xaml 的交互逻辑 +/// +public partial class KeyMouseRecordPage : Page +{ + private KeyMouseRecordPageViewModel ViewModel { get; } + + public KeyMouseRecordPage(KeyMouseRecordPageViewModel viewModel) + { + DataContext = ViewModel = viewModel; + InitializeComponent(); + } +} diff --git a/BetterGenshinImpact/ViewModel/Pages/HomePageViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/HomePageViewModel.cs index 99f3aff2..ba8c36dd 100644 --- a/BetterGenshinImpact/ViewModel/Pages/HomePageViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Pages/HomePageViewModel.cs @@ -1,5 +1,5 @@ -using BetterGenshinImpact.Core; -using BetterGenshinImpact.Core.Config; +using BetterGenshinImpact.Core.Config; +using BetterGenshinImpact.Core.Monitor; using BetterGenshinImpact.Core.Recognition.ONNX; using BetterGenshinImpact.GameTask; using BetterGenshinImpact.Genshin.Paths; diff --git a/BetterGenshinImpact/ViewModel/Pages/KeyMouseRecordPageViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/KeyMouseRecordPageViewModel.cs new file mode 100644 index 00000000..00da97fc --- /dev/null +++ b/BetterGenshinImpact/ViewModel/Pages/KeyMouseRecordPageViewModel.cs @@ -0,0 +1,15 @@ +using CommunityToolkit.Mvvm.ComponentModel; +using Wpf.Ui.Controls; + +namespace BetterGenshinImpact.ViewModel.Pages; + +public class KeyMouseRecordPageViewModel : ObservableObject, INavigationAware, IViewModel +{ + public void OnNavigatedTo() + { + } + + public void OnNavigatedFrom() + { + } +}