Merge remote-tracking branch 'origin/zyy' into zhangxueyang

Common/system/KeyboardHookCommon.cs

@@ -156,8 +156,8 @@ namespace Common.system
 
             }
         }
-        //接收SetWindowsHookEx返回值  
-        private static int _hHookValue = 0;
+        ////接收SetWindowsHookEx返回值  
+        //private static int _hHookValue = 0;
         private int KeyboardHookProc(int nCode, int wParam, IntPtr lParam)
         {
             // 侦听键盘事件

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -21,7 +21,6 @@ namespace XHWK.WKTool
         /// <summary>
         /// 计时器
         /// </summary>
-        private System.Timers.Timer timer;
         private int ImgNum = 21;
         public void Initialize(bool ShowlblShortcut = false, int changeTime = 2100)
         {
@@ -84,7 +83,7 @@ namespace XHWK.WKTool
             }
             else
             {
-                timer.Enabled = false;
+                //timer.Enabled = false;
                 Dispatcher.Invoke(
                   DispatcherPriority.Send,
                   new Action(() =>

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -49,7 +49,7 @@ namespace XHWK.WKTool
         public void Initialize()
         {
             APP.myloading.Show();
-            MouseNumber = 0;
+            //MouseNumber = 0;
             IsModify = false;
             //加载视频列表
             LoadingVideoList();
@@ -360,7 +360,7 @@ namespace XHWK.WKTool
             }
         }
 
-        private int MouseNumber = 0;
+        //private int MouseNumber = 0;
         /// <summary>
         /// 鼠标按下
         /// </summary>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -48,12 +48,12 @@ namespace XHWK.WKTool
         //声明一个 DrawingAttributes 类型的变量  
         private DrawingAttributes drawingAttributes;
         private Model_Video VideoInfo = null;
-        //定义事件
-        public event ChangeTextHandler ChangeTextEvent;
+        ////定义事件
+        //public event ChangeTextHandler ChangeTextEvent;
         //定义委托
         public delegate void ChangeTextHandler(string text);
         //定义委托
-        public delegate void ChangeTextHandlers(string text, int i); 
+        public delegate void ChangeTextHandlers(string text, int i);
 
         /// <summary>
         /// 图片
@@ -1488,8 +1488,8 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【加载视频列表】（LoadingVideoList）" + ex.Message, ex);
             }
         }
-        //定义事件
-        public event ChangeTextHandler ChangeTextEvents;
+        ////定义事件
+        //public event ChangeTextHandler ChangeTextEvents;
         /// <summary>
         /// 上传
         /// </summary>
@@ -3325,10 +3325,10 @@ namespace XHWK.WKTool
         /// </summary>
         private const int A4_HEIGHT = 7920;
 
-        /// <summary>
-        /// 画板
-        /// </summary>
-        private Graphics graphics;
+        ///// <summary>
+        ///// 画板
+        ///// </summary>
+        //private Graphics graphics;
 
         /// <summary>
         /// 笔画坐标数组