截图应用未最小化问题解决

录屏结束后未合并完成直接录制问题解决
倒计时优化

XHWK.WKTool/App.config

@@ -9,8 +9,8 @@
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="119" />
-    <add key="VersionName" value="3.9.2" />
+    <add key="VersionCode" value="120" />
+    <add key="VersionName" value="3.9.3" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -30,11 +30,11 @@ namespace XHWK.WKTool
         /// </summary>
         private int _imgNum = 22;
 
-        public void Initialize(bool showlblShortcut = false, int changeTime = 3000)
+        public void InitAndShow(bool showlblShortcut = false, int changeTime = 3000)
         {
-            imgLoding.Opacity = 0.1;
             imgLoding.Source = _images.Last();
             Init(showlblShortcut, changeTime);
+            Show();
         }
 
         private System.Timers.Timer _timer;
@@ -56,9 +56,24 @@ namespace XHWK.WKTool
             _timer.Enabled = true;
             _timer.Interval = 1.0 * changeTime / 22;
             _timer.Elapsed += Timer_Elapsed;
+            _timer.Disposed += _timer_Disposed;
             _timer.Start();
             await Task.Delay(300);
-            imgLoding.Opacity = 1;
+        }
+
+        private void _timer_Disposed(object sender, EventArgs e)
+        {
+            Dispatcher.Invoke
+            (
+                async () =>
+                {
+                    // 执行操作
+                    imgLoding.Source = null;
+                    await Task.Delay(300);
+                    Hide();
+                },
+                DispatcherPriority.Send
+            );
         }
 
         private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
@@ -79,16 +94,7 @@ namespace XHWK.WKTool
             else
             {
                 _timer.Stop();
-                Dispatcher.Invoke
-                (
-                    () =>
-                    {
-                        // 执行操作
-                        imgLoding.Source = _images.Last();
-                        Hide();
-                    },
-                    DispatcherPriority.Send
-                );
+                _timer.Dispose();
             }
         }
 

XHWK.WKTool/MainWindow.xaml.cs

@@ -2613,13 +2613,8 @@ namespace XHWK.WKTool
                 if (App.W_CountdownWindow == null)
                 {
                     App.W_CountdownWindow = new CountdownWindow();
-                    App.W_CountdownWindow.Initialize();
                 }
-                else
-                {
-                    App.W_CountdownWindow.Initialize();
-                }
-                App.W_CountdownWindow.Show();
+                App.W_CountdownWindow.InitAndShow();
 
                 #endregion 录像倒计时
 

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -143,7 +143,6 @@ namespace XHWK.WKTool
                 //开始，暂停
                 BtnRecordingScreen_Click(null, null);
             }
-
             if (e.KeyValue == (int)Keys.F6 && (int)Control.ModifierKeys == (int)Keys.Control)
             {
                 //结束
@@ -273,7 +272,6 @@ namespace XHWK.WKTool
                         1000
                     );
                 }
-
                 _state = State.Loading;
                 _videoInfo = new Model_Video
                 {
@@ -284,13 +282,8 @@ namespace XHWK.WKTool
                 if (App.W_CountdownWindow == null)
                 {
                     App.W_CountdownWindow = new CountdownWindow();
-                    App.W_CountdownWindow.Initialize(true);
-                }
-                else
-                {
-                    App.W_CountdownWindow.Initialize(true);
                 }
-                App.W_CountdownWindow.Show();
+                App.W_CountdownWindow.InitAndShow(true);
                 BtnRecordingScreen.Visibility = Visibility.Collapsed;
                 BtnRecordingScreenPause.Visibility = Visibility.Visible;
                 BtnStopRecordingScreen.IsEnabled = true; //停止录制按钮可点击
@@ -574,25 +567,28 @@ namespace XHWK.WKTool
                 GetTimeStamp();
                 try
                 {
-                    Dispatcher.Invoke(() =>
-                    {
-                        if (App.W_PracticeWindow == null)
+                    Dispatcher.Invoke
+                    (
+                        () =>
                         {
-                            App.W_PracticeWindow = new PracticeWindow
+                            if (App.W_PracticeWindow == null)
                             {
-                                Width = pwidth,
-                                Height = pHeight,
-                                Left = 0,
-                                Top = 0
-                            };
+                                App.W_PracticeWindow = new PracticeWindow
+                                {
+                                    Width = pwidth,
+                                    Height = pHeight,
+                                    Left = 0,
+                                    Top = 0
+                                };
+                            }
+                            App.W_PracticeWindow.Initialize(); // imagePath);
+                            flg = 11;
+                            App.W_PracticeWindow.Blue();
+                            App.W_PracticeWindow.Show();
+                            App.W_PracticeWindow.Topmost = true;
+                            App.W_PracticeWindow.Focus();
                         }
-                        App.W_PracticeWindow.Initialize(); // imagePath);
-                        flg = 11;
-                        App.W_PracticeWindow.Blue();
-                        App.W_PracticeWindow.Show();
-                        App.W_PracticeWindow.Topmost = true;
-                        App.W_PracticeWindow.Focus();
-                    });
+                    );
                     new Thread
                     (
                         () =>
@@ -740,7 +736,17 @@ namespace XHWK.WKTool
         /// <returns></returns>
         public string GetTimeStamp()
         {
-            TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            TimeSpan ts = DateTime.Now
+            - new DateTime
+            (
+                1970,
+                1,
+                1,
+                0,
+                0,
+                0,
+                0
+            );
             return Convert.ToInt64(ts.TotalMilliseconds).ToString();
         }
 
@@ -800,7 +806,17 @@ namespace XHWK.WKTool
             #region 录屏批注取消画笔
 
             string imagePath = Path.Combine(_temppath, time + ".jpg");
-            ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath);
+            ImageHelper.GetScreenshot
+            (
+                new Rectangle
+                (
+                    0,
+                    0,
+                    0,
+                    0
+                ),
+                imagePath
+            );
 
             #endregion 录屏批注取消画笔
 
@@ -865,12 +881,16 @@ namespace XHWK.WKTool
         {
             if (_state == State.Pause || _state == State.Start)
             {
-                MessageBoxResult br = MessageWindow.Show("退出将结束并保存录制，是否继续？", "提示", MessageBoxButton.OKCancel);
+                MessageBoxResult br = MessageWindow.Show
+                (
+                    "退出将结束并保存录制，是否继续？",
+                    "提示",
+                    MessageBoxButton.OKCancel
+                );
                 if (br == MessageBoxResult.Cancel)
                 {
                     return;
                 }
-
                 BtnStopRecordingScreen_Click(null, null);
             }
             App.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();

星火微课/星火微课-测试.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课测试版"  
 #define MyAppDir "xhwk_test"
-#define MyAppVersion "3.9.2"
+#define MyAppVersion "3.9.3"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xh-wkclient\XHWK.WKTool\bin\x86\Debug\"