录屏中使用画笔录制无法结束的BUG

XHWK.WKTool/App.config

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

XHWK.WKTool/App.xaml.cs

@@ -9,10 +9,8 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Security.Principal;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Threading;
 
 using TStudyDigitalPen.HID;
 

XHWK.WKTool/AppUpdateWin.xaml

@@ -17,41 +17,24 @@
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
     mc:Ignorable="d">
-    <Window.Effect>
-        <DropShadowEffect
-            BlurRadius="10"
-            Direction="80"
-            ShadowDepth="0"
-            Color="#eeeeee" />
-    </Window.Effect>
-    <Grid>
-        <Views:ZJClippingBorder
-            Margin="10"
-            Background="#fafafa"
-            CornerRadius="10">
-            <Border.Effect>
-                <DropShadowEffect
-                    BlurRadius="10"
-                    Opacity="1"
-                    ShadowDepth="0"
-                    Color="#cccccc" />
-            </Border.Effect>
-        </Views:ZJClippingBorder>
 
+    <Grid>
         <Views:ZJClippingBorder
-            Margin="10"
+            Margin="0"
             Background="#fafafa"
-            CornerRadius="10">
+            BorderBrush="#3f6fff"
+            BorderThickness="1"
+            CornerRadius="0">
 
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="64" />
+                    <RowDefinition Height="44" />
                     <RowDefinition Height="*" />
                     <RowDefinition Height="64" />
                 </Grid.RowDefinitions>
                 <StackPanel Grid.Row="0" Orientation="Horizontal">
                     <Image
-                        Width="35"
+                        Width="26"
                         Margin="10,5,0,0"
                         VerticalAlignment="Center"
                         Source="/Images/APP.png" />
@@ -60,7 +43,7 @@
                         Grid.Row="0"
                         Margin="10,0,0,0"
                         VerticalAlignment="Center"
-                        FontSize="26"
+                        FontSize="24"
                         Foreground="#333333"
                         Text="应用更新" />
                 </StackPanel>

XHWK.WKTool/AppUpdateWin.xaml.cs

@@ -84,15 +84,25 @@ namespace XHWK.WKTool
             progress_sp.Visibility = Visibility.Collapsed;
             content_sv.Visibility = Visibility.Visible;
             button_bottom.Visibility = Visibility.Visible;
-            ProcessStartInfo psi = new ProcessStartInfo(filepath);
-            Process pro = new Process
+            try
             {
-                StartInfo = psi
-            };
-            pro.Start();
+                using (Process process = new Process())
+                {
+                    process.StartInfo.FileName = filepath;
+                    process.StartInfo.CreateNoWindow = true;
+                    process.StartInfo.UseShellExecute = false;
+                    process.StartInfo.RedirectStandardOutput = true;
+                    process.StartInfo.RedirectStandardError = true;
+
+                    process.Start();
+                }
+            }
+            catch (Exception)
+            {
+            }
             Dispatcher.Invoke(new Action(() =>
             {
-                System.Environment.Exit(0);
+                Environment.Exit(0);
             }));
             Close();
         }
@@ -102,4 +112,4 @@ namespace XHWK.WKTool
             MessageWindow.Show(msg);
         }
     }
-}
+}

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -10,6 +10,7 @@
     Height="450"
     Margin="0"
     AllowsTransparency="True"
+    Closed="Window_Closed"
     Loaded="Window_Loaded"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
@@ -182,7 +183,6 @@
                                     </Grid>
                                     <Label Height="1.5" Background="#3F6FFF" />
                                 </StackPanel>
-
                             </Grid>
                             <!--  按钮  -->
                             <Grid Grid.Row="3">
@@ -209,8 +209,7 @@
                                     FontSize="18"
                                     FontWeight="Bold"
                                     Foreground="#FFFFFF"
-                                    IsDefault="True"
-                                    >
+                                    IsDefault="True">
                                     <Button.Template>
                                         <ControlTemplate TargetType="{x:Type Button}">
                                             <Border
@@ -272,7 +271,7 @@
                     FontSize="16"
                     Foreground="#FFFFFF"
                     Text="创建微课" />
-                <!--<Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" VerticalAlignment="Top" Foreground="#FFFFFF" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right"  Click="BtnDown_Click"/>-->
+                <!--<Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" VerticalAlignment="Top" Foreground="#FFFFFF" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right"  Click="BtnDown_Click" />-->
             </Grid>
             <Grid
                 x:Name="GridTitle_Black"
@@ -296,11 +295,10 @@
                     Content="×"
                     Cursor="Hand"
                     FontSize="30"
-                    Foreground="#FF333333"
-                     />
+                    Foreground="#FF333333" />
             </Grid>
             <!--  第二行 讲解名称  -->
             <!--  第三行 存放路径  -->
         </Grid>
     </Grid>
-</Window>
+</Window>

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -382,5 +382,10 @@ namespace XHWK.WKTool
         {
             getNewApp();
         }
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            Environment.Exit(0);
+        }
     }
 }

XHWK.WKTool/MainWindow.xaml

@@ -10,6 +10,7 @@
     AllowsTransparency="False"
     BorderBrush="#eee"
     BorderThickness="0"
+    Closed="Window_Closed"
     Loaded="Window_Loaded"
     MouseLeftButtonDown="Window_MouseLeftButtonDown_1"
     ResizeMode="CanMinimize"

XHWK.WKTool/MainWindow.xaml.cs

@@ -4461,6 +4461,11 @@ namespace XHWK.WKTool
         }
 
         #endregion 笔事件回调
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            Environment.Exit(0);
+        }
     }
 
     public class PageData

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -843,7 +843,7 @@ namespace XHWK.WKTool
             #region 录屏批注取消画笔
 
             string imagePath = Path.Combine(temppath, time + ".jpg");
-            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+            ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath);
 
             #endregion 录屏批注取消画笔
 

XHWK.WKTool/system/ImageHelper.cs

@@ -140,6 +140,56 @@ namespace Common.system
 
         #region 截图统一方法
 
+        /// <summary>
+        /// 截图通用方法 创建人：赵耀 创建时间：2020年8月11日
+        /// </summary>
+        /// <param name="ScreenSize">截图的区域，设置new Rectangle(0, 0, 0, 0)为截全屏</param>
+        /// <param name="ImageSavePath">图片存储路径，为空或null则保存到临时文件夹</param>
+        /// <param name="IsRetImg">是否返回图片</param>
+        /// <param name="bitmapimg">图片</param>
+        /// <param name="level">压缩等级，0到100，0 最差质量，100 最佳</param>
+        /// <returns></returns>
+        public static bool GetScreenshot(Rectangle ScreenSize, string ImageSavePath, long level = -1)
+        {
+            try
+            {
+                System.Drawing.Size bounds = PrimaryScreen.DESKTOP;
+                if (string.IsNullOrEmpty(ImageSavePath))
+                {
+                    ImageSavePath = GetTempImagePath();//如果为空则指定临时存储路径
+                }
+                double scaleWidth = (bounds.Width * 1.0) / SystemParameters.PrimaryScreenWidth;
+                double scaleHeight = (bounds.Height * 1.0) / SystemParameters.PrimaryScreenHeight;
+                int width = bounds.Width;
+                int height = bounds.Height;
+                if (ScreenSize.Size != new System.Drawing.Size(0, 0))
+                {
+                    width = (int)(ScreenSize.Size.Width * scaleWidth);
+                    height = (int)(ScreenSize.Size.Height * scaleHeight);
+                }
+                int l = (int)(ScreenSize.X * scaleWidth);
+                int t = (int)(ScreenSize.Y * scaleHeight);
+                if (_Bitmap != null)
+                {
+                    _Bitmap.Dispose();
+                }
+                _Bitmap = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+                using (Graphics g = Graphics.FromImage(_Bitmap))
+                {
+                    g.CopyFromScreen(l, t, 0, 0, _Bitmap.Size, CopyPixelOperation.SourceCopy);
+                    Compress(_Bitmap, ImageSavePath, level);
+                }
+
+                GC.Collect();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【截图】(GetBitmapSource)截图失败，" + ex.Message, ex);
+                return false;
+            }
+        }
+
         /// <summary>
         /// 截图通用方法 创建人：赵耀 创建时间：2020年8月11日
         /// </summary>
@@ -436,7 +486,6 @@ namespace Common.system
                         encoder.Save(stream);
                     }
                 }
-                
             }
             catch (Exception e)
             {
@@ -462,7 +511,7 @@ namespace Common.system
                 RenderTargetBitmap bmp = new RenderTargetBitmap(
                         (int)frameworkElement.ActualWidth,
                         (int)frameworkElement.ActualHeight,
-                        1 / 96, 
+                        1 / 96,
                         1 / 96,
                         PixelFormats.Default
                     );
@@ -470,7 +519,7 @@ namespace Common.system
                 BitmapEncoder enc = new PngBitmapEncoder();
                 enc.Frames.Add(BitmapFrame.Create(bmp));
                 enc.Save(outStream);
-              
+
                 System.Drawing.Bitmap bitmap = new System.Drawing.Bitmap(outStream);
                 return new Bitmap(bitmap, width, height);
             }

星火微课/星火微课-正式.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.2.3"
+#define MyAppVersion "3.2.4"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"