zhao：修改计时器，解决长时间录屏计时不准

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -56,10 +56,7 @@ namespace XHWK.WKTool
         /// 状态
         /// </summary>
         private State _state = State.End;
-        /// <summary>
-        /// 计时用
-        /// </summary>
-        private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
+        
         private KeyboardHookCommon k_hook;
         /// <summary>
         /// 🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
@@ -145,11 +142,11 @@ namespace XHWK.WKTool
             {
                 t = new DispatcherTimer();
                 t.Tick += OnTimer;
-                t.Interval = new TimeSpan(0, 0, 0, 1);
+                t.Interval = new TimeSpan(0, 0, 0,0, 300);
                 t.IsEnabled = true;
                 t.Start();
             }
-            t.Interval = new TimeSpan(0, 0, 0, 1);
+            t.Interval = new TimeSpan(0, 0, 0, 0,300);
             //Stack();
             //ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
             //BtnRecordingScreen_Click(null, null);
@@ -199,6 +196,11 @@ namespace XHWK.WKTool
 
         #region 事件
         /// <summary>
+        /// 记录上次执行时间
+        /// </summary>
+        private DateTime Recorddt = DateTime.Now;
+        DateTime SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+        /// <summary>
         /// 时钟回调
         /// </summary>
         /// <param name="sender"></param>
@@ -209,7 +211,14 @@ namespace XHWK.WKTool
             {
                 case State.Start:
                     {
-                        _timeSpan += new TimeSpan(0, 0, 0, 1);
+                        DateTime dt = DateTime.Now;
+                        TimeSpan ts = dt.Subtract(Recorddt);//时间差   
+                        double tsmi = ts.TotalMilliseconds;
+                        if (tsmi > 500.0)
+                        {
+                            Recorddt = Recorddt.AddMilliseconds(500);
+                            SRTime = SRTime.AddMilliseconds(500);
+                        }
                     }
                     break;
 
@@ -220,16 +229,31 @@ namespace XHWK.WKTool
 
                 case State.End:
                     {
-                        _timeSpan = new TimeSpan();
-                        //_timeSpan = new TimeSpan(0, 23, 12, 45, 54);
+                        SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+                        //_timeSpan = new TimeSpan();
+                        ////_timeSpan = new TimeSpan(0, 23, 12, 45, 54);
                     }
                     break;
             }
 
-            string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
+            //string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
             //char[] times = time.ToCharArray();
-            txbTime.Text = time;
+            if (SRTime.Hour > 0)
+            {
+                //Dispatcher.Invoke(() =>
+                //{
+                txbTime.Text = SRTime.ToString("HH:mm:ss");
+                //});
+            }
+            else
+            {
+                //Dispatcher.Invoke(() =>
+                //{
+                txbTime.Text = SRTime.ToString("mm:ss");
+                //});
+            }
         }
+
         /// <summary>
         /// 开始
         /// </summary>
@@ -237,6 +261,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void Stack()
         {
+            Recorddt = DateTime.Now;
             _state = State.Start;
         }
         /// <summary>
@@ -556,7 +581,7 @@ namespace XHWK.WKTool
             {
                 try
                 {
-                    if (_timeSpan.Minutes > 0 || _timeSpan.Seconds > 3)
+                    if (SRTime.Hour > 0 || SRTime.Minute > 0 || SRTime.Second > 3)
                     {
                         try
                         {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -265,75 +265,6 @@ namespace XHWK.WKTool
             }
         }
 
-        /// <summary>
-        /// 开始
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Stack()
-        {
-            _state = State.Start;
-        }
-        /// <summary>
-        /// 暂停
-        /// </summary>
-        private void TimeOut()
-        {
-            _state = State.Pause;
-        }
-        /// <summary>
-        /// 结束
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void End()
-        {
-            _state = State.End;
-        }
-        /// <summary>
-        /// 时钟回调
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void OnTimer(object sender, EventArgs e)
-        {
-            switch (_state)
-            {
-                case State.Start:
-                    {
-                        _timeSpan += new TimeSpan(0, 0, 0, 1);
-                    }
-                    break;
-
-                case State.Pause:
-                    {
-                    }
-                    break;
-
-                case State.End:
-                    {
-                        _timeSpan = new TimeSpan();
-                        //_timeSpan = new TimeSpan(0, 23, 12, 45, 54);
-                    }
-                    break;
-            }
-
-            string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
-            txbTime.Text = time;
-            //txbTime.Text = time;
-        }
-        /// <summary>
-        /// 修改布局
-        /// </summary>
-        public void SetUpLayout()
-        {
-            //宽高比1276，1040
-            //double AspectRatio = 1276.0 / 1040.0;
-            ////System.Drawing.Size des = PrimaryScreen.DESKTOP;
-            //System.Drawing.Size workingArea = PrimaryScreen.WorkingArea;
-            //this.Height = workingArea.Height;
-
-        }
         #endregion
 
         #region 事件
@@ -347,7 +278,6 @@ namespace XHWK.WKTool
             DragMove();
         }
 
-
         #region 摄像头
         private System.Timers.Timer times;
         private List<string> RbnOpen;
@@ -2930,19 +2860,7 @@ namespace XHWK.WKTool
                     }
                     #endregion
 
-                    #region 计时器初始化
-
-                    //if (t == null)
-                    //{
-                    //    t = new DispatcherTimer();
-                    //    t.Tick += OnTimer;
-                    //    t.Interval = new TimeSpan(0, 0, 0, 1);
-                    //    t.IsEnabled = true;
-                    //    t.Start();
-                    //}
-                    //t.Interval = new TimeSpan(0, 0, 0, 1);
                     txbTime.Visibility = Visibility.Visible;
-                    #endregion
 
                     VideoInfo = new Model_Video
                     {
@@ -4670,17 +4588,6 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
-        /// 位置确定
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnOk_Click(object sender, RoutedEventArgs e)
-        {
-            //APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
-            //btnOk.Visibility = Visibility.Collapsed;
-            //blackboard_canvas.Visibility = Visibility.Visible;
-        }
-        /// <summary>
         /// 引用user32.dll动态链接库（windows api），
         /// 使用库中定义 API：SetCursorPos
         /// 设置光标位置