Merge remote-tracking branch 'origin/zyy' into zhangxueyang

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1228,49 +1228,6 @@ namespace XHWK.WKTool
                 model_VideoList = new List<Model_Video>();
                 foreach (Model_WKData Vdata in APP.WKDataList)
                 {
-                    #region 检测麦克风扬声器是否可用
-                    string audioSpeakerPath = FileToolsCommon.GetFileAbsolutePath("adoS.m");
-                    string audioMicrophonePath = FileToolsCommon.GetFileAbsolutePath("adoM.m");
-                    try
-                    {
-                        FileToolsCommon.DeleteFile(audioSpeakerPath);
-                        FileToolsCommon.DeleteFile(audioMicrophonePath);
-                    }
-                    catch (Exception)
-                    {
-
-                    }
-                    //扬声器
-                    if (APP.FFmpeg.StartRecordSpeakerAudio(audioSpeakerPath))
-                    {
-                        APP.FFmpeg.StopRecordAudio();
-                        //Thread.Sleep(500);
-                        //麦克风
-                        if (APP.FFmpeg.StartRecordAudio(audioMicrophonePath))
-                        {
-                        }
-                        else
-                        {
-                            //无法录制麦克风
-                            MessageBoxResult Res = MessageWindow.Show("当前电脑无法录制麦克风，是否继续？", "消息提示", MessageBoxButton.OKCancel);
-                            if (Res == MessageBoxResult.Cancel)
-                            {
-                                return;
-                            }
-                        }
-                        APP.FFmpeg.StopRecordAudio();
-                    }
-                    else
-                    {
-                        //无法录制扬声器音频
-                        MessageBoxResult Res = MessageWindow.Show("当前电脑无法录制音频，是否继续？", "消息提示", MessageBoxButton.OKCancel);
-                        if (Res == MessageBoxResult.Cancel)
-                        {
-                            return;
-                        }
-                    }
-                    #endregion
-
                     #region 计时器初始化
                     if (Vdata.VideoList == null)
                         continue;
@@ -1820,6 +1777,49 @@ namespace XHWK.WKTool
             {
                 if (IsFirstR)//是否第一次录制  初始化录制
                 {
+                    #region 检测麦克风扬声器是否可用
+                    string audioSpeakerPath = FileToolsCommon.GetFileAbsolutePath("adoS.m");
+                    string audioMicrophonePath = FileToolsCommon.GetFileAbsolutePath("adoM.m");
+                    try
+                    {
+                        FileToolsCommon.DeleteFile(audioSpeakerPath);
+                        FileToolsCommon.DeleteFile(audioMicrophonePath);
+                    }
+                    catch (Exception)
+                    {
+
+                    }
+                    //扬声器
+                    if (APP.FFmpeg.StartRecordSpeakerAudio(audioSpeakerPath))
+                    {
+                        APP.FFmpeg.StopRecordAudio();
+                        //Thread.Sleep(500);
+                        //麦克风
+                        if (APP.FFmpeg.StartRecordAudio(audioMicrophonePath))
+                        {
+                        }
+                        else
+                        {
+                            //无法录制麦克风
+                            MessageBoxResult Res = MessageWindow.Show("当前电脑无法录制麦克风，是否继续？", "消息提示", MessageBoxButton.OKCancel);
+                            if (Res == MessageBoxResult.Cancel)
+                            {
+                                return;
+                            }
+                        }
+                        APP.FFmpeg.StopRecordAudio();
+                    }
+                    else
+                    {
+                        //无法录制扬声器音频
+                        MessageBoxResult Res = MessageWindow.Show("当前电脑无法录制音频，是否继续？", "消息提示", MessageBoxButton.OKCancel);
+                        if (Res == MessageBoxResult.Cancel)
+                        {
+                            return;
+                        }
+                    }
+                    #endregion
+
                     #region 计时器初始化
                     if (t == null)
                     {