zhao：1修改录屏检测麦克风和扬声器 2录屏返回可以取消并不保存录屏3解决太快操作录屏冲突。

Common/system/FFMpeg.cs

@@ -77,18 +77,18 @@ namespace Common.system
                 //无法录制扬声器音频
                 IsRecordSpeaker = false;
             }
-            StopRecordAudio();
-            Thread.Sleep(500);
+            StopRecordAudio(2);
+            Thread.Sleep(100);
             if (StartRecordAudio(audioMicrophonePath))
             {
                 IsRecordMicrophone = true;
             }
             else
             {
-                //无法录制扬声器
+                //无法录制麦克风
                 IsRecordMicrophone = false;
             }
-            StopRecordAudio();
+            StopRecordAudio(1);
             #endregion
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             string SpeakerStr = "";
@@ -186,8 +186,8 @@ namespace Common.system
                 //无法录制扬声器音频
                 IsRecordSpeaker = false;
             }
-            StopRecordAudio();
-            Thread.Sleep(500);
+            StopRecordAudio(2);
+            Thread.Sleep(100);
             if (StartRecordAudio(audioMicrophonePath))
             {
                 IsRecordMicrophone = true;
@@ -195,10 +195,10 @@ namespace Common.system
             }
             else
             {
-                //无法录制扬声器
+                //无法录制麦克风
                 IsRecordMicrophone = false;
             }
-            StopRecordAudio();
+            StopRecordAudio(1);
             if (!IsRecordSpeaker && !IsRecordMicrophone)
             {
                 return false;
@@ -811,7 +811,9 @@ namespace Common.system
             return devs;
         }
 
-        //录制麦克风的声音
+        /// <summary>
+        /// 录制麦克风的声音
+        /// </summary>
         private WaveInEvent waveIn = null; //new WaveInEvent();
         /// <summary>
         /// 开始录制麦克风
@@ -858,17 +860,38 @@ namespace Common.system
         /// <summary>
         /// 结束录制音频
         /// </summary>
-        public void StopRecordAudio()
+        /// <param name="type">1麦克风 2扬声器</param>
+        public void StopRecordAudio(int type)
         {
             try
             {
-                if (waveIn != null)
+                if (type == 1)
                 {
-                    waveIn.StopRecording();
+                    if (waveIn != null)
+                    {
+                        try
+                        {
+                            waveIn.StopRecording();
+                        }
+                        catch (Exception ex)
+                        {
+                            waveIn = null;
+                        }
+                    }
                 }
-                if (capture != null)
+                else if (type == 2)
                 {
-                    capture.StopRecording();
+                    if (capture != null)
+                    {
+                        try
+                        {
+                            capture.StopRecording();
+                        }
+                        catch (Exception)
+                        {
+                            capture = null;
+                        }
+                    }
                 }
             }
             catch (Exception ex)
@@ -878,7 +901,9 @@ namespace Common.system
         }
 
 
-        //录制扬声器的声音
+        /// <summary>
+        /// 录制扬声器的声音
+        /// </summary>
         private WasapiLoopbackCapture capture = null; //new WasapiLoopbackCapture();
 
         /// <summary>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -107,8 +107,8 @@ namespace XHWK.WKTool
             btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
             imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
             btnBlackPenTwo.IsEnabled = false;//红笔不可点击
-            imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
-            btnReturn.IsEnabled = true;//返回主界面可点击
+            //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
+            //btnReturn.IsEnabled = true;//返回主界面可点击
             txbTime.Visibility = Visibility.Hidden;//时间不显示
             if (t == null)
             {
@@ -232,7 +232,7 @@ namespace XHWK.WKTool
         {
             //FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
             FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "tempsr/");
+            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temprs/");
             VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
             int num = 1;
             while (FileToolsCommon.IsExistFile(VideoSavePathName))
@@ -267,7 +267,7 @@ namespace XHWK.WKTool
                     //扬声器
                     if (APP.FFmpeg.StartRecordSpeakerAudio(audioSpeakerPath))
                     {
-                        APP.FFmpeg.StopRecordAudio();
+                        APP.FFmpeg.StopRecordAudio(2);
                         //Thread.Sleep(500);
                         //麦克风
                         if (APP.FFmpeg.StartRecordAudio(audioMicrophonePath))
@@ -282,7 +282,7 @@ namespace XHWK.WKTool
                                 return;
                             }
                         }
-                        APP.FFmpeg.StopRecordAudio();
+                        APP.FFmpeg.StopRecordAudio(1);
                     }
                     else
                     {
@@ -341,8 +341,8 @@ namespace XHWK.WKTool
                 btnBlackPenOne.IsEnabled = true;//蓝笔可点击
                 imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar28.png"));
                 btnBlackPenTwo.IsEnabled = true;//红笔可点击
-                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
-                btnReturn.IsEnabled = false;//返回主界面不可点击
+                //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
+                //btnReturn.IsEnabled = false;//返回主界面不可点击
                 txbTime.Visibility = Visibility.Visible;//时间显示
                 try
                 {
@@ -352,6 +352,10 @@ namespace XHWK.WKTool
                         {
                             Thread.Sleep(1500);
                         }
+                        if(APP.FFmpeg.myProcess!=null)
+                        {
+                            Thread.Sleep(100);
+                        }
                         APP.FFmpeg.StartRecordingVideo(VideoSavePathName);
 
                         Thread.Sleep(1000);
@@ -876,11 +880,60 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnReturn_Click(object sender, RoutedEventArgs e)
         {
+            MessageBoxResult br=MessageWindow.Show("退出将不保存当前录屏！", "提示", MessageBoxButton.OKCancel);
+            if(br==MessageBoxResult.Cancel)
+            {
+                return;
+            }
+            k_hook.Stop();
+            IsSuspend = true;
+            txbTime.Text = "00:00";
+
+            txbTime.Visibility = Visibility.Hidden;
+            End();
+            if (APP.W_PracticeWindow != null)
+            {
+                if (APP.W_PracticeWindow.Visibility == Visibility.Visible)
+                {
+                    APP.W_PracticeWindow.Hide();
+                }
+            }
+            if (gridToolbar.Visibility == Visibility.Visible)
+            {
+                gridToolbar.Visibility = Visibility.Hidden;
+                gridColour.Visibility = Visibility.Hidden;
+                gridThickness.Visibility = Visibility.Hidden;
+            }
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
             }
             APP.W_XHMicroLessonSystemWindow.Show();
+            if (!IsFirstRS)
+            {
+                try
+                {
+                    try
+                    {
+                        APP.FFmpeg.SuspendFFmpeg();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteErrLog("【录屏返回】（BtnStopRecordingScreen_Click）" + ex.Message, ex);
+                    }
+                    IsFirstRS = true;
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        VideoInfo = null;
+                        FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temprs/");
+                        
+                    }))).Start();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteErrLog("【录屏返回】（BtnStopRecordingScreen_Click）" + ex.Message, ex);
+                }
+            }
             Hide();
         }
     }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -2056,6 +2056,7 @@ namespace XHWK.WKTool
                 {
                     Thread.Sleep(100);
                 }
+                Thread.Sleep(100);
                 Dispatcher.Invoke(() =>
                 {
                     btnScreenRecording.IsEnabled = true;
@@ -2139,7 +2140,7 @@ namespace XHWK.WKTool
                     //扬声器
                     if (APP.FFmpeg.StartRecordSpeakerAudio(audioSpeakerPath))
                     {
-                        APP.FFmpeg.StopRecordAudio();
+                        APP.FFmpeg.StopRecordAudio(2);
                         //Thread.Sleep(500);
                         //麦克风
                         if (APP.FFmpeg.StartRecordAudio(audioMicrophonePath))
@@ -2154,7 +2155,7 @@ namespace XHWK.WKTool
                                 return;
                             }
                         }
-                        APP.FFmpeg.StopRecordAudio();
+                        APP.FFmpeg.StopRecordAudio(1);
                     }
                     else
                     {
@@ -2288,6 +2289,7 @@ namespace XHWK.WKTool
                     IsFirstR = false;
                     RsImgName = new List<string>();
                     SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+                    txbTime.Visibility = Visibility.Visible;
                     ///启动截图
                     timer = new System.Threading.Timer(new TimerCallback(Timer_Elapsed), null, 0, 20);
                     //{
@@ -2493,6 +2495,7 @@ namespace XHWK.WKTool
                 ImgStop.Visibility = Visibility.Visible;
                 ImgStopTwo.Visibility = Visibility.Collapsed;
                 //TimeOut();
+                txbType.Visibility = Visibility.Visible;
                 txbType.Text = "保存中";
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>