解决有时声音画面不同步的问题

解决偶发视频无法合并闪退问题

XHWK.WKTool/App.config

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

XHWK.WKTool/App.xaml.cs

@@ -532,7 +532,7 @@ namespace XHWK.WKTool
                     WKDataList = new List<Model_WKData>();
                 }
                 WKDataList.Add(WKData);
-                //string WkDateXmlStr = XmlUtilHelper.Serializer(typeof(Model_WKData), WKData);
+
                 string WkDateXmlStr = XmlUtilHelper.XmlSerialize(WKDataList);
                 string SavePath = FileToolsCommon.GetFileAbsolutePath("/Data/");
                 FileToolsCommon.CreateDirectory(SavePath);
@@ -597,7 +597,7 @@ namespace XHWK.WKTool
                     return;
                 }
                 FileToolsCommon.CreateDirectory(WKData.WkPath);
-                string SavePath = WKData.WkPath + "PageData.d";
+                string SavePath = WKData.WkPath + "PageData.xml";
                 FileToolsCommon.DeleteFile(SavePath);
                 string PageDataXmlStr = XmlUtilHelper.XmlSerialize(PageDrawList);
                 FileToolsCommon.WriteText(SavePath, PageDataXmlStr);
@@ -616,7 +616,7 @@ namespace XHWK.WKTool
             try
             {
                 PageDrawList = new List<Model_DrawData>();
-                string SavePath = WKData.WkPath + "PageData.d";
+                string SavePath = WKData.WkPath + "PageData.xml";
                 if (FileToolsCommon.IsExistFile(SavePath))
                 {
                     string PageDataXmlStr = FileToolsCommon.FileToString(SavePath);

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -277,7 +277,7 @@ namespace XHWK.WKTool
                         //创建文件夹
                         FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
                         FileToolsCommon.DeleteDirectory(wkpath + "temp");
-                        FileToolsCommon.DeleteDirectory(wkpath + "temprs");
+                        FileToolsCommon.DeleteDirectory(wkpath + "_temppath");
                     }
                     catch (Exception ex)
                     {

XHWK.WKTool/MainWindow.xaml.cs

@@ -424,9 +424,6 @@ namespace XHWK.WKTool
                 if (Ofd.SelectedPath != "")
                 {
                     txbStoragePath.Content = Ofd.SelectedPath;
-                    //string ApplicationData = ZConfig.dataPath + "fileStorageAddress.txt";
-                    //string temp = ofd.SelectedPath;
-                    //System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
                 }
             }
         }
@@ -440,7 +437,7 @@ namespace XHWK.WKTool
         /// </param>
         private void btnOpen_Click(object sender, RoutedEventArgs e)
         {
-            System.Diagnostics.Process.Start(APP.WKData.WkPath);
+            Process.Start(APP.WKData.WkPath);
         }
 
         /// <summary>
@@ -2773,7 +2770,7 @@ namespace XHWK.WKTool
 
             new Thread(new ThreadStart(new Action(() =>
             {
-                while (FileToolsCommon.IsExistDirectory(APP.WKData.WkPath + "temprs/"))
+                while (FileToolsCommon.IsExistDirectory(APP.WKData.WkPath + "_temppath/"))
                 {
                     Thread.Sleep(100);
                 }

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -6,6 +6,7 @@ using System;
 using System.Drawing;
 using System.IO;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Ink;
@@ -45,6 +46,8 @@ namespace XHWK.WKTool
         /// </summary>
         private string TempAudioPathName2;
 
+        private string temppath = APP.WKData.WkPath + "_temppath/";
+
         /// <summary>
         /// 视频信息
         /// </summary>
@@ -196,11 +199,12 @@ namespace XHWK.WKTool
         /// <summary>
         /// 设置录屏文件地址
         /// </summary>
-        private void SetUpVideoPathName()
+        private void SetSavePath()
         {
             string fileType = ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
             FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temprs/");
+            FileToolsCommon.DeleteDirectory(temppath);
+            FileToolsCommon.CreateDirectory(temppath);
             VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏." + fileType;
             int num = 1;
             while (FileToolsCommon.IsExistFile(VideoSavePathName))
@@ -209,9 +213,9 @@ namespace XHWK.WKTool
                 VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_" + num + "." + fileType;
             }
 
-            TempVideoPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_" + num + ".avi";
-            TempAudioPathName1 = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_" + num + "_1.mp3";
-            TempAudioPathName2 = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_" + num + "_2.mp3";
+            TempVideoPathName = temppath + "_录屏_" + num + ".avi";
+            TempAudioPathName1 = temppath + "_麦克风_" + num + "_1.mp3";
+            TempAudioPathName2 = temppath + "_扬声器_" + num + "_2.mp3";
         }
 
         /// <summary>
@@ -226,7 +230,7 @@ namespace XHWK.WKTool
         private ZAudioRecordHelper helper2 = null;
 
         //桌面录制
-        private ZVideoRecordHelper helper3 = null;
+        private ZVideoRecordHelper helper0 = null;
 
         public IntPtr winHandle;// 当前窗体指针
 
@@ -235,7 +239,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void BtnRecordingScreen_Click(object sender, RoutedEventArgs e)
+        private async void BtnRecordingScreen_Click(object sender, RoutedEventArgs e)
         {
             #region 防止连击
 
@@ -280,7 +284,7 @@ namespace XHWK.WKTool
                     VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType")),
                     WkType = Enum_WKVidetype.RecordingScreen
                 };
-                SetUpVideoPathName();
+                SetSavePath();
 
                 if (APP.W_CountdownWindow == null)
                 {
@@ -322,45 +326,44 @@ namespace XHWK.WKTool
 
                 #endregion 隐藏工具栏
 
-                helper1 = new ZAudioRecordHelper(TempAudioPathName1, ZAudioRecordHelper.RecordType.microphone);
-                helper2 = new ZAudioRecordHelper(TempAudioPathName2, ZAudioRecordHelper.RecordType.loudspeaker);
-
-                winHandle = new WindowInteropHelper(this).Handle;
-                var curScreen = Screen.FromHandle(winHandle);
-                int RecordWidth = curScreen.Bounds.Width;
-                int RecordHeight = curScreen.Bounds.Height;
-                helper3 = new ZVideoRecordHelper(TempVideoPathName, RecordWidth, RecordHeight);
-
-                new Thread(o =>
+                try
                 {
-                    Thread.Sleep(3000);
-                    Dispatcher.Invoke(() =>
-                    {
-                        _state = State.Start;
-                        helper1.StartRecordAudio();
-                        helper2.StartRecordAudio();
-                        helper3.StartRecordVideo();
-                    });
-
-                    Thread.Sleep(1000);
-
-                    Dispatcher.Invoke(() =>
-                    {
-                        k_hook.Start();//安装键盘钩子
-                    });
-                })
-                { IsBackground = true }.Start();
+                    // 视频
+                    winHandle = new WindowInteropHelper(this).Handle;
+                    var curScreen = Screen.FromHandle(winHandle);
+                    int RecordWidth = curScreen.Bounds.Width;
+                    int RecordHeight = curScreen.Bounds.Height;
+                    helper0 = new ZVideoRecordHelper(TempVideoPathName, RecordWidth, RecordHeight);
+
+                    // 麦克风
+                    helper1 = new ZAudioRecordHelper(TempAudioPathName1, ZAudioRecordHelper.RecordType.microphone);
+                    // 扬声器
+                    helper2 = new ZAudioRecordHelper(TempAudioPathName2, ZAudioRecordHelper.RecordType.loudspeaker);
+
+                    await Task.Delay(3000);
+                    APP.W_CountdownWindow.Hide();
+                    await Task.Delay(100);
+                    _state = State.Start;
+                    helper1.StartRecordAudio();
+                    helper2.StartRecordAudio();
+                    helper0.StartRecordVideo();
+                    k_hook.Start();//安装键盘钩子
+                }
+                catch (Exception)
+                {
+                    ExitByErr();
+                }
 
+                Console.WriteLine("TempVideoPathName:" + TempVideoPathName);
                 Console.WriteLine("TempAudioPathName1:" + TempAudioPathName1);
                 Console.WriteLine("TempAudioPathName2:" + TempAudioPathName2);
-                Console.WriteLine("TempVideoPathName:" + TempVideoPathName);
             }
             else if (_state == State.Start)
             {
                 _state = State.Pause;
                 helper1.PauseRecordAudio();
                 helper2.PauseRecordAudio();
-                helper3.PauseRecordVideo();
+                helper0.PauseRecordVideo();
                 BtnRecordingScreen.Visibility = Visibility.Visible;
                 BtnRecordingScreenPause.Visibility = Visibility.Collapsed;
             }
@@ -369,12 +372,49 @@ namespace XHWK.WKTool
                 _state = State.Start;
                 helper1.ResumeRecordAudio();
                 helper2.ResumeRecordAudio();
-                helper3.ResumeRecordVideo();
+                helper0.ResumeRecordVideo();
                 BtnRecordingScreen.Visibility = Visibility.Collapsed;
                 BtnRecordingScreenPause.Visibility = Visibility.Visible;
             }
         }
 
+        private void ExitByErr()
+        {
+            BtnRecordingScreen.ToolTip = "开始";
+            k_hook.Stop();
+            TxbTime.Content = "00:00";
+
+            if (APP.W_PracticeWindow != null)
+            {
+                if (APP.W_PracticeWindow.Visibility == Visibility.Visible)
+                {
+                    Owner = null;
+                    APP.W_PracticeWindow.ReturnPractice();
+                }
+            }
+
+            if (APP.W_XHMicroLessonSystemWindow == null)
+            {
+                APP.W_XHMicroLessonSystemWindow = new MainWindow();
+            }
+            APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
+
+            APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
+            APP.W_XHMicroLessonSystemWindow.Show();
+            End();
+            if (t != null)
+            {
+                t.Stop();
+                t = null;
+            }
+            helper0.StopRecordVideo();
+            helper1.StopRecordAudio();
+            helper2.StopRecordAudio();
+            FileToolsCommon.DeleteDirectory(temppath);
+            Click_stopRecordingScreen();
+            Hide();
+        }
+
         /// <summary>
         /// 停止录像
         /// </summary>
@@ -418,7 +458,7 @@ namespace XHWK.WKTool
                 APP.W_XHMicroLessonSystemWindow = new MainWindow();
             }
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
-            //APP.W_XHMicroLessonSystemWindow.InitPen();
+
             APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
             APP.W_XHMicroLessonSystemWindow.Show();
 
@@ -428,57 +468,61 @@ namespace XHWK.WKTool
                 t.Stop();
                 t = null;
                 Console.WriteLine("停止录制");
+                helper0.StopRecordVideo();
                 helper1.StopRecordAudio();
                 helper2.StopRecordAudio();
-                helper3.StopRecordVideo();
 
                 new Thread(new ThreadStart(new Action(() =>
                 {
                     FFMpegConverter ffMpeg = new FFMpegConverter();
 
                     FFMpegInput[] input = new FFMpegInput[] {
-                    new FFMpegInput(TempVideoPathName),
-                    new FFMpegInput(TempAudioPathName1),
-                    new FFMpegInput(TempAudioPathName1),
-                };
+                        new FFMpegInput(TempVideoPathName),
+                        new FFMpegInput(TempAudioPathName1),
+                        new FFMpegInput(TempAudioPathName2),
+                    };
 
-                    // 多路音频混音
-                    ffMpeg.ConvertMedia(
-                        input,
-                        VideoSavePathName,
-                        "mp4",
-                        new OutputSettings()
+                    try
+                    {
+                        // 多路音频混音
+                        ffMpeg.ConvertMedia(
+                            input,
+                            VideoSavePathName,
+                            "mp4",
+                            new OutputSettings()
+                            {
+                                CustomOutputArgs = "-filter_complex amix=inputs=2:duration=first:dropout_transition=2"
+                            }
+                        );
+                        //生成缩略图
+                        string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
+                        FileToolsCommon.CreateDirectory(ThumbnailPath);
+                        //缩略图存储位置
+                        string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".", "") + ".JPG";
+
+                        VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                        VideoInfo.VideoPath = VideoSavePathName;
+                        VideoInfo.ThumbnailPath = ThumbnailPathName;
+                        APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName, 200, 130);
+                        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))
                         {
-                            CustomOutputArgs = "-filter_complex amix=inputs=2:duration=first:dropout_transition=2"
+                            APP.VideoList.Add(VideoInfo);
+                            //保存数据
+                            APP.SaveWkData();
                         }
-                    );
-                    //生成缩略图
-                    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;
-                    APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName, 200, 130);
-                    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))
+                    }
+                    catch (Exception ex)
                     {
-                        APP.VideoList.Add(VideoInfo);
-                        //保存数据
-                        APP.SaveWkData();
+                        LogHelper.WriteErrLog("录屏保存" + ex.Message, ex);
                     }
 
-                    FileToolsCommon.DeleteFile(TempAudioPathName1);
-                    FileToolsCommon.DeleteFile(TempAudioPathName2);
-                    FileToolsCommon.DeleteFile(TempVideoPathName);
+                    FileToolsCommon.DeleteDirectory(temppath);
                 }))).Start();
-                Click_stopRecordingScreen();
             }
+            Click_stopRecordingScreen();
             Hide();
 
             SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
@@ -525,17 +569,11 @@ namespace XHWK.WKTool
                 #endregion 防止连击
 
                 string time = GetTimeStamp();
-                string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
-                if (!Directory.Exists(tempPath))
-                {
-                    Directory.CreateDirectory(tempPath);
-                }
+
                 try
                 {
                     Dispatcher.Invoke(() =>
                     {
-                        //borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
-                        //borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
                         if (APP.W_PracticeWindow == null)
                         {
                             APP.W_PracticeWindow = new PracticeWindow
@@ -545,10 +583,8 @@ namespace XHWK.WKTool
                                 Left = 0,
                                 Top = 0
                             };
-                            //practiceWin.Owner = this;
                         }
-                        //APP.W_PracticeWindow.InitPen();
-                        //APP.W_PracticeWindow.InitTQLPPen();
+
                         APP.W_PracticeWindow.Initialize();// imagePath);
                         flg = 11;
                         APP.W_PracticeWindow.Blue();
@@ -566,7 +602,6 @@ namespace XHWK.WKTool
                         Thread.Sleep(500);
                         Dispatcher.Invoke(() =>
                         {
-                            //Owner = APP.W_PracticeWindow;
                             Topmost = true;
                         });
                     }))).Start();
@@ -613,18 +648,6 @@ namespace XHWK.WKTool
             BtnPenBlue_CL.Visibility = Visibility.Visible;
             BtnPenRed_CL.Visibility = Visibility.Collapsed;
             string time = GetTimeStamp();
-            string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
-            if (!Directory.Exists(tempPath))
-            {
-                Directory.CreateDirectory(tempPath);
-            }
-
-            #region 录屏批注取消画笔
-
-            //string imagePath = Path.Combine(tempPath, time + ".jpg");
-            //ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
-
-            #endregion 录屏批注取消画笔
 
             try
             {
@@ -816,15 +839,10 @@ namespace XHWK.WKTool
             BtnPenBlue_CL.Visibility = Visibility.Collapsed;
             BtnPenRed_CL.Visibility = Visibility.Visible;
             string time = GetTimeStamp();
-            string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
-            if (!Directory.Exists(tempPath))
-            {
-                Directory.CreateDirectory(tempPath);
-            }
 
             #region 录屏批注取消画笔
 
-            string imagePath = Path.Combine(tempPath, time + ".jpg");
+            string imagePath = Path.Combine(temppath, time + ".jpg");
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
 
             #endregion 录屏批注取消画笔

XHWK.WKTool/Utils/ZAudioRecordHelper.cs

@@ -22,31 +22,26 @@ namespace XHWK.WKTool.Utils
         }
 
         //录制的类型
-        RecordType _t = RecordType.microphone;
+        private RecordType _t = RecordType.microphone;
 
-        RecordState _state = RecordState.stop;
+        private RecordState _state = RecordState.stop;
 
         //录制麦克风的声音
-        WaveInEvent waveIn = null; //new WaveInEvent();
-                                   //录制扬声器的声音
-        WasapiLoopbackCapture capture = null; //new WasapiLoopbackCapture();
-                                              //生成音频文件的对象
-        WaveFileWriter writer = null;
+        private WaveInEvent waveIn = null; //new WaveInEvent();
 
-        string audioFile = "";
+        //录制扬声器的声音
+        private WasapiLoopbackCapture capture = null; //new WasapiLoopbackCapture();
+
+        //生成音频文件的对象
+        private WaveFileWriter writer = null;
+
+        private string audioFile = "";
 
         public ZAudioRecordHelper(string filePath, RecordType type)
         {
             _t = type;
             audioFile = filePath;
-        }
-
-        /// <summary>
-        /// 开始录制
-        /// </summary>
-        public void StartRecordAudio()
-        {
-            _state = RecordState.start;
+            _state = RecordState.pause;
             try
             {
                 if (_t == RecordType.microphone)
@@ -94,11 +89,19 @@ namespace XHWK.WKTool.Utils
                     capture.StartRecording();
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
             }
         }
 
+        /// <summary>
+        /// 开始录制
+        /// </summary>
+        public void StartRecordAudio()
+        {
+            _state = RecordState.start;
+        }
+
         /// <summary>
         /// 结束录制
         /// </summary>
@@ -210,7 +213,8 @@ namespace XHWK.WKTool.Utils
             }
             catch (Exception ex)
             {
-                if (mWriter != null) {
+                if (mWriter != null)
+                {
                     mWriter.Dispose();
                     mWriter = null;
                 }
@@ -220,4 +224,4 @@ namespace XHWK.WKTool.Utils
             return true;
         }
     }
-}
+}

XHWK.WKTool/Utils/ZVideoRecordHelper.cs

@@ -8,7 +8,6 @@ namespace XHWK.WKTool.Utils
 {
     public class ZVideoRecordHelper
     {
-
         public enum RecordState
         {
             stop = 0,
@@ -16,21 +15,24 @@ namespace XHWK.WKTool.Utils
             pause = 2
         }
 
-        RecordState _state = RecordState.stop;
+        private RecordState _state = RecordState.stop;
+
+        private string _filePath = "";
+        private int _width = 0;
+        private int _height = 0;
 
-        string _filePath = "";
-        int _width = 0;
-        int _height = 0;
         //录制帧率
-        int _rate = 5;
+        private int _rate = 5;
+
         //录制质量
-        int _quality = 8;
-        bool _captureMouse = false;
+        private int _quality = 8;
+
+        private bool _captureMouse = false;
 
         private VideoFileWriter videoWriter = new VideoFileWriter();//视频写入
         private ScreenCaptureStream videoStreamer;//视频捕获
 
-        public ZVideoRecordHelper(string filePath, int width,int height,int rate = 5,int quality=8, bool captureMouse = false)
+        public ZVideoRecordHelper(string filePath, int width, int height, int rate = 5, int quality = 8, bool captureMouse = false)
         {
             _filePath = filePath;
             _width = width / 2 * 2;
@@ -38,14 +40,8 @@ namespace XHWK.WKTool.Utils
             _rate = rate;
             _quality = quality;
             _captureMouse = captureMouse;
-        }
 
-        /// <summary>
-        /// 开始录制
-        /// </summary>
-        public bool StartRecordVideo()
-        {
-            _state = RecordState.start;
+            _state = RecordState.pause;
             try
             {
                 // 打开写入
@@ -61,20 +57,25 @@ namespace XHWK.WKTool.Utils
                     );
                 }
 
-                System.Drawing.Rectangle rec = new System.Drawing.Rectangle(0,0,_width,_height);
+                System.Drawing.Rectangle rec = new System.Drawing.Rectangle(0, 0, _width, _height);
                 videoStreamer = new ScreenCaptureStream(rec, 1000 / _rate);//帧间隔需要和帧率关联，不然录的10秒视频文件不是10s
                 videoStreamer.NewFrame += VideoNewFrame;
                 videoStreamer.Start();
             }
             catch (Exception ex)
             {
-                return false;
             }
+        }
 
+        /// <summary>
+        /// 开始录制
+        /// </summary>
+        public bool StartRecordVideo()
+        {
+            _state = RecordState.start;
             return true;
         }
 
-
         [DllImport("user32.dll")]
         private static extern bool GetCursorInfo(out CURSORINFO pci);
 
@@ -154,4 +155,4 @@ namespace XHWK.WKTool.Utils
             _state = RecordState.start;
         }
     }
-}
+}

XHWK.WKTool/system/FFMpeg.cs

@@ -594,7 +594,7 @@ namespace Common.system
             }
             else
             {
-                if (!FileToolsCommon.IsExistFile(Path + "temprs/filelist.d"))
+                if (!FileToolsCommon.IsExistFile(Path + "_temppath/filelist.d"))
                 {
                     return;
                 }
@@ -611,7 +611,7 @@ namespace Common.system
             }
             else
             {
-                myProcess.StartInfo.Arguments = "-f concat  -safe 0 -i " + Path + "temprs/filelist.d -c copy " + FilePath;
+                myProcess.StartInfo.Arguments = "-f concat  -safe 0 -i " + Path + "_temppath/filelist.d -c copy " + FilePath;
             }
             if (OutputVideoLog)
             {
@@ -654,7 +654,7 @@ namespace Common.system
             }
             else
             {
-                FileToolsCommon.DeleteDirectory(Path + "temprs/");
+                FileToolsCommon.DeleteDirectory(Path + "_temppath/");
             }
         }
 
@@ -754,7 +754,7 @@ namespace Common.system
             string Path = FileToolsCommon.GetDirectoryName(FilePath);
             //Path.GetFileName(FilePath);//获取文件名
             string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
-            string tempFilePath = Path + "temprs/";
+            string tempFilePath = Path + "_temppath/";
             //创建临时目录
             FileToolsCommon.CreateDirectory(tempFilePath);
             //创建记录文件

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

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