From 6e3171259ee5c941227b599efd6fd28d1c2f130a Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 23 May 2019 23:50:07 +0800
Subject: [PATCH 1/2] Completed the main functions
---
.../HandyControlDemo_Shared/App.xaml.cs | 3 -
.../HandyControlDemo_Shared/MainWindow.xaml | 4 +
.../MainWindow.xaml.cs | 3 +
.../ViewModel/Main/MainViewModel.cs | 11 +-
.../Data/Args/KeyboardHookEventArgs.cs | 5 +-
.../HandyControl_Shared.projitems | 1 +
.../Tools/GlobalShortcut.cs | 116 ++++++++++++++++++
.../Tools/Hook/KeyboardHook.cs | 55 +++++++--
.../Tools/Hook/MouseHook.cs | 9 +-
.../Tools/Interop/NativeMethods.cs | 2 +
10 files changed, 195 insertions(+), 14 deletions(-)
create mode 100644 src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
index b597e60c..3f67d7c5 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
@@ -1,8 +1,5 @@
using System;
-using System.Globalization;
-using System.Threading;
using System.Windows;
-using HandyControl.Controls;
using HandyControl.Data;
using HandyControl.Tools;
using HandyControlDemo.Data;
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
index fabf5ef1..51e33d9b 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
@@ -23,6 +23,10 @@
hc:Dialog.Token="{x:Static data:MessageToken.MainWindow}"
d:DesignHeight="800"
d:DesignWidth="1400">
+
+
+
+
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
index ec24646f..5b5db38e 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
@@ -2,6 +2,7 @@
using System.ComponentModel;
using GalaSoft.MvvmLight.Messaging;
using HandyControl.Controls;
+using HandyControl.Tools;
using HandyControlDemo.Data;
using HandyControlDemo.Tools;
@@ -21,6 +22,8 @@ namespace HandyControlDemo
Messenger.Default.Send