添加全局错误日志 合并前终止ffmpeg

XHWK.WKTool/App.config

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

XHWK.WKTool/App.xaml.cs

@@ -10,6 +10,7 @@ using System.Linq;
 using System.Reflection;
 using System.Security.Principal;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
 
@@ -264,7 +265,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 主页面
         /// </summary>
-        public static XHMicroLessonSystemWindow W_XHMicroLessonSystemWindow = null;
+        public static MainWindow W_XHMicroLessonSystemWindow = null;
 
         /// <summary>
         /// 创建微课页面
@@ -329,6 +330,7 @@ namespace XHWK.WKTool
         {
             Console.WriteLine("初始化APP");
             LogHelper.InitLog4Net();
+
             myloading = new LoadDialog();
             StopSameProcess();
             Killffmpeg();
@@ -433,18 +435,81 @@ namespace XHWK.WKTool
 
         #endregion 杀死已存在的进程
 
-        /// <summary>
-        /// 错误处理
-        /// </summary>
-        /// <param name="sender">
-        /// </param>
-        /// <param name="e">
-        /// </param>
-        private void MyApp_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
+        private void RegisterEvents()
+        {
+            //Task线程内未捕获异常处理事件
+            TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;//Task异常
+
+            //UI线程未捕获异常处理事件（UI主线程）
+            DispatcherUnhandledException += App_DispatcherUnhandledException;
+
+            //非UI线程未捕获异常处理事件(例如自己创建的一个子线程)
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+        }
+
+        private static void TaskScheduler_UnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
+        {
+            try
+            {
+                var exception = e.Exception as Exception;
+                if (exception != null)
+                {
+                    HandleException(exception);
+                }
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
+            }
+            finally
+            {
+                e.SetObserved();
+            }
+        }
+
+        //非UI线程未捕获异常处理事件(例如自己创建的一个子线程)
+        private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            try
+            {
+                var exception = e.ExceptionObject as Exception;
+                if (exception != null)
+                {
+                    HandleException(exception);
+                }
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
+            }
+            finally
+            {
+                //ignore
+            }
+        }
+
+        //UI线程未捕获异常处理事件（UI主线程）
+        private static void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+        {
+            try
+            {
+                HandleException(e.Exception);
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
+            }
+            finally
+            {
+                e.Handled = true;
+            }
+        }
+
+        private static void HandleException(Exception ex)
         {
-            LogHelper.WriteErrLog("未标示错误：" + e.Exception.Message, e.Exception);
-            MessageWindow.Show("程序异常." + Environment.NewLine + e.Exception.Message);
-            e.Handled = true;
+            MessageBox.Show("出错了，请与开发人员联系：" + ex.Message);
+            //记录日志
+            LogHelper.WriteErrLog("未捕获异常：" + ex.Message, ex);
         }
 
         #region 数据保存和读取
@@ -651,6 +716,7 @@ namespace XHWK.WKTool
         /// </param>
         protected override void OnStartup(StartupEventArgs e)
         {
+            RegisterEvents();
             new Thread(o =>
             {
                 while (true)

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -301,7 +301,7 @@ namespace XHWK.WKTool
 
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
-                APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+                APP.W_XHMicroLessonSystemWindow = new MainWindow();
             }
             APP.W_XHMicroLessonSystemWindow.Show();
             LblCreate.Visibility = Visibility.Hidden;

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -19,7 +19,7 @@ using System.Windows.Media.Imaging;
 
 using XHWK.WKTool;
 
-using static XHWK.WKTool.XHMicroLessonSystemWindow;
+using static XHWK.WKTool.MainWindow;
 
 namespace ComeCapture
 {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml → XHWK.WKTool/MainWindow.xaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="XHWK.WKTool.XHMicroLessonSystemWindow"
+    x:Class="XHWK.WKTool.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -8,7 +8,6 @@
     Width="950"
     Height="700"
     AllowsTransparency="False"
-  
     BorderBrush="#eee"
     BorderThickness="1"
     Loaded="Window_Loaded"
@@ -220,7 +219,6 @@
         </Style>
     </Window.Resources>
 
-
     <Grid>
         <!--  内容区 上：标题栏  下：工具栏和录制区域  -->
         <Grid
@@ -398,7 +396,6 @@
                             Cursor="Hand"
                             FontSize="14"
                             Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
-
                     </Grid>
                     <!--  测试  -->
                     <Grid Grid.Column="2" Visibility="Collapsed">
@@ -879,7 +876,6 @@
                                             <ScaleTransform ScaleX="-1" />
                                         </Image.RenderTransform>
                                     </Image>
-                                   
                                 </Grid>
                             </Border>
                         </Grid>
@@ -891,290 +887,291 @@
                             Background="#FFFFFFFF"
                             Visibility="Visible">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="200"></ColumnDefinition>
-                                <ColumnDefinition Width="*"></ColumnDefinition>
-                                <ColumnDefinition Width="200"></ColumnDefinition>
-                        
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="200" />
                             </Grid.ColumnDefinitions>
                             <!--  页码  -->
                             <Grid
-                                    x:Name="GridPage"
-                                    Grid.Column="0"
-                                    Grid.Row="0"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    MouseLeftButtonDown="Window_MouseLeftButtonDown_1"
-                                    Visibility="Collapsed">
+                                x:Name="GridPage"
+                                Grid.Row="0"
+                                Grid.Column="0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                MouseLeftButtonDown="Window_MouseLeftButtonDown_1"
+                                Visibility="Collapsed">
                                 <StackPanel
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Height="30"
-                                        Margin="0,0,0,0"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Bottom"
-                                        Background="Transparent"
-                                        Orientation="Horizontal">
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Height="30"
+                                    Margin="0,0,0,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Bottom"
+                                    Background="Transparent"
+                                    Orientation="Horizontal">
 
-                                    <Label Margin="5,0,0,0" Content="页码:" VerticalAlignment="Center" ></Label>
+                                    <Label
+                                        Margin="5,0,0,0"
+                                        VerticalAlignment="Center"
+                                        Content="页码:" />
 
                                     <Button
-                                            x:Name="last_button"
-                                            Width="28"
-                                            Height="20"
-                                            Click="last_button_Click"
-                                            Cursor="Hand"
-                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                        x:Name="last_button"
+                                        Width="28"
+                                        Height="20"
+                                        Click="last_button_Click"
+                                        Cursor="Hand"
+                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                                         <StackPanel>
                                             <Image
-                                                    Width="16"
-                                                    Height="12"
-                                                    Source=".\Images\class_p1.png" />
+                                                Width="16"
+                                                Height="12"
+                                                Source=".\Images\class_p1.png" />
                                         </StackPanel>
                                     </Button>
                                     <Grid
-                                            Width="60"
-                                            Background="Transparent"
-                                            MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                                        Width="60"
+                                        Background="Transparent"
+                                        MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
                                         <StackPanel
-                                                HorizontalAlignment="Center"
-                                                Background="Transparent"
-                                                Orientation="Horizontal">
+                                            HorizontalAlignment="Center"
+                                            Background="Transparent"
+                                            Orientation="Horizontal">
                                             <TextBlock
-                                                    x:Name="txbCurrpage"
-                                                    Margin="0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="14"
-                                                    Text="{Binding currpage}"
-                                                    TextAlignment="Center" />
+                                                x:Name="txbCurrpage"
+                                                Margin="0"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                FontSize="14"
+                                                Text="{Binding currpage}"
+                                                TextAlignment="Center" />
                                             <TextBlock
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="14"
-                                                    Text="/"
-                                                    TextAlignment="Center" />
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                FontSize="14"
+                                                Text="/"
+                                                TextAlignment="Center" />
                                             <TextBlock
-                                                    x:Name="txbTotalpage"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="14"
-                                                    Text="{Binding pagenum}"
-                                                    TextAlignment="Center" />
+                                                x:Name="txbTotalpage"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                FontSize="14"
+                                                Text="{Binding pagenum}"
+                                                TextAlignment="Center" />
                                         </StackPanel>
                                     </Grid>
                                     <Button
-                                            x:Name="next_btn"
-                                            Width="28"
-                                            Height="20"
-                                            Background="Transparent"
-                                            Click="next_btn_Click"
-                                            Cursor="Hand"
-                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                        x:Name="next_btn"
+                                        Width="28"
+                                        Height="20"
+                                        Background="Transparent"
+                                        Click="next_btn_Click"
+                                        Cursor="Hand"
+                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                                         <StackPanel>
                                             <Image
-                                                    Width="16"
-                                                    Height="12"
-                                                    Source=".\Images\class_p2.png" />
+                                                Width="16"
+                                                Height="12"
+                                                Source=".\Images\class_p2.png" />
                                         </StackPanel>
                                     </Button>
-
                                 </StackPanel>
                             </Grid>
                             <StackPanel
-                                    Margin="5"
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
+                                Grid.Column="1"
+                                Margin="5"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Orientation="Horizontal">
                                 <TextBlock
-                                        Margin="5,0,0,0"
-                                        Padding="0,0,0,0"
-                                        VerticalAlignment="Center"
-                                        FontSize="12"
-                                        Text="颜色: " />
+                                    Margin="5,0,0,0"
+                                    Padding="0,0,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="12"
+                                    Text="颜色: " />
                                 <Button
-                                        x:Name="btnWhite"
-                                        Width="20"
-                                        Height="20"
-                                        Margin="0,2,0,0"
-                                        Background="#FFFFFF"
-                                        Click="BtnWhite_Click"
-                                        Cursor="Hand"
-                                        Visibility="Collapsed" />
+                                    x:Name="btnWhite"
+                                    Width="20"
+                                    Height="20"
+                                    Margin="0,2,0,0"
+                                    Background="#FFFFFF"
+                                    Click="BtnWhite_Click"
+                                    Cursor="Hand"
+                                    Visibility="Collapsed" />
                                 <Border
+                                    Width="20"
+                                    Height="20"
+                                    Margin="5,2,0,0"
+                                    Background="#666666">
+                                    <Button
+                                        x:Name="btnRed"
                                         Width="20"
                                         Height="20"
-                                        Margin="5,2,0,0"
-                                        Background="#666666">
-                                    <Button
-                                            x:Name="btnRed"
-                                            Width="20"
-                                            Height="20"
-                                            Margin="1,1,1,1"
-                                            HorizontalAlignment="Center"
-                                            Background="#FF0000"
-                                            Click="BtnRed_Click"
-                                            Cursor="Hand"
-                                            Style="{StaticResource NoMouseOverButtonStyle}">
+                                        Margin="1,1,1,1"
+                                        HorizontalAlignment="Center"
+                                        Background="#FF0000"
+                                        Click="BtnRed_Click"
+                                        Cursor="Hand"
+                                        Style="{StaticResource NoMouseOverButtonStyle}">
                                         <Image
-                                                x:Name="imgRed"
-                                                Width="12"
-                                                Source=".\Images\microLessonSystem_999.png"
-                                                Visibility="Visible" />
+                                            x:Name="imgRed"
+                                            Width="12"
+                                            Source=".\Images\microLessonSystem_999.png"
+                                            Visibility="Visible" />
                                     </Button>
                                 </Border>
                                 <Border
+                                    Width="20"
+                                    Height="20"
+                                    Margin="5,2,0,0"
+                                    Background="#666666">
+                                    <Button
+                                        x:Name="btnGray"
                                         Width="20"
                                         Height="20"
-                                        Margin="5,2,0,0"
-                                        Background="#666666">
-                                    <Button
-                                            x:Name="btnGray"
-                                            Width="20"
-                                            Height="20"
-                                            Margin="1,1,1,1"
-                                            Background="#333333"
-                                            Click="BtnGray_Click"
-                                            Cursor="Hand"
-                                            Style="{StaticResource NoMouseOverButtonStyle}">
+                                        Margin="1,1,1,1"
+                                        Background="#333333"
+                                        Click="BtnGray_Click"
+                                        Cursor="Hand"
+                                        Style="{StaticResource NoMouseOverButtonStyle}">
                                         <Image
-                                                x:Name="imgGray"
-                                                Width="12"
-                                                Source=".\Images\microLessonSystem_999.png"
-                                                Visibility="Collapsed" />
+                                            x:Name="imgGray"
+                                            Width="12"
+                                            Source=".\Images\microLessonSystem_999.png"
+                                            Visibility="Collapsed" />
                                     </Button>
                                 </Border>
                                 <Border
+                                    Width="20"
+                                    Height="20"
+                                    Margin="5,2,0,0"
+                                    Background="#666666">
+                                    <Button
+                                        x:Name="btnCyanBlue"
                                         Width="20"
                                         Height="20"
-                                        Margin="5,2,0,0"
-                                        Background="#666666">
-                                    <Button
-                                            x:Name="btnCyanBlue"
-                                            Width="20"
-                                            Height="20"
-                                            Margin="1,1,1,1"
-                                            Background="#63D600"
-                                            Click="BtnCyanBlue_Click"
-                                            Cursor="Hand"
-                                            Style="{StaticResource NoMouseOverButtonStyle}">
+                                        Margin="1,1,1,1"
+                                        Background="#63D600"
+                                        Click="BtnCyanBlue_Click"
+                                        Cursor="Hand"
+                                        Style="{StaticResource NoMouseOverButtonStyle}">
                                         <Image
-                                                x:Name="imgCyanBlue"
-                                                Width="12"
-                                                Source=".\Images\microLessonSystem_999.png"
-                                                Visibility="Collapsed" />
+                                            x:Name="imgCyanBlue"
+                                            Width="12"
+                                            Source=".\Images\microLessonSystem_999.png"
+                                            Visibility="Collapsed" />
                                     </Button>
                                 </Border>
                                 <Border
-                                        Width="20"
-                                        Height="20"
-                                        Margin="5,2,0,0"
-                                        Background="#666666">
+                                    Width="20"
+                                    Height="20"
+                                    Margin="5,2,0,0"
+                                    Background="#666666">
 
                                     <Button
-                                            x:Name="btnYellow"
-                                            Width="20"
-                                            Height="20"
-                                            Margin="1,1,1,1"
-                                            Background="#FFBC00"
-                                            Click="BtnYellow_Click"
-                                            Cursor="Hand"
-                                            Style="{StaticResource NoMouseOverButtonStyle}">
+                                        x:Name="btnYellow"
+                                        Width="20"
+                                        Height="20"
+                                        Margin="1,1,1,1"
+                                        Background="#FFBC00"
+                                        Click="BtnYellow_Click"
+                                        Cursor="Hand"
+                                        Style="{StaticResource NoMouseOverButtonStyle}">
 
                                         <Image
-                                                x:Name="imgYellow"
-                                                Width="12"
-                                                Source=".\Images\microLessonSystem_999.png"
-                                                Visibility="Collapsed" />
+                                            x:Name="imgYellow"
+                                            Width="12"
+                                            Source=".\Images\microLessonSystem_999.png"
+                                            Visibility="Collapsed" />
                                     </Button>
                                 </Border>
                                 <Border
-                                        Width="20"
-                                        Height="20"
-                                        Margin="5,2,0,0"
-                                        Background="#666666">
+                                    Width="20"
+                                    Height="20"
+                                    Margin="5,2,0,0"
+                                    Background="#666666">
 
                                     <Button
-                                            x:Name="btnBlue"
-                                            Width="20"
-                                            Height="20"
-                                            Margin="1,1,1,1"
-                                            Background="#00B4FC"
-                                            Click="BtnBlue_Click"
-                                            Cursor="Hand"
-                                            Style="{StaticResource NoMouseOverButtonStyle}">
+                                        x:Name="btnBlue"
+                                        Width="20"
+                                        Height="20"
+                                        Margin="1,1,1,1"
+                                        Background="#00B4FC"
+                                        Click="BtnBlue_Click"
+                                        Cursor="Hand"
+                                        Style="{StaticResource NoMouseOverButtonStyle}">
                                         <Image
-                                                x:Name="imgBlue"
-                                                Width="12"
-                                                Source=".\Images\microLessonSystem_999.png"
-                                                Visibility="Collapsed" />
+                                            x:Name="imgBlue"
+                                            Width="12"
+                                            Source=".\Images\microLessonSystem_999.png"
+                                            Visibility="Collapsed" />
                                     </Button>
                                 </Border>
                                 <TextBlock
-                                        Margin="5,0,0,0"
-                                        Padding="0,0,0,0"
-                                        VerticalAlignment="Center"
-                                        FontSize="12"
-                                        Text="粗细: " />
+                                    Margin="5,0,0,0"
+                                    Padding="0,0,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="12"
+                                    Text="粗细: " />
                                 <RadioButton
-                                        x:Name="rbnFine"
-                                        Margin="0"
-                                        VerticalAlignment="Center"
-                                        Click="RbnFine_Click"
-                                        Content=" 细"
-                                        Cursor="Hand"
-                                        FontSize="12"
-                                        IsChecked="True"
-                                        Style="{StaticResource radBase}" />
+                                    x:Name="rbnFine"
+                                    Margin="0"
+                                    VerticalAlignment="Center"
+                                    Click="RbnFine_Click"
+                                    Content=" 细"
+                                    Cursor="Hand"
+                                    FontSize="12"
+                                    IsChecked="True"
+                                    Style="{StaticResource radBase}" />
                                 <RadioButton
-                                        x:Name="rbnIn"
-                                        Margin="5,0,0,0"
-                                        VerticalAlignment="Center"
-                                        Click="RbnIn_Click"
-                                        Content=" 中"
-                                        Cursor="Hand"
-                                        FontSize="12"
-                                        Style="{StaticResource radBase}" />
+                                    x:Name="rbnIn"
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Click="RbnIn_Click"
+                                    Content=" 中"
+                                    Cursor="Hand"
+                                    FontSize="12"
+                                    Style="{StaticResource radBase}" />
                                 <RadioButton
-                                        x:Name="rbnCrude"
-                                        Margin="5,0,0,0"
-                                        VerticalAlignment="Center"
-                                        Click="RbnCrude_Click"
-                                        Content=" 粗"
-                                        Cursor="Hand"
-                                        FontSize="12"
-                                        Style="{StaticResource radBase}" />
+                                    x:Name="rbnCrude"
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Click="RbnCrude_Click"
+                                    Content=" 粗"
+                                    Cursor="Hand"
+                                    FontSize="12"
+                                    Style="{StaticResource radBase}" />
                             </StackPanel>
                             <StackPanel
-                                    Margin="5"
-                                    Grid.Column="2"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
+                                Grid.Column="2"
+                                Margin="5"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Orientation="Horizontal">
                                 <TextBlock
-                                        Padding="5,0,0,0"
-                                        VerticalAlignment="Center"
-                                        FontSize="12"
-                                        Text="摄像头: " />
+                                    Padding="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="12"
+                                    Text="摄像头: " />
                                 <RadioButton
-                                        x:Name="rbnOpen"
-                                        Margin="0,0,0,0"
-                                        VerticalAlignment="Center"
-                                        Click="RbnOpen_Click"
-                                        Content=" 开"
-                                        Cursor="Hand"
-                                        FontSize="12"
-                                        Style="{StaticResource radBase}" />
+                                    x:Name="rbnOpen"
+                                    Margin="0,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Click="RbnOpen_Click"
+                                    Content=" 开"
+                                    Cursor="Hand"
+                                    FontSize="12"
+                                    Style="{StaticResource radBase}" />
                                 <RadioButton
-                                        x:Name="rbnTurnOff"
-                                        Margin="5,0,10,0"
-                                        VerticalAlignment="Center"
-                                        Click="RbnTurnOff_Click"
-                                        Content=" 关"
-                                        Cursor="Hand"
-                                        FontSize="12"
-                                        IsChecked="True"
-                                        Style="{StaticResource radBase}" />
+                                    x:Name="rbnTurnOff"
+                                    Margin="5,0,10,0"
+                                    VerticalAlignment="Center"
+                                    Click="RbnTurnOff_Click"
+                                    Content=" 关"
+                                    Cursor="Hand"
+                                    FontSize="12"
+                                    IsChecked="True"
+                                    Style="{StaticResource radBase}" />
                             </StackPanel>
                         </Grid>
                     </Grid>
@@ -1306,7 +1303,6 @@
                                                 Foreground="#333333"
                                                 Text="科技蓝" />
                                         </Grid>
-
                                     </Grid>
 
                                     <Label
@@ -1545,7 +1541,6 @@
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="76" />
                                                 <ColumnDefinition Width="76" />
-
                                             </Grid.ColumnDefinitions>
                                             <!--  浏览按钮  -->
                                             <Button
@@ -1665,7 +1660,6 @@
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="50*" />
-
                                     </Grid.RowDefinitions>
                                     <Grid Grid.Column="2">
                                         <!--  保存  -->
@@ -1701,7 +1695,6 @@
                                             Foreground="#333333"
                                             Text="未连接"
                                             Visibility="Hidden" />
-
                                     </Grid>
                                 </Grid>
                             </Grid>
@@ -1898,7 +1891,7 @@
                         FontSize="12"
                         Foreground="White"
                         IsDefault="True" />
-                    
+
                     <Button
                         x:Name="btnPrint_Print"
                         Grid.Column="4"
@@ -1915,9 +1908,7 @@
                         Foreground="White"
                         IsDefault="True" />
                 </Grid>
-
             </Grid>
-
         </Border>
 
         <Grid

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs → XHWK.WKTool/MainWindow.xaml.cs

@@ -13,6 +13,7 @@ using NReco.VideoConverter;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -44,7 +45,7 @@ namespace XHWK.WKTool
     /// <summary>
     /// 主页面
     /// </summary>
-    public partial class XHMicroLessonSystemWindow : Window, PenEventI
+    public partial class MainWindow : Window, PenEventI
     {
         #region 字段
 
@@ -128,7 +129,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 主页面
         /// </summary>
-        public XHMicroLessonSystemWindow()
+        public MainWindow()
         {
             InitializeComponent();
 
@@ -3200,16 +3201,11 @@ namespace XHWK.WKTool
                     BtnScreenRecording.IsEnabled = false;
                 });
 
-                //缩略图
-                string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
-                FileToolsCommon.CreateDirectory(ThumbnailPath);
-                //缩略图存储位置
-                string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".", "") + ".JPG";
-
+       
+               
                 videoWriter.Close();
                 waveIn.StopRecording();
                 //停止截图
-
                 Dispatcher.Invoke(() =>
                 {
                     timer.Change(-1, 0);
@@ -3219,15 +3215,14 @@ namespace XHWK.WKTool
                     TxbType.Text = "保存中";
                 });
 
-                FileToolsCommon.DeleteFile(ThumbnailPathName);
-                VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                VideoInfo.VideoPath = VideoSavePathName;
-                VideoInfo.ThumbnailPath = ThumbnailPathName;
-                Console.WriteLine("生成缩略图");
-
+          
+              
+                Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
+                foreach (Process KillProcess in KillProcessArray)
+                {
+                    KillProcess.Kill();
+                }
                 Console.WriteLine("合并音视频 gridActWidth：" + gridActWidth + " gridActHeight:" + gridActHeight);
-
-                //APP.FFmpeg.VideoAudioMerge(VideoSynthesisPathName, AudioPathName, VideoSavePathName, gridActWidth, gridActHeight);
                 FFMpegConverter ffMpeg = new FFMpegConverter();
                 //ffMpeg.ConvertProgress += FfMpeg_ConvertProgress;
                 FFMpegInput[] input = new FFMpegInput[] {
@@ -3243,13 +3238,29 @@ namespace XHWK.WKTool
                     new OutputSettings() { }
                 );
 
+
                 //生成缩略图
-                bool ThuRes = APP.FFmpeg.GenerateThumbnails(TempVideoPathName, ThumbnailPathName, 200, 130);
+                string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
+                FileToolsCommon.CreateDirectory(ThumbnailPath);
+                //缩略图存储位置
+                string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".", "") + ".JPG";
 
+                FileToolsCommon.DeleteFile(ThumbnailPathName);
+                VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                VideoInfo.VideoPath = VideoSavePathName;
+                VideoInfo.ThumbnailPath = ThumbnailPathName;
                 VideoInfo.FileGuid = Guid.NewGuid().ToString();
                 VideoInfo.IsUpload = false;
                 VideoInfo.Uploaded = 0;
+                try
+                {
+                    bool ThuRes = APP.FFmpeg.GenerateThumbnails(TempVideoPathName, ThumbnailPathName, 200, 130);
 
+                }
+                catch (Exception ex) {
+                    LogHelper.WriteErrLog("录制生成缩略图", ex);
+                }
+                
                 if (!APP.VideoList.Exists(x => x.FileGuid == VideoInfo.FileGuid) || !APP.VideoList.Exists(x => x.VideoPath == VideoInfo.VideoPath))
                 {
                     APP.VideoList.Add(VideoInfo);
@@ -3257,8 +3268,15 @@ namespace XHWK.WKTool
                     APP.SaveWkData();
                 }
 
-                FileToolsCommon.DeleteFile(TempVideoPathName);
-                FileToolsCommon.DeleteFile(TempAudioPathName);
+                try
+                {
+                    FileToolsCommon.DeleteFile(TempVideoPathName);
+                    FileToolsCommon.DeleteFile(TempAudioPathName);
+                }
+                catch (Exception ex) {
+                    LogHelper.WriteErrLog("删除录制临时文件",ex);
+                }
+             
 
                 Dispatcher.Invoke(() =>
                 {
@@ -3470,9 +3488,9 @@ namespace XHWK.WKTool
                 return;
             }
             System.Windows.Point point = e.GetPosition(img);
-          
+
             System.Windows.Point PicLocate = e.GetPosition(imgCanvas);
-           
+
             TransformGroup group = IMG.FindResource("Imageview") as TransformGroup;
             double delta = e.Delta * 0.001;
             DowheelZoom(group, point, delta);
@@ -3492,7 +3510,7 @@ namespace XHWK.WKTool
             TranslateTransform transform1 = group.Children[1] as TranslateTransform;
             transform1.X = -1 * ((pointToContent.X * transform.ScaleX) - point.X);
             transform1.Y = -1 * ((pointToContent.Y * transform.ScaleY) - point.Y);
-   
+
             APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
             {
                 X = transform1.X,
@@ -3712,7 +3730,6 @@ namespace XHWK.WKTool
             imageOperationUtil.HideAngleBorder();
         }
 
-   
         private void PicEMap_MouseDown(object sender, MouseButtonEventArgs e)
         {
             imageOperationUtil.PicEMap_MouseDown(sender, e);
@@ -3720,7 +3737,7 @@ namespace XHWK.WKTool
 
         private void imgCanvas_MouseMove(object sender, MouseEventArgs e)
         {
-            imageOperationUtil.imgCanvas_MouseMove(sender,e);
+            imageOperationUtil.imgCanvas_MouseMove(sender, e);
         }
 
         private void imgCanvas_MouseUp(object sender, MouseButtonEventArgs e)

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -415,7 +415,7 @@ namespace XHWK.WKTool
 
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
-                APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+                APP.W_XHMicroLessonSystemWindow = new MainWindow();
             }
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
             //APP.W_XHMicroLessonSystemWindow.InitPen();

XHWK.WKTool/UploadWindow.xaml.cs

@@ -10,7 +10,7 @@ using System.Windows.Input;
 using XHWK.Model;
 using XHWK.WKTool.DAL;
 
-using static XHWK.WKTool.XHMicroLessonSystemWindow;
+using static XHWK.WKTool.MainWindow;
 
 namespace XHWK.WKTool
 {

XHWK.WKTool/XHWK.WKTool.csproj

@@ -341,8 +341,8 @@
     <Compile Include="Welcome.xaml.cs">
       <DependentUpon>Welcome.xaml</DependentUpon>
     </Compile>
-    <Compile Include="XHMicroLessonSystemWindow.xaml.cs">
-      <DependentUpon>XHMicroLessonSystemWindow.xaml</DependentUpon>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="CreateAMicroLessonWindow.xaml.cs">
       <DependentUpon>CreateAMicroLessonWindow.xaml</DependentUpon>
@@ -448,7 +448,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="XHMicroLessonSystemWindow.xaml">
+    <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>