视频录制采用实时录制方式

减小安装包体积

XHWK.WKTool/App.config

@@ -5,12 +5,12 @@
   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="0" />
+    <add key="IsDebug" value="1" />
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="80" />
-    <add key="VersionName" value="2.6.0" />
+    <add key="VersionCode" value="81" />
+    <add key="VersionName" value="2.6.1" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/Config/ZConfig.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XHWK.WKTool.Config
-{
-    internal class ZConfig
-    {
-        public static bool isDebug = true;
-
-        /// <summary>
-        /// 当前版本号
-        /// </summary>
-        public static int versionCode = 1;
-
-        public static string versionName = "1.0.0";
-
-        //接口地址
-        public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";
-
-        //图片地址
-        public static string uploadUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/" : "http://schoolfile.xhkjedu.com/";
-
-        public static string showImageUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/static/" : "http://schoolfile.xhkjedu.com/static/";
-
-        public static string secretKey = "nanhuakaizhangjianwangni";
-        public static string fileStorageAddress = "";
-
-        //认证接口地址
-        public static string certapiUrl = isDebug ? "http://certapitest.xhkjedu.com" : "http://certapi.xhkjedu.com";
-
-        /// <summary>
-        /// 数据存放目录
-        /// </summary>
-        public static string dataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Signature\\";
-
-        public static string basePath = AppDomain.CurrentDomain.BaseDirectory;
-
-        //缓存图片地址
-        public static string tempPath = basePath + "temp\\";
-
-        public static string nginxHtml = $"{basePath}nginx\\html\\";
-
-   
-        public static string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
-
-        public static string tongPingBasePath = $"{nginxHtml}tongping\\";
-    }
-}

XHWK.WKTool/CountdownWindow.xaml

@@ -1,27 +1,48 @@
-<Window x:Class="XHWK.WKTool.CountdownWindow"
-        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"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:XHWK.WKTool"
-        xmlns:gifLib="http://wpfanimatedgif.codeplex.com"
-        mc:Ignorable="d"
-        Title="CountdownWindow" Height="904.335" Width="1235.26"  AllowsTransparency="True"
+<Window
+    x:Class="XHWK.WKTool.CountdownWindow"
+    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"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="CountdownWindow"
+    Width="600"
+    Height="600"
+    AllowsTransparency="True"
+    Background="Transparent"
     ShowInTaskbar="False"
-        Topmost="True"
-    WindowStartupLocation="CenterOwner" WindowState="Maximized"
-    WindowStyle="None">
-    <Window.Background>
-        <SolidColorBrush Opacity="0.10" Color="#292C2E" />
-    </Window.Background>
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowState="Normal"
+    WindowStyle="None"
+    mc:Ignorable="d">
+
     <Grid>
-        <!--<Image x:Name="ImgGif"
-                    Width="600"
-                    Height="600"
-                    gifLib:ImageBehavior.AnimatedSource=".\Images\countdown.gif" MediaElement.MediaEnded="Image_MediaEnded"/>-->
-        <Image x:Name="imgLoding"
-                    Source=".\Images\countdown3_1.png" HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" />
-        <Border x:Name="borShortcut" Margin="0,450,0,0" Height="60" Width="550" Opacity="0.3"  Background="#999999"  CornerRadius="30"/>
-        <Label x:Name="lblShortcut" Content="开始/暂停：Ctrl+F5     停止：Ctrl+S" Height="60" Margin="0,450,0,0" Width="682" FontWeight="Bold" Foreground="#FFFFFF"   FontSize="30" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Visibility="Visible"/>
+
+        <Image
+            x:Name="imgLoding"
+            Width="300"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Source=".\Images\countdown3_1.png" />
+        <Border
+            x:Name="borShortcut"
+            Width="550"
+            Height="60"
+            Margin="0,450,0,0"
+            Background="#999999"
+            CornerRadius="30"
+            Opacity="0.3"
+            Visibility="Hidden" />
+        <Label
+            x:Name="lblShortcut"
+            Height="60"
+            Margin="0,450,0,0"
+            HorizontalContentAlignment="Center"
+            VerticalContentAlignment="Center"
+            Content="开始/暂停：Ctrl+F5     停止：Ctrl+S"
+            FontSize="26"
+            FontWeight="Bold"
+            Foreground="#FFFFFF"
+            Visibility="Hidden" />
     </Grid>
 </Window>

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -22,7 +22,7 @@ namespace XHWK.WKTool
         /// 计时器
         /// </summary>
         private int ImgNum = 22;
-        public void Initialize(bool ShowlblShortcut = false, int changeTime = 2000)
+        public void Initialize(bool ShowlblShortcut = false, int changeTime = 3000)
         {
             if (ShowlblShortcut)
             {
@@ -42,7 +42,7 @@ namespace XHWK.WKTool
                 {
                     try
                     {
-                        if (ImgNum >= 1)
+                        if (ImgNum >= 0)
                         {
                             loadingImg(ImgNum);
                             ImgNum--;
@@ -66,12 +66,7 @@ namespace XHWK.WKTool
                     }
                 }
             }))).Start();
-            //timer = new System.Timers.Timer(changeTime/21);//设置执行一次（false）还是一直执行(true)
-            //timer.AutoReset = true;//设置是否执行System.Timers.Timer.Elapsed事件
-            //timer.Elapsed +=new System.Timers.ElapsedEventHandler(Timer_Elapsed);
-            ////timer.Interval = changeTime/21;
-            //timer.Enabled = true; //启动计时器
-            //ImgNum = 21;
+
         }
 
         private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -27,18 +27,11 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
             ResizeMode = ResizeMode.NoResize;
-            new Thread(o =>
-            {
-                if (!FileToolsCommon.IsExistDirectory(FileToolsCommon.GetFileAbsolutePath("/ffmpeg/")))
-                {
-                    //32
-                    ZipHelper.UnZip(FileToolsCommon.GetFileAbsolutePath("/ffmpegx32.zip"), FileToolsCommon.GetFileAbsolutePath());
-                }
-            }).Start();
+       
             if (!APP.CheckScreenCapturerRecorder())
             {
                 MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“English-OK-Next>-Next>Install”完成安装！");
-                APP.InstallScreenCapturerRecorder();
+                //APP.InstallScreenCapturerRecorder();
             }
             txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
             //APP.FFmpeg.GetMToFFmpeg();

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1,4 +1,6 @@
-using Aspose.Slides;
+using Accord.Video.FFMPEG;
+
+using Aspose.Slides;
 using Aspose.Words.Saving;
 
 using ComeCapture;
@@ -545,22 +547,7 @@ namespace XHWK.WKTool
             {
                 MessageWindow.Show("当前正在录制，请先停止录制。");
                 return;
-                //MessageBoxResult dr = MessageWindow.Show("当前正在录制，是否停止录制？", "提示", MessageBoxButton.OKCancel);
-                //if (dr == MessageBoxResult.OK)
-                //{
-                //    APP.SaveWkData();
-                //    APP.SaveDraw();
-                //    BtnStop_Click(null, null);
-                //    while (!IsFirstR)
-                //    {
-                //        Thread.Sleep(100);
-                //    }
-                //    System.Environment.Exit(0);
-                //}
-                //else
-                //{
-                //    return;
-                //}
+              
             }
         }
 
@@ -3196,15 +3183,7 @@ namespace XHWK.WKTool
 
         #region 变量
 
-        /// <summary>
-        /// 视频保存路径
-        /// </summary>
-        //string RecordingPath;
-        /// <summary>
-        /// 图片保存路径
-        /// </summary>
-        private string ImgPath;
-
+  
         /// <summary>
         /// 音频保存路径名
         /// </summary>
@@ -3230,10 +3209,7 @@ namespace XHWK.WKTool
         /// </summary>
         private bool IsFirstR = true;
 
-        /// <summary>
-        /// 图片
-        /// </summary>
-        private List<string> RsImgName = null;
+    
 
         /// <summary>
         /// 是否开始截图计数
@@ -3285,36 +3261,10 @@ namespace XHWK.WKTool
             if (!APP.CheckScreenCapturerRecorder())
             {
                 MessageWindow.Show("使用此功能需安装环境,请在确定后依次点击“OK-Next>-Next>Install”完成安装！");
-                APP.InstallScreenCapturerRecorder();
+                //APP.InstallScreenCapturerRecorder();
                 return;
             }
 
-            #region 限制只允许录制一个录屏  废弃
-
-            //string RecordScreenPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
-            //if (FileToolsCommon.IsExistFile(RecordScreenPathName))
-            //{
-            //    MessageBoxResult dr = MessageWindow.Show("已存在录屏，是否覆盖？", "提示", MessageBoxButton.OKCancel);
-            //    if (dr == MessageBoxResult.OK)
-            //    {
-            //        try
-            //        {
-            //            FileToolsCommon.DeleteFile(RecordScreenPathName);
-            //            APP.VideoList.RemoveAll(x => x.VideoPath == RecordScreenPathName);
-            //        }
-            //        catch (Exception ex)
-            //        {
-            //            LogHelper.WriteErrLog("【录屏】（BtnRecordingScreen_Click）无法移除视频，" + ex.Message, ex);
-            //        }
-            //    }
-            //    else
-            //    {
-            //        return;
-            //    }
-            //}
-
-            #endregion 限制只允许录制一个录屏  废弃
-
             k_hook.Stop();
             if (APP.W_ScreenRecordingToolbarWindow == null)
             {
@@ -3392,7 +3342,7 @@ namespace XHWK.WKTool
                 IsPressButton = true;
                 new Thread(new ThreadStart(new Action(() =>
                 {
-                    Thread.Sleep(500);
+                    Thread.Sleep(3000);
                     IsPressButton = false;
                 }))).Start();
             }
@@ -3403,7 +3353,7 @@ namespace XHWK.WKTool
             if (!APP.CheckScreenCapturerRecorder())
             {
                 MessageWindow.Show("使用此功能需安装环境,请在确定后依次点击“OK-Next>-Next>Install”完成安装！");
-                APP.InstallScreenCapturerRecorder();
+                //APP.InstallScreenCapturerRecorder();
                 return;
             }
             if (APP.PageContextData.currpage > 0)
@@ -3443,7 +3393,6 @@ namespace XHWK.WKTool
                 if (APP.FFmpeg.StartRecordSpeakerAudio(audioSpeakerPath))
                 {
                     APP.FFmpeg.StopRecordAudio(2);
-                    //Thread.Sleep(500);
                     //麦克风
                     if (APP.FFmpeg.StartRecordAudio(audioMicrophonePath))
                     {
@@ -3527,12 +3476,7 @@ namespace XHWK.WKTool
             }
         }
 
-        /// <summary>
-        /// 设置录屏文件地址
-        /// </summary>
-        private void SetUpVideoPathName()
-        {
-        }
+        private VideoFileWriter videoWriter = new VideoFileWriter();//视频写入
 
         /// <summary>
         /// 开始录制和暂停录制
@@ -3552,14 +3496,15 @@ namespace XHWK.WKTool
                         WkType = Enum_WKVidetype.RecordingLessons
                     };
 
-                    ImgPath = APP.WKData.WkPath + "temp/Image/";
+                 
                     AudioPathName = APP.WKData.WkPath + "temp/audio/";
                     FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
                     FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-                    FileToolsCommon.CreateDirectory(ImgPath);
+   
                     FileToolsCommon.CreateDirectory(AudioPathName);
                     AudioPathName += APP.WKData.WkName + ".MP3";
                     VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制." + VideoInfo.VideoType.ToString();
+  
                     VideoSynthesisPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制Syn." + VideoInfo.VideoType.ToString();
                     int num = 1;
                     while (FileToolsCommon.IsExistFile(VideoSavePathName))
@@ -3568,6 +3513,22 @@ namespace XHWK.WKTool
                         VideoSynthesisPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制Syn_" + num + "." + VideoInfo.VideoType.ToString();
                         num++;
                     }
+                    int RsW = (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f) / 2) * 2;
+                    int RsH = (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f) / 2) * 2;
+
+                    Console.WriteLine("RsW:"+ RsW+ " RsH:"+ RsH);
+
+                    lock (this)
+                    {
+                        videoWriter.Open(
+                            VideoSynthesisPathName,
+                            RsW,
+                            RsH,
+                            5,
+                            VideoCodec.MPEG4,
+                            RsW * RsH * 10
+                        );
+                    }
 
                     #region 禁用按钮
 
@@ -3606,12 +3567,10 @@ namespace XHWK.WKTool
                         {
                             APP.W_CountdownWindow = new CountdownWindow();
                             APP.W_CountdownWindow.Initialize();
-                            //APP.W_CountdownWindow.Topmost = true;
                         }
                         else
                         {
                             APP.W_CountdownWindow.Initialize();
-                            //APP.W_CountdownWindow.Topmost = true;
                         }
                         APP.W_CountdownWindow.Show();
                     });
@@ -3619,15 +3578,12 @@ namespace XHWK.WKTool
                     #endregion 录像倒计时
 
                     IsFirstR = false;
-                    RsImgName = new List<string>();
+                
                     SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
                     ///启动截图
                     timer = new System.Threading.Timer(new TimerCallback(Timer_Elapsed), null, 0, 20);
                 }
 
-                //继续录制
-                //IsSuspendR = false;
-                //BtnRecording.Content = "暂停录制";
                 Dispatcher.Invoke(() =>
                 {
                     TxbType.Text = "准备录制";
@@ -3652,8 +3608,7 @@ namespace XHWK.WKTool
                         }
                         Recorddt = DateTime.Now;
                         IsStartCount = true;
-                        //Stack();
-                        //timer.Start();
+                     
                     });
                 }
                 catch (Exception ex)
@@ -3664,15 +3619,13 @@ namespace XHWK.WKTool
             else if (Type == 2)
             {
                 //暂停
-                //IsSuspendR = true;
                 Dispatcher.Invoke(() =>
                 {
                     TxbType.Text = "暂停中";
                     BtnRecord.Visibility = Visibility.Visible;
                     BtnRecordSuspend.Visibility = Visibility.Collapsed;
                 });
-                //TimeOut();
-
+          
                 #region 2秒内不可点击
 
                 //new Thread(new ThreadStart(new Action(() =>
@@ -3695,14 +3648,13 @@ namespace XHWK.WKTool
                 try
                 {
                     APP.FFmpeg.SuspendFFmpeg();
-                    //new Thread(new ThreadStart(new Action(() =>
-                    //{
+             
                     while (APP.FFmpeg.myProcess != null)
                     {
                         Thread.Sleep(100);
                     }
                     IsStartCount = false;
-                    //}))).Start();
+          
                 }
                 catch (Exception ex)
                 {
@@ -3714,264 +3666,7 @@ namespace XHWK.WKTool
             }
         }
 
-        /// <summary>
-        /// 开始录制和暂停录制
-        /// </summary>
-        private void StartRecordOld(int Type)
-        {
-            if (Type == 1)
-            {
-                if (IsFirstR)//是否第一次录制  初始化录制
-                {
-                    #region 检测麦克风扬声器是否可用
-
-                    string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
-                    FileToolsCommon.CreateDirectory(AudioPath);
-                    string audioSpeakerPath = AudioPath + "adoS" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
-                    string audioMicrophonePath = AudioPath + "adoM" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
-                    try
-                    {
-                        FileToolsCommon.DeleteFile(audioSpeakerPath);
-                        FileToolsCommon.DeleteFile(audioMicrophonePath);
-                    }
-                    catch (Exception)
-                    {
-                    }
-                    //扬声器
-                    if (APP.FFmpeg.StartRecordSpeakerAudio(audioSpeakerPath))
-                    {
-                        APP.FFmpeg.StopRecordAudio(2);
-                        //Thread.Sleep(500);
-                        //麦克风
-                        if (APP.FFmpeg.StartRecordAudio(audioMicrophonePath))
-                        {
-                        }
-                        else
-                        {
-                            //无法录制麦克风
-                            MessageBoxResult Res = MessageWindow.Show("当前电脑无法录制麦克风，是否继续？", "消息提示", MessageBoxButton.OKCancel);
-                            if (Res == MessageBoxResult.Cancel)
-                            {
-                                return;
-                            }
-                        }
-                        APP.FFmpeg.StopRecordAudio(1);
-                    }
-                    else
-                    {
-                        //无法录制扬声器音频
-                        MessageBoxResult Res = MessageWindow.Show("当前电脑无法录制音频，是否继续？", "消息提示", MessageBoxButton.OKCancel);
-                        if (Res == MessageBoxResult.Cancel)
-                        {
-                            return;
-                        }
-                    }
-
-                    #endregion 检测麦克风扬声器是否可用
-
-                    //电子版切换笔模式
-                    deviceHand();
-                    //TxbTime.Visibility = Visibility.Visible;
-                    //ImgLZImg.Visibility = Visibility.Visible;
-
-                    VideoInfo = new Model_Video
-                    {
-                        VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType")),
-                        WkType = Enum_WKVidetype.RecordingLessons
-                    };
-
-                    ImgPath = APP.WKData.WkPath + "temp/Image/";
-                    AudioPathName = APP.WKData.WkPath + "temp/audio/";
-                    FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
-                    FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-                    FileToolsCommon.CreateDirectory(ImgPath);
-                    FileToolsCommon.CreateDirectory(AudioPathName);
-                    AudioPathName += APP.WKData.WkName + ".MP3";
-                    VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制." + VideoInfo.VideoType.ToString();
-                    VideoSynthesisPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制Syn." + VideoInfo.VideoType.ToString();
-                    int num = 1;
-                    while (FileToolsCommon.IsExistFile(VideoSavePathName))
-                    {
-                        VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制_" + num + "." + VideoInfo.VideoType.ToString();
-                        VideoSynthesisPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制Syn_" + num + "." + VideoInfo.VideoType.ToString();
-                        num++;
-                    }
-
-                    #region 禁用按钮
-
-                    BtnPrint.IsEnabled = false;
-                    BtnScreenshot.IsEnabled = false;
-                    BtnImport.IsEnabled = false;
-                    BtnScreenRecording.IsEnabled = false;
-                    BtnUpload.IsEnabled = false;
-                    BtnSetUp.IsEnabled = false;
-                    BtnDevice.IsEnabled = false;
-                    BtnLoginType.IsEnabled = false;
-                    blackboard_canvas.Visibility = Visibility.Visible;//zxyceshi
-
-                    //myblackboard = new BlackboardNew(blackboard_canvas);
-                    //DataContext = APP.pageData;
-                    //drawingAttributes = new DrawingAttributes();
-                    ////将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用
-                    ////InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型
-                    //blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
-                    //blackboard_canvas.UseCustomCursor = true;
-                    //drawingAttributes.FitToCurve = true;
-                    //drawingAttributes.IgnorePressure = false;
-                    //drawingAttributes.Width = PenSize;
-                    //drawingAttributes.Height = PenSize;
-                    //drawingAttributes.Color = Color;
-                    //blackboard_canvas.Cursor = System.Windows.Input.Cursors.Pen;
-
-                    #endregion 禁用按钮
-
-                    #region 设置录制大小
-
-                    //gridActWidth = (int)GridMain.ActualWidth==0?1276: (int)GridMain.ActualWidth;
-                    //gridActHeight = (int)GridMain.ActualHeight==0?898: (int)GridMain.ActualHeight;
-                    gridActWidth = (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f));
-                    gridActHeight = (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f));
-                    gridActWidth = gridActWidth % 2 > 0 ? gridActWidth - 1 : gridActWidth;
-                    gridActHeight = gridActHeight % 2 > 0 ? gridActHeight - 1 : gridActHeight;
-
-                    #endregion 设置录制大小
-
-                    #region 录像倒计时
-
-                    if (APP.W_CountdownWindow == null)
-                    {
-                        APP.W_CountdownWindow = new CountdownWindow();
-                        APP.W_CountdownWindow.Initialize();
-                        //APP.W_CountdownWindow.Topmost = true;
-                    }
-                    else
-                    {
-                        APP.W_CountdownWindow.Initialize();
-                        //APP.W_CountdownWindow.Topmost = true;
-                    }
-                    APP.W_CountdownWindow.Show();
-
-                    #endregion 录像倒计时
-
-                    IsFirstR = false;
-                    RsImgName = new List<string>();
-                    SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
-                    //TxbTime.Visibility = Visibility.Visible;
-                    //ImgLZImg.Visibility = Visibility.Visible;
-                    ///启动截图
-                    timer = new System.Threading.Timer(new TimerCallback(Timer_Elapsed), null, 0, 20);
-                    //{
-                    //    AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
-                    //};//设置执行一次（false）还是一直执行(true)
-                    //timer.Elapsed += new System.Timers.ElapsedEventHandler(Timer_Elapsed);
-                    //timer.Enabled = true; //启动计时器
-                }
-
-                //继续录制
-                //IsSuspendR = false;
-                //BtnRecording.Content = "暂停录制";
-                TxbType.Text = "准备录制";
-                BtnRecord.Visibility = Visibility.Collapsed;
-                BtnRecordSuspend.Visibility = Visibility.Visible;
-
-                #region 4秒内不可点击
-
-                //new Thread(new ThreadStart(new Action(() =>
-                //{
-                //    Dispatcher.Invoke(() =>
-                //    {
-                //        BtnRecord.IsEnabled = false;
-                //        btnStop.IsEnabled = false;
-                //        ImgStop.Visibility = Visibility.Visible;
-                //        ImgStopTwo.Visibility = Visibility.Collapsed;
-                //    });
-                //}))).Start();
-                new Thread(new ThreadStart(new Action(() =>
-                {
-                    //Thread.Sleep(4000);
-                    Dispatcher.Invoke(() =>
-                    {
-                        BtnRecord.IsEnabled = true;
-                        BtnStop.IsEnabled = true;
-                    });
-                }))).Start();
-
-                #endregion 4秒内不可点击
-
-                try
-                {
-                    new Thread(new ThreadStart(new Action(() =>
-                    {
-                        Thread.Sleep(1000);
-                        bool IsRecordingSound = FileToolsCommon.GetConfigValue("IsRecordingSound") == "1";
-                        bool IsRecordingMicrophone = FileToolsCommon.GetConfigValue("IsRecordingMicrophone") == "1";
-                        IsRecordAudio = APP.FFmpeg.StartRecordingAudio(AudioPathName, out string ErrMessage, IsRecordingSound, IsRecordingMicrophone, APP.MicrophoneName);
-                        Thread.Sleep(1000);
-                        Dispatcher.Invoke(() =>
-                        {
-                            TxbType.Text = "正在录制";
-                            if (!IsRecordAudio)
-                            {
-                                MessageWindow.Show(ErrMessage);
-                            }
-                            Recorddt = DateTime.Now;
-                            IsStartCount = true;
-                            //Stack();
-                            //timer.Start();
-                        });
-                    }))).Start();
-                }
-                catch (Exception ex)
-                {
-                    MessageWindow.Show(ex.Message);
-                }
-            }
-            else if (Type == 2)
-            {
-                //暂停
-                //IsSuspendR = true;
-                TxbType.Text = "暂停中";
-                BtnRecord.Visibility = Visibility.Visible;
-                BtnRecordSuspend.Visibility = Visibility.Collapsed;
-                //TimeOut();
-
-                #region 2秒内不可点击
-
-                new Thread(new ThreadStart(new Action(() =>
-                {
-                    Dispatcher.Invoke(() =>
-                    {
-                        BtnRecord.IsEnabled = false;
-                        BtnStop.IsEnabled = false;
-                    });
-                    Thread.Sleep(2000);
-                    Dispatcher.Invoke(() =>
-                    {
-                        BtnRecord.IsEnabled = true;
-                        BtnStop.IsEnabled = true;
-                    });
-                }))).Start();
-
-                #endregion 2秒内不可点击
-
-                try
-                {
-                    APP.FFmpeg.SuspendFFmpeg();
-                    new Thread(new ThreadStart(new Action(() =>
-                    {
-                        while (APP.FFmpeg.myProcess != null)
-                        {
-                            Thread.Sleep(100);
-                        }
-                        IsStartCount = false;
-                    }))).Start();
-                }
-                catch (Exception ex)
-                {
-                    MessageWindow.Show(ex.Message);
-                }
-            }
-        }
+      
 
         /// <summary>
         /// 记录上次截图时间
@@ -3989,12 +3684,13 @@ namespace XHWK.WKTool
                 DateTime dt = DateTime.Now;
                 TimeSpan ts = dt.Subtract(Recorddt);//时间差
                 double tsmi = ts.TotalMilliseconds;
-                if (tsmi > 200.0)
+                if (tsmi >= 200.0)
                 {
                     Recorddt = Recorddt.AddMilliseconds(200);
-                    Thread thread = new Thread(RecordSaveImage);
-                    //开启线程
-                    thread.Start();
+                  
+                    ThreadPool.QueueUserWorkItem(o=> {
+                        RecordSaveImage();
+                    });
                 }
             }
         }
@@ -4008,28 +3704,22 @@ namespace XHWK.WKTool
             {
                 if (IsStartCount)
                 {
-                    string FilePathName = ImgPath + RsImgName.Count + ".png";
-                    RsImgName.Add(FilePathName);
-
+      
                     #region 设置大小
 
-                    double RsW = (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f));
-                    double RsH = (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f));
-                    if (RsW > 1266)
-                    {
-                        double Proportion = RsH / RsW;
-                        RsW = 1266;
-                        RsH = RsW * Proportion;
-                        RsH = ((int)RsH) % 2 > 0 ? (int)RsH - 1 : (int)RsH;
-                        //RsH = 898;
-                    }
-
+                    int RsW = (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f) / 2)*2;
+                    int RsH = (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f) / 2) *2;
+                
                     #endregion 设置大小
 
                     Dispatcher.Invoke(() =>
                     {
                         //保存图片
-                        ImageHelper.SaveUI2(GridMain, FilePathName, gridActWidth, gridActHeight, (int)RsW, (int)RsH);
+ 
+                        Bitmap bm = ImageHelper.SaveUI2Bitmap(GridMain, RsW, RsH);
+
+                        videoWriter.WriteVideoFrame(bm);
+                        bm.Dispose();
 
                         SRTime = SRTime.AddMilliseconds(200);
 
@@ -4095,163 +3785,104 @@ namespace XHWK.WKTool
 
                     #endregion 清空画板数据
 
-                    //根据录制时间长度确定是否保存
-                    if (SRTime.Hour > 0 || SRTime.Minute > 0 || SRTime.Second > 3)
+                    Dispatcher.Invoke(() =>
                     {
-                        #region 2秒内不可点击
+                        BtnRecord.IsEnabled = false;
+                        BtnStop.IsEnabled = false;
+                        BtnScreenRecording.IsEnabled = false;
+                    });
 
-                        Dispatcher.Invoke(() =>
-                        {
-                            BtnRecord.IsEnabled = false;
-                            BtnStop.IsEnabled = false;
-                            BtnScreenRecording.IsEnabled = false;
-                        });
+                    //缩略图
+                    string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
+                    FileToolsCommon.CreateDirectory(ThumbnailPath);
+                    //缩略图存储位置
+                    string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".", "") + ".JPG";
+                    try
+                    {
+                        APP.FFmpeg.StopFFmpeg(AudioPathName);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteErrLog("【录制停止】：录音生成失败，" + ex.Message, ex);
+                    }
+                    IsStartCount = false;
+                    //停止截图
+                    while (APP.FFmpeg.myProcess != null)
+                    {
+                        Thread.Sleep(100);
+                    }
+                    Dispatcher.Invoke(() =>
+                    {
+                        timer.Change(-1, 0);
+                        timer.Dispose();
 
-                        #endregion 2秒内不可点击
+                        videoWriter.Close();
 
-                        //缩略图
-                        string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
-                        FileToolsCommon.CreateDirectory(ThumbnailPath);
-                        //缩略图存储位置
-                        string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".", "") + ".JPG";
-                        try
-                        {
-                            APP.FFmpeg.StopFFmpeg(AudioPathName);
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteErrLog("【录制停止】：合并音频你文件失败，" + ex.Message, ex);
-                        }
-                        IsStartCount = false;
-                        //停止截图
-                        while (APP.FFmpeg.myProcess != null)
-                        {
-                            Thread.Sleep(100);
-                        }
-                        Dispatcher.Invoke(() =>
-                        {
-                            timer.Change(-1, 0);
-                            timer.Dispose();
-                            //End();
-                            TxbTime.Text = "00:00";
-                            //TxbTime.Visibility = Visibility.Hidden;
-                            //ImgLZImg.Visibility = Visibility.Hidden;
-                            //TxbType.Visibility = Visibility.Visible;
-                            TxbType.Text = "保存中";
-                        });
-                        //new Thread(new ThreadStart(new Action(() =>
-                        //{
-                        //判断音频是否存在 判断音频临时文件夹是否存在
-                        if (IsRecordAudio)
-                        {
-                            if (!FileToolsCommon.IsExistFile(AudioPathName))
-                            {
-                                Thread.Sleep(100);
-                            }
-                            if (FileToolsCommon.IsExistDirectory(FileToolsCommon.GetDirectoryName(AudioPathName) + "temp/"))
-                            {
-                                Thread.Sleep(100);
-                            }
-                        }
-                        else
-                        {
-                            //没有录制音频
-                            AudioPathName = null;
-                        }
-                        //合成视频
-                        bool SynRes = APP.FFmpeg.SynthesisVideo(ImgPath, AudioPathName, VideoSynthesisPathName, 5, gridActWidth, gridActHeight, out string ErrMessage);
-                        //}))).Start();
-                        //new Thread(new ThreadStart(new Action(() =>
-                        //{
-                        if (!SynRes)
-                        {
-                            Dispatcher.Invoke(() =>
-                            {
-                                MessageWindow.Show("录制失败," + ErrMessage);
-                                BtnRecord.IsEnabled = true;
-                                BtnStop.IsEnabled = false;
-                                BtnPrint.IsEnabled = false;
-                                BtnScreenRecording.IsEnabled = true;
-                                TxbType.Text = "准备就绪";
-                                BtnRecord.Visibility = Visibility.Visible;
-                                BtnRecordSuspend.Visibility = Visibility.Collapsed;
-                            });
-                            return;
-                        }
-                        Dispatcher.Invoke(() =>
-                        {
-                            TxbType.Text = "转码中";
-                        });
-                        while (!FileToolsCommon.IsExistFile(VideoSynthesisPathName))
+                        TxbTime.Text = "00:00";
+
+                        TxbType.Text = "保存中";
+                    });
+
+                    //判断音频是否存在 判断音频临时文件夹是否存在
+                    if (IsRecordAudio)
+                    {
+                        if (!FileToolsCommon.IsExistFile(AudioPathName))
                         {
                             Thread.Sleep(100);
                         }
-                        while (FileToolsCommon.IsExistDirectory(FileToolsCommon.GetDirectoryName(VideoSynthesisPathName) + "temp/"))
+                        if (FileToolsCommon.IsExistDirectory(FileToolsCommon.GetDirectoryName(AudioPathName) + "temp/"))
                         {
                             Thread.Sleep(100);
                         }
-                        FileToolsCommon.DeleteFile(ThumbnailPathName);
-                        VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                        Thread.Sleep(500);
-                        //VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
-                        VideoInfo.VideoPath = VideoSavePathName;
-                        VideoInfo.ThumbnailPath = ThumbnailPathName;
-                        //生成缩略图
-                        bool ThuRes = APP.FFmpeg.GenerateThumbnails(VideoSynthesisPathName, ThumbnailPathName, 200, 130);
-                        Thread.Sleep(500);
-
-                        APP.FFmpeg.VideoTranscode(VideoSynthesisPathName, VideoSavePathName, gridActWidth, gridActHeight);
-                        VideoInfo.FileGuid = Guid.NewGuid().ToString();
-                        VideoInfo.IsUpload = false;
-                        VideoInfo.Uploaded = 0;
-                        //VideoInfo.Savefolder = APP.UserInfo.Schoolid + "/resource";
-                        if (!APP.VideoList.Exists(x => x.FileGuid == VideoInfo.FileGuid) || !APP.VideoList.Exists(x => x.VideoPath == VideoInfo.VideoPath))
-                        {
-                            APP.VideoList.Add(VideoInfo);
-                            //保存数据
-                            APP.SaveWkData();
-                        }
-                        IsFirstR = true;
-                        Dispatcher.Invoke(() =>
-                        {
-                            BtnRecord.IsEnabled = true;
-                            BtnStop.IsEnabled = false;
-                            BtnPrint.IsEnabled = false;
-                            BtnScreenRecording.IsEnabled = true;
-                            TxbType.Text = "准备就绪";
-                            BtnRecord.Visibility = Visibility.Visible;
-                            BtnRecordSuspend.Visibility = Visibility.Collapsed;
-                        });
                     }
                     else
                     {
-                        APP.FFmpeg.SuspendFFmpeg();
-                        IsStartCount = false;
-                        timer.Change(-1, 0);
-                        timer.Dispose();
-                        IsFirstR = true;
-                        IsStartCount = false;
-                        //停止截图
-                        while (APP.FFmpeg.myProcess != null)
-                        {
-                            Thread.Sleep(100);
-                        }
-                        Dispatcher.Invoke(() =>
-                        {
-                            BtnRecord.IsEnabled = true;
-                            BtnStop.IsEnabled = false;
-                            BtnPrint.IsEnabled = false;
-                            BtnScreenRecording.IsEnabled = true;
-                            MessageWindow.Show("录制时间过短，请重新录制！");
-                            TxbType.Text = "准备就绪";
-                            BtnRecord.Visibility = Visibility.Visible;
-                            BtnRecordSuspend.Visibility = Visibility.Collapsed;
-                            TxbTime.Text = "00:00";
-                            //TxbTime.Visibility = Visibility.Hidden;
-                            //ImgLZImg.Visibility = Visibility.Hidden;
-                        });
+                        //没有录制音频
+                        AudioPathName = null;
                     }
-                    //List<Model_Video> VideoList
+                    //合成视频
+                    Dispatcher.Invoke(() =>
+                    {
+                        TxbType.Text = "转码中";
+                    });
+
+                    while (!FileToolsCommon.IsExistFile(VideoSynthesisPathName))
+                    {
+                        Thread.Sleep(100);
+                    }
+
+                    FileToolsCommon.DeleteFile(ThumbnailPathName);
+                    VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                    VideoInfo.VideoPath = VideoSavePathName;
+                    VideoInfo.ThumbnailPath = ThumbnailPathName;
+                    Console.WriteLine("生成缩略图");
+                    //生成缩略图
+                    bool ThuRes = APP.FFmpeg.GenerateThumbnails(VideoSynthesisPathName, ThumbnailPathName, 200, 130);
+                    Thread.Sleep(500);
+                    Console.WriteLine("合并音视频 gridActWidth："+ gridActWidth+ " gridActHeight:"+ gridActHeight);
+
+                    APP.FFmpeg.VideoAudioMerge(VideoSynthesisPathName, AudioPathName, VideoSavePathName, gridActWidth, gridActHeight);
+                    VideoInfo.FileGuid = Guid.NewGuid().ToString();
+                    VideoInfo.IsUpload = false;
+                    VideoInfo.Uploaded = 0;
+       
+                    if (!APP.VideoList.Exists(x => x.FileGuid == VideoInfo.FileGuid) || !APP.VideoList.Exists(x => x.VideoPath == VideoInfo.VideoPath))
+                    {
+                        APP.VideoList.Add(VideoInfo);
+                        //保存数据
+                        APP.SaveWkData();
+                    }
+                    IsFirstR = true;
+                    Dispatcher.Invoke(() =>
+                    {
+                        BtnRecord.IsEnabled = true;
+                        BtnStop.IsEnabled = false;
+                        BtnPrint.IsEnabled = false;
+                        BtnScreenRecording.IsEnabled = true;
+                        TxbType.Text = "准备就绪";
+                        BtnRecord.Visibility = Visibility.Visible;
+                        BtnRecordSuspend.Visibility = Visibility.Collapsed;
+                    });
                 }
                 catch (Exception ex)
                 {

XHWK.WKTool/XHWK.WKTool.csproj

@@ -30,6 +30,8 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -84,6 +86,18 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Accord, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Accord.3.8.0\lib\net45\Accord.dll</HintPath>
+    </Reference>
+    <Reference Include="Accord.Video, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Accord.Video.3.8.0\lib\net45\Accord.Video.dll</HintPath>
+    </Reference>
+    <Reference Include="Accord.Video.DirectShow, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Accord.Video.DirectShow.3.8.0\lib\net45\Accord.Video.DirectShow.dll</HintPath>
+    </Reference>
+    <Reference Include="Accord.Video.FFMPEG, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=x86">
+      <HintPath>..\packages\Accord.Video.FFMPEG.3.8.0\lib\net45\Accord.Video.FFMPEG.dll</HintPath>
+    </Reference>
     <Reference Include="AForge, Version=2.2.5.0, Culture=neutral, PublicKeyToken=c1db6ff4eaa06aeb, processorArchitecture=MSIL">
       <HintPath>..\packages\AForge.2.2.5\lib\AForge.dll</HintPath>
     </Reference>
@@ -123,6 +137,9 @@
     <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NAudio.1.9.0\lib\net35\NAudio.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -439,18 +456,6 @@
     <EmbeddedResource Include="LatticeXML\S0_O000_B0000_P000-255.tmx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
-    <None Include="OIDPublishImageGenerator\AppVersionType.ini">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="OIDPublishImageGenerator\OID PG.ini">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="OIDPublishImageGenerator\oida.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="OIDPublishImageGenerator\OIDPatternGenerator.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
@@ -618,11 +623,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="SSCR\Setup Screen Capturer Recorder v0.12.10.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\Clip_Clip.png" />
     <Resource Include="Images\Clip_Pause.png" />
@@ -714,42 +714,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="OIDPublishImageGenerator\certifyforDll.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\libeay32.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\OIDPatternGenerator.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\OIDPDFFileGenerator.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\OIDPGHelper.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\OIDPublishImageGenerator.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\OIDScanConverter.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\OIDTiffConvertor.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\OIDVectorDiagramGenerator.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\PDFReader.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\PluginEntry.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OIDPublishImageGenerator\ssleay32.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Resource Include="SkinImages\Other\Dev_AcousticWave1.gif" />
     <Resource Include="SkinImages\Other\Dev_AcousticWave2.gif" />
     <Resource Include="SkinImages\SR\SR_Out.png" />
@@ -880,4 +844,13 @@
 xcopy /Y /i $(ProjectDir)\256.ico $(TargetDir)\
 </PreBuildEvent>
   </PropertyGroup>
+  <Import Project="..\packages\Accord.3.8.0\build\Accord.targets" Condition="Exists('..\packages\Accord.3.8.0\build\Accord.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Accord.3.8.0\build\Accord.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Accord.3.8.0\build\Accord.targets'))" />
+    <Error Condition="!Exists('..\packages\Accord.Video.FFMPEG.3.8.0\build\Accord.Video.FFMPEG.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Accord.Video.FFMPEG.3.8.0\build\Accord.Video.FFMPEG.targets'))" />
+  </Target>
+  <Import Project="..\packages\Accord.Video.FFMPEG.3.8.0\build\Accord.Video.FFMPEG.targets" Condition="Exists('..\packages\Accord.Video.FFMPEG.3.8.0\build\Accord.Video.FFMPEG.targets')" />
 </Project>

XHWK.WKTool/packages.config

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Accord" version="3.8.0" targetFramework="net452" />
+  <package id="Accord.Video" version="3.8.0" targetFramework="net452" />
+  <package id="Accord.Video.DirectShow" version="3.8.0" targetFramework="net452" />
+  <package id="Accord.Video.FFMPEG" version="3.8.0" targetFramework="net452" />
   <package id="AForge" version="2.2.5" targetFramework="net452" />
   <package id="AForge.Controls" version="2.2.5" targetFramework="net452" />
   <package id="AForge.Imaging" version="2.2.5" targetFramework="net452" />
@@ -14,6 +18,7 @@
   <package id="ICSharpCode.SharpZipLib.dll" version="0.85.4.369" targetFramework="net452" />
   <package id="iTextSharp" version="5.5.13.2" targetFramework="net452" />
   <package id="log4net" version="2.0.12" targetFramework="net452" />
+  <package id="NAudio" version="1.9.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
   <package id="System.Management" version="4.7.0" targetFramework="net452" />
   <package id="VisioForge.DotNet.Core.TRIAL" version="12.0.56" targetFramework="net452" />

XHWK.WKTool/system/FFMpeg.cs

@@ -43,6 +43,8 @@ namespace Common.system
         /// </summary>
         private bool IsRecordMicrophone = true;
 
+        private string ffmpegPath = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg.exe");
+
         #endregion 变量
 
         /// <summary>
@@ -126,7 +128,7 @@ namespace Common.system
 
             #endregion 检测麦克风扬声器
 
-            myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+            myProcess.StartInfo.FileName = ffmpegPath;   //ffmpeg.exe的绝对路径
             string SpeakerStr = "";
             string MicrophoneStr = "";
             if (IsRecordSpeaker && RecordingSound)
@@ -275,7 +277,7 @@ namespace Common.system
 
             myProcess = new Process();
             LogPath = CreateffmpegLog();
-            myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+            myProcess.StartInfo.FileName = ffmpegPath;   //ffmpeg.exe的绝对路径
             if (IsRecordSpeaker && IsRecordMicrophone && RecordingSound && RecordingMicrophone)
             {
                 myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" -f dshow -i audio=\"" +
@@ -455,7 +457,7 @@ namespace Common.system
 
                 #endregion 判断音频是否存在
 
-                myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+                myProcess.StartInfo.FileName = ffmpegPath;   //ffmpeg.exe的绝对路径
                 switch (Extension.ToUpper())
                 {
                     case ".MP4":
@@ -566,13 +568,6 @@ namespace Common.system
         /// <param name="FilePath">存储路径</param>
         public void MergeVideoOrAudio(object FilePathobj)
         {
-            //new Thread(new ThreadStart(new Action(() =>
-            //{
-            //Dispatcher.Invoke(() =>
-            //{
-            //});
-            //}))).Start();
-
             while (myProcess != null)
             {
                 Thread.Sleep(100);
@@ -609,7 +604,7 @@ namespace Common.system
 
             myProcess = new Process();
             LogPath = CreateffmpegLog();
-            myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+            myProcess.StartInfo.FileName = ffmpegPath;   //ffmpeg.exe的绝对路径
             if (Extension.ToUpper() == ".MP3")
             {
                 myProcess.StartInfo.Arguments = "-f concat  -safe 0 -i " + Path + "temp/filelist.d -c copy " + FilePath;
@@ -672,18 +667,11 @@ namespace Common.system
         /// <param name="SaveFilePath">保存文件路径</param>
         public void ClipVideo(string VideoFilePath, string StartTime, string EndTime, string SaveFilePath)
         {
-            //new Thread(new ThreadStart(new Action(() =>
-            //{
-            //Dispatcher.Invoke(() =>
-            //{
-            //});
-            //}))).Start();
-
             while (myProcess != null)
             {
                 Thread.Sleep(100);
             }
-            //string Path = FileToolsCommon.GetDirectoryName(VideoFilePath);
+
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
             foreach (var KillProcess in KillProcessArray)
             {
@@ -691,7 +679,7 @@ namespace Common.system
             }
             myProcess = new Process();
             LogPath = CreateffmpegLog();
-            this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+            this.myProcess.StartInfo.FileName = ffmpegPath;   //ffmpeg.exe的绝对路径
             //ffmpeg -ss 开始时间 -to 结束时间 -accurate_seek -i mp4输入路径 -c:v libx264 -c:a aac -strict experimental -vf scale = 宽:高 -b 500k 输出路径.mp4
             myProcess.StartInfo.Arguments = "-i " + VideoFilePath + " -vcodec copy -acodec copy -ss " + StartTime + " -to " + EndTime + " " + SaveFilePath; //-filter:a "volume=0.5"
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
@@ -812,7 +800,7 @@ namespace Common.system
             {
                 myProcess = new Process();
                 LogPath = CreateffmpegLog();
-                myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+                myProcess.StartInfo.FileName = ffmpegPath;   //ffmpeg.exe的绝对路径
                                                                                                                  //myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2 -s " + thubWidth + "*" + thubHeight + " -f image2 \"" + ImagePath + "\"";
                 myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2" + WHStr + " -f image2 \"" + ImagePath + "\"";
 
@@ -883,7 +871,7 @@ namespace Common.system
             {
                 myProcess = new Process();
                 LogPath = CreateffmpegLog();
-                myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+                myProcess.StartInfo.FileName = ffmpegPath;   //ffmpeg.exe的绝对路径
                 myProcess.StartInfo.Arguments = "-i " + VideoPathName + " -acodec copy -vcodec libx264 -s " + Width + "*" + Height + " " + VideoSavePathName;
 
                 if (OutputVideoLog)
@@ -932,6 +920,71 @@ namespace Common.system
             }
         }
 
+
+        public bool VideoAudioMerge(string VideoPathName, string mp3path,string VideoSavePathName, int Width, int Height)
+        {
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
+            Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
+            foreach (Process KillProcess in KillProcessArray)
+            {
+                KillProcess.Kill();
+            }
+            try
+            {
+                myProcess = new Process();
+                LogPath = CreateffmpegLog();
+                myProcess.StartInfo.FileName = ffmpegPath;   //ffmpeg.exe的绝对路径
+                myProcess.StartInfo.Arguments = "-i " + VideoPathName + " -i " + mp3path + " -acodec copy -vcodec libx264 " + "-s " + Width + "*" + Height + " " + VideoSavePathName;
+
+                if (OutputVideoLog)
+                {
+                    LogHelper.WriteInfoLog("【视频转码】：" + myProcess.StartInfo.Arguments);
+                }
+
+                FileToolsCommon.AppendText(LogPath, "【视频转码】：" + myProcess.StartInfo.Arguments + "\r\n");
+                myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
+                myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
+                myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
+                myProcess.StartInfo.RedirectStandardInput = true;      //用于模拟该进程控制台的输入
+                                                                       //外部程序(这里是FFMPEG)输出流时候产生的事件,这里是把流的处理过程转移到下面的方法中,详细请查阅MSDN
+                myProcess.ErrorDataReceived += new DataReceivedEventHandler(Output);
+                myProcess.Start();                 //启动线程
+                myProcess.BeginErrorReadLine();    //开始异步读取
+                myProcess.WaitForExit();           //阻塞等待进程结束
+                myProcess.Close();                 //关闭进程
+                myProcess.Dispose();               //释放资源
+
+                #region 进程是否已经释放
+
+                bool IsRunning = true;
+                while (IsRunning)
+                {
+                    IsRunning = false;
+                    Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
+                    foreach (Process KillProcess in ProcessArray)
+                    {
+                        IsRunning = true;
+                        Thread.Sleep(100);
+                    }
+                }
+
+                #endregion 进程是否已经释放
+
+                myProcess = null;
+                Thread.Sleep(200);
+                FileToolsCommon.DeleteFile(VideoPathName);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【视频转码】（VideoTranscode）视频转码失败，" + ex.Message, ex);
+                return false;
+            }
+        }
+
         /// <summary>
         /// 创建日志文件
         /// </summary>
@@ -1065,7 +1118,7 @@ namespace Common.system
                     }
                     myProcess = new Process();
                     LogPath = CreateffmpegLog();
-                    myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+                    myProcess.StartInfo.FileName = ffmpegPath;   //ffmpeg.exe的绝对路径
                     myProcess.StartInfo.Arguments = " -list_devices true -f dshow -i dummy";
                     if (OutputVideoLog)
                     {

XHWK.WKTool/system/FileToolsCommon.cs

@@ -965,12 +965,14 @@ namespace Common.system
                 Microsoft.Win32.Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", Microsoft.Win32.RegistryKeyPermissionCheck.ReadWriteSubTree, System.Security.AccessControl.RegistryRights.ReadKey);
             foreach (string subKeyName in uninstallNode.GetSubKeyNames())
             {
+                Console.WriteLine(" subKeyName:" + subKeyName);
                 Microsoft.Win32.RegistryKey subKey = uninstallNode.OpenSubKey(subKeyName);
                 object displayName = subKey.GetValue("DisplayName");
                 if (displayName != null)
                 {
                     if (displayName.ToString().Contains(softWareName))
                     {
+                        Console.WriteLine(uninstallNode.Name+" subKeyName:" + subKeyName);
                         return true;
                         // MessageWindow.Show(displayName.ToString());  
                     }

XHWK.WKTool/system/ImageHelper.cs

@@ -402,87 +402,49 @@ namespace Common.system
         /// </summary>
         /// <param name="ui">需要截图的UI控件</param>
         /// <param name="filePathName">图片保存地址 命名 1.png</param>
-        /// <param name="width">图片宽</param>
-        /// <param name="height">图片高</param>
         /// <param name="ImgWidth">转换后高</param>
         /// <param name="ImgHeight">转换后高</param>
-        public static void SaveUI(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
+        public static void SaveUI(FrameworkElement ui, string filePathName, int ImgWidth, int ImgHeight)
         {
             Console.WriteLine("截图的路径为:" + filePathName);
             try
             {
-                //在位图中呈现UI元素
-                RenderTargetBitmap bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
+                RenderTargetBitmap bmp = new RenderTargetBitmap(
+                       (int)ui.ActualWidth,
+                       (int)ui.ActualHeight,
+                       1 / 96, 1 / 96,
+                       PixelFormats.Default
+                   );
                 bmp.Render(ui);
-
-                //定义切割矩形
-                var cut = new Int32Rect(0, 0, width, height);
-                //计算Stride
-                var stride = bmp.Format.BitsPerPixel * cut.Width / 8;
-                //声明字节数组
-                byte[] data = new byte[cut.Height * stride];
-
-                //调用CopyPixels
-                bmp.CopyPixels(cut, data, stride, 0);
-                new Thread(new ThreadStart(new Action(() =>
+                BitmapEncoder encoder = new PngBitmapEncoder();
+                encoder.Frames.Add(BitmapFrame.Create(bmp));
+                if (ImgWidth > 0)
                 {
-                    BitmapSource bitmapSource = BitmapSource.Create(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Bgr32, null, data, stride);
-
-                    BitmapEncoder encoder = new PngBitmapEncoder();
-                    encoder.Frames.Add(BitmapFrame.Create(bitmapSource));
-                    if (ImgWidth > 0)
-                    {
-                        Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
-                        try
-                        {
-                            MemoryStream memoryStream = new MemoryStream();
-                            encoder.Save(memoryStream);
-                            Bitmap bit = new Bitmap(memoryStream, true);
-                            if (ImgWidth - 2 < bit.Width)
-                            {
-                                try
-                                {
-                                    Graphics g = Graphics.FromImage(Img);
-                                    g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, bit.Width, bit.Height), GraphicsUnit.Pixel);
-                                    g.Dispose();
-                                }
-                                catch
-                                {
-                                    Img = bit;
-                                }
-                            }
-                            else
-                            {
-                                Img = bit;
-                            }
-                            Img.Save(filePathName);
-                            memoryStream.Dispose();
-                            Img.Dispose();
-                            bit.Dispose();
-                        }
-                        catch (Exception)
-                        {
-                            using (var stream = new FileStream(filePathName, FileMode.Create))
-                            {
-                                encoder.Save(stream);
-                            }
-                        }
-                    }
-                    else
+                    MemoryStream memoryStream = new MemoryStream();
+                    encoder.Save(memoryStream);
+                    Bitmap bit = new Bitmap(memoryStream, true);
+                    Bitmap Img = new Bitmap(bit, ImgWidth, ImgHeight);
+                    Img.Save(filePathName);
+                    Img.Dispose();
+                    bit.Dispose();
+                    memoryStream.Dispose();
+                }
+                else
+                {
+                    using (var stream = new FileStream(filePathName, FileMode.Create))
                     {
-                        using (var stream = new FileStream(filePathName, FileMode.Create))
-                        {
-                            encoder.Save(stream);
-                        }
+                        encoder.Save(stream);
                     }
-                }))).Start();
+                }
+                
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                Console.WriteLine(e.Message);
             }
         }
 
-        public static void SaveUI2(FrameworkElement frameworkElement, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
+        public static void SaveUI2(FrameworkElement frameworkElement, string filePathName)
         {
             System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
             RenderTargetBitmap bmp = new RenderTargetBitmap((int)frameworkElement.ActualWidth, (int)frameworkElement.ActualHeight, 1 / 96, 1 / 96, PixelFormats.Default);
@@ -493,156 +455,24 @@ namespace Common.system
             fs.Close();
         }
 
-        /// <summary>
-        /// 保存图片
-        /// </summary>
-        /// <param name="ui">需要截图的UI控件</param>
-        /// <param name="filePathName">图片保存地址 命名 1.png</param>
-        /// <param name="width">窗口宽</param>
-        /// <param name="height">窗口高</param>
-        /// <param name="ImgWidth">图片高</param>
-        /// <param name="ImgHeight">图片高</param>
-        public static void SaveUIToImage(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
+        public static Bitmap SaveUI2Bitmap(FrameworkElement frameworkElement, int width, int height)
         {
-            try
-            {
-                //在位图中呈现UI元素
-                RenderTargetBitmap bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
-                bmp.Render(ui);
-                BitmapEncoder encoder = new PngBitmapEncoder();
-                encoder.Frames.Add(BitmapFrame.Create(bmp));
-                if (ImgWidth > 0)
-                {
-                    Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
-                    try
-                    {
-                        MemoryStream memoryStream = new MemoryStream();
-                        encoder.Save(memoryStream);
-                        new Thread(new ThreadStart(new Action(() =>
-                        {
-                            //System.Drawing.Image img = System.Drawing.Image.FromStream(memoryStream);
-                            Bitmap bit = new Bitmap(memoryStream);
-                            if (ImgWidth - 2 < bit.Width)
-                            {
-                                try
-                                {
-                                    Graphics g = Graphics.FromImage(Img);
-                                    //g.InterpolationMode = InterpolationMode.HighQualityBicubic;
-                                    g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, bit.Width, bit.Height), GraphicsUnit.Pixel);
-                                    g.Dispose();
-                                }
-                                catch
-                                {
-                                    Img = bit;
-                                }
-                            }
-                            else
-                            {
-                                Img = bit;
-                            }
-                            Img.Save(filePathName);
-
-                            memoryStream.Dispose();
-                            Img.Dispose();
-                            bit.Dispose();
-                        }))).Start();
-                    }
-                    catch (Exception)
-                    {
-                    }
-                }
-                else
-                {
-                    System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
-                    encoder.Save(fs);
-                    fs.Close();
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteErrLog("【UI生成图片】（SaveUIToImage）" + ex.Message, ex);
-                //Console.WriteLine(ex.Message);
-            }
-        }
-
-        public static void SaveImage(object model)
-        {
-            try
-            {
-                SaveModel saveModel = (SaveModel)model;
-                int ImgWidth = saveModel.ImgWidth;
-                int ImgHeight = saveModel.ImgHeight;
-                //BitmapEncoder encoder = saveModel.encoder;
-                RenderTargetBitmap bmp = saveModel.bmp;
-                BitmapEncoder encoder = new PngBitmapEncoder();
-                encoder.Frames.Add(BitmapFrame.Create(bmp));
-                string filePathName = saveModel.filePathName;
-                if (ImgWidth > 0)
-                {
-                    Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
-                    try
-                    {
-                        MemoryStream memoryStream = new MemoryStream();
-                        encoder.Save(memoryStream);
-                        new Thread(new ThreadStart(new Action(() =>
-                        {
-                            //System.Drawing.Image img = System.Drawing.Image.FromStream(memoryStream);
-                            Bitmap bit = new Bitmap(memoryStream);
-                            if (ImgWidth - 2 < bit.Width)
-                            {
-                                try
-                                {
-                                    Graphics g = Graphics.FromImage(Img);
-                                    //g.InterpolationMode = InterpolationMode.HighQualityBicubic;
-                                    g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, bit.Width, bit.Height), GraphicsUnit.Pixel);
-                                    g.Dispose();
-                                }
-                                catch
-                                {
-                                    Img = bit;
-                                }
-                            }
-                            else
-                            {
-                                Img = bit;
-                            }
-                            Img.Save(filePathName);
-                            //Bitmap bitmap = CutImageWhitePart(Img);
-                            //FileToolsCommon.DeleteFile(filePathName);
-                            //bitmap.Save(filePathName);
-                            //bitmap.Dispose();
-                            memoryStream.Dispose();
-                            Img.Dispose();
-                            bit.Dispose();
-                        }))).Start();
-                    }
-                    catch (Exception)
-                    {
-                    }
-                }
-                else
-                {
-                    //SaveImageModel sim = new SaveImageModel();
-                    //sim.encoder = new PngBitmapEncoder();
-                    //sim.encoder = new PngBitmapEncoder();
-                    //BitmapFrame test= encoder.Frames[0];
-                    //sim.encoder.Frames.Add(BitmapFrame.Create(test));
-                    ////sim.encoder.Frames[0].CopyTo(encoder.Frames[0]);
-                    ////sim.encoder.CopyTo(encoder);
-                    ////encoder.CopyTo(sim.encoder);
-                    //sim.FilePath = filePathName;
-                    ////sim.bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
-                    ////bmp.CopyTo(sim.bmp);
-                    //Thread t1 = new Thread(SaveImage);
-                    //t1.Start(sim);
-
-                    System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
-                    encoder.Save(fs);
-                    fs.Close();
-                }
-            }
-            catch (Exception)
-            {
+            using (MemoryStream outStream = new MemoryStream())
+            {
+                RenderTargetBitmap bmp = new RenderTargetBitmap(
+                        (int)frameworkElement.ActualWidth,
+                        (int)frameworkElement.ActualHeight,
+                        1 / 96, 
+                        1 / 96,
+                        PixelFormats.Default
+                    );
+                bmp.Render(frameworkElement);
+                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);
             }
         }
 
@@ -721,19 +551,6 @@ namespace Common.system
             return bmp;
         }
 
-        private static void SaveImage1(object obj)
-        {
-            SaveImageModel sim = (SaveImageModel)obj;
-            //RenderTargetBitmap bmp = sim.bmp;
-            //BitmapEncoder encoder = new PngBitmapEncoder();
-            //encoder.Frames.Add(BitmapFrame.Create(bmp));
-            BitmapEncoder encoder = sim.encoder;
-            string filePathName = sim.FilePath;
-            System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
-            encoder.Save(fs);
-            fs.Close();
-        }
-
         #endregion 截屏指定UI控件
 
         #region 去掉白边

XHWK.sln

@@ -9,26 +9,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XHWK.WKTool", "XHWK.WKTool\
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Debug|x86.ActiveCfg = Debug|x86
 		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Debug|x86.Build.0 = Debug|x86
-		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Release|x86.ActiveCfg = Release|x86
 		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Release|x86.Build.0 = Release|x86
-		{57591E23-644E-416D-B1CA-BB04C550130F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57591E23-644E-416D-B1CA-BB04C550130F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{57591E23-644E-416D-B1CA-BB04C550130F}.Debug|x86.ActiveCfg = Debug|x86
 		{57591E23-644E-416D-B1CA-BB04C550130F}.Debug|x86.Build.0 = Debug|x86
-		{57591E23-644E-416D-B1CA-BB04C550130F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57591E23-644E-416D-B1CA-BB04C550130F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{57591E23-644E-416D-B1CA-BB04C550130F}.Release|x86.ActiveCfg = Release|x86
 		{57591E23-644E-416D-B1CA-BB04C550130F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

打包脚本/Inno Setup星火微课.iss

@@ -3,10 +3,10 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "2.6.0"
+#define MyAppVersion "2.6.1"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
-#define MySourcePath "D:\Project\xhwkclient\XHWK.WKTool\bin\x86\Debug\"
+#define MySourcePath "D:\Project\C#\xhwkclient\XHWK.WKTool\bin\x86\Debug\"
 #define MyAppExeName "星火微课.exe"
 #define MyIcoName "256.ico"
 #define MyTargetPath "D:\程序打包\星火微课\"
@@ -54,4 +54,30 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
 
 [Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[Code]   
+function InitializeSetup: Boolean;   
+var Path:string;   
+    ResultCode: Integer;   
+begin  
+  if RegValueExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Screen Capturer Recorder_is1', 'DisplayName') then  
+  begin  
+    Result := true;   
+  end  
+  else  
+  begin  
+    if MsgBox('系统检测到您没有安装录制环境，是否立刻下载并安装？', mbConfirmation, MB_YESNO) = idYes then  
+    begin  
+      Path := ExpandConstant('{pf}/Internet Explorer/iexplore.exe');   
+      Exec(Path, 'https://xhkjedu.oss-cn-huhehaote.aliyuncs.com/runtime/Setup%20Screen%20Capturer%20Recorder%20v0.12.10.exe', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);   
+      MsgBox('请安装好录制环境后，再运行本安装包程序！',mbInformation,MB_OK);   
+      Result := false;   
+    end  
+    else  
+    begin  
+      MsgBox('取消后请手动安装录制环境！',mbInformation,MB_OK);   
+      Result := true;   
+    end;   
+  end;
+end;