zhao：增加扬声器检测

Common/system/FFMpeg.cs

@@ -23,6 +23,14 @@ namespace Common.system
         /// </summary>
         string LogPath = "";
         /// <summary>
+        /// 是否可以录制扬声器
+        /// </summary>
+        bool IsRecordSpeaker = true;
+        /// <summary>
+        /// 是否可以录制麦克风
+        /// </summary>
+        bool IsRecordMicrophone = true;
+        /// <summary>
         /// 录制屏幕
         /// </summary>
         /// <param name="FilePath">文件存储路径</param>
@@ -45,56 +53,84 @@ namespace Common.system
             myProcess = new Process();
             LogPath = CreateffmpegLog();
             string MicrophoneName = null;
-            string audioTestPath = FileToolsCommon.GetFileAbsolutePath("ado.m");
+            #region 检测麦克风扬声器
+            string audioSpeakerPath = FileToolsCommon.GetFileAbsolutePath("adoS.m");
+            string audioMicrophonePath = FileToolsCommon.GetFileAbsolutePath("adoM.m");
             try
             {
-                FileToolsCommon.DeleteFile(audioTestPath);
+                FileToolsCommon.DeleteFile(audioSpeakerPath);
+                FileToolsCommon.DeleteFile(audioMicrophonePath);
             }
             catch (Exception)
             {
 
             }
-            if (StartRecordAudio(audioTestPath))
+            if(StartRecordSpeakerAudio(audioSpeakerPath))
             {
-                MicrophoneName = GetMicrophone();
+                IsRecordSpeaker = true;
+            }
+            else
+            {
+                //无法录制扬声器音频
+                IsRecordSpeaker = false;
             }
             StopRecordAudio();
+            Thread.Sleep(500);
+            if (StartRecordAudio(audioMicrophonePath))
+            {
+                IsRecordMicrophone = true;
+            }
+            else
+            {
+                //无法录制扬声器
+                IsRecordMicrophone = false;
+            }
+            StopRecordAudio();
+            #endregion
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+            string SpeakerStr = "";
+            string MicrophoneStr = "";
+            if (IsRecordSpeaker)
+            {
+                SpeakerStr = "-f dshow -i audio=\"virtual-audio-capturer\" ";
+            }
+            if(IsRecordMicrophone)
+            {
+                MicrophoneName = GetMicrophone();
+                if (!string.IsNullOrWhiteSpace(MicrophoneName))
+                {
+                    MicrophoneStr = "-f dshow -i audio=\"" + MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 ";
+                }
+            }
             switch (Extension.ToUpper())
             {
                 case ".MP4":
-                    if (string.IsNullOrWhiteSpace(MicrophoneName))
-                    {
-                        myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f avi " + PathName;  //ffmpeg的参数
-                    }
-                    else
-                    {
-                        myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" -f dshow -i audio=\"" +
-                            MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec h264 -preset:v ultrafast -tune:v zerolatency -acodec aac -ar 44100 -ac 2 " + PathName;  //ffmpeg的参数
-                    }
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
+                    //if (string.IsNullOrWhiteSpace(MicrophoneName))
+                    //{
+                    //    myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 " + PathName;  //ffmpeg的参数
+                    //}
+                    //else
+                    //{
+                    //    myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" -f dshow -i audio=\"" +
+                    //        MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec h264 -preset:v ultrafast -tune:v zerolatency -acodec aac -ar 44100 -ac 2 " + PathName;  //ffmpeg的参数
+                    //}
                     break;
                 case ".AVI":
                 case ".FLV":
-                    if (string.IsNullOrWhiteSpace(MicrophoneName))
-                    {
-                        myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
-                    }
-                    else
-                    {
-                        myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" -f dshow -i audio=\"" +
-                            MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec h264 -preset:v ultrafast -tune:v zerolatency -acodec aac -ar 44100 -ac 2 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
-                    }
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac -f " + Extension.ToLower().Replace(".","") + " " + PathName;
+                    //if (string.IsNullOrWhiteSpace(MicrophoneName))
+                    //{
+                    //    myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
+                    //}
+                    //else
+                    //{
+                    //    myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" -f dshow -i audio=\"" +
+                    //        MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec h264 -preset:v ultrafast -tune:v zerolatency -acodec aac -ar 44100 -ac 2 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
+                    //}
                     break;
                 default:
-                    if (string.IsNullOrWhiteSpace(MicrophoneName))
-                    {
-                        myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f avi " + PathName;  //ffmpeg的参数
-                    }
-                    else
-                    {
-                        myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" -f dshow -i audio=\"" +
-                            MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec h264 -preset:v ultrafast -tune:v zerolatency -acodec aac -ar 44100 -ac 2 " + PathName;  //ffmpeg的参数
-                    }
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
                     break;
             }
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
@@ -110,7 +146,7 @@ namespace Common.system
         /// 录制音频
         /// </summary>
         /// <param name="Mp3Path">MP3音频位置</param>
-        public void StartRecordingAudio(string Mp3Path)
+        public bool StartRecordingAudio(string Mp3Path)
         {
             while (myProcess != null)
             {
@@ -125,33 +161,67 @@ namespace Common.system
             {
                 KillProcess.Kill();
             }
-            myProcess = new Process();
-            LogPath = CreateffmpegLog();
-            this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             string MicrophoneName = null;
-            string audioTestPath = FileToolsCommon.GetFileAbsolutePath("ado.m");
+            #region 检测麦克风扬声器
+            string audioSpeakerPath = FileToolsCommon.GetFileAbsolutePath("adoS.m");
+            string audioMicrophonePath = FileToolsCommon.GetFileAbsolutePath("adoM.m");
             try
             {
-                FileToolsCommon.DeleteFile(audioTestPath);
+                FileToolsCommon.DeleteFile(audioSpeakerPath);
+                FileToolsCommon.DeleteFile(audioMicrophonePath);
             }
             catch (Exception)
             {
 
             }
-            if (StartRecordAudio(audioTestPath))
+            if (StartRecordSpeakerAudio(audioSpeakerPath))
             {
-                MicrophoneName = GetMicrophone();
+                IsRecordSpeaker = true;
+            }
+            else
+            {
+                //无法录制扬声器音频
+                IsRecordSpeaker = false;
             }
             StopRecordAudio();
-            if (string.IsNullOrWhiteSpace(MicrophoneName))
+            Thread.Sleep(500);
+            if (StartRecordAudio(audioMicrophonePath))
             {
-                myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" " + PathName;
+                IsRecordMicrophone = true;
+                MicrophoneName = GetMicrophone();
             }
             else
+            {
+                //无法录制扬声器
+                IsRecordMicrophone = false;
+            }
+            StopRecordAudio();
+            if (!IsRecordSpeaker && !IsRecordMicrophone)
+            {
+                return false;
+            }
+            #endregion
+            myProcess = new Process();
+            LogPath = CreateffmpegLog();
+            this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+            if(IsRecordSpeaker && IsRecordMicrophone)
             {
                 myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\"  -f dshow -i audio=\"" +
                         MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 " + PathName;
             }
+            else if(IsRecordSpeaker)
+            {
+                myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" " + PathName;
+            }
+            else if(IsRecordMicrophone)
+            {
+                //录制麦克风
+                if (!string.IsNullOrWhiteSpace(MicrophoneName))
+                {
+                    myProcess.StartInfo.Arguments = "-f dshow -i audio=\"" +
+                        MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 " + PathName;
+                }
+            }
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
             myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -160,6 +230,7 @@ namespace Common.system
             myProcess.ErrorDataReceived += new DataReceivedEventHandler(Output);
             myProcess.Start();                //启动线程
             myProcess.BeginErrorReadLine();   //开始异步读取
+            return true;
         }
 
         /// <summary>
@@ -252,31 +323,41 @@ namespace Common.system
             }
             myProcess = new Process();
             LogPath = CreateffmpegLog();
+            string mp3Str = "";
+            #region 判断音频是否存在
+            if (!string.IsNullOrWhiteSpace(Mp3Path))
+            {
+                if (FileToolsCommon.IsExistFile(Mp3Path))
+                {
+                    mp3Str = "-i " + Mp3Path;
+                }
+            }
+            #endregion
             this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             switch (Extension.ToUpper())
             {
                 case ".MP4":
                     myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
-                        ImageListPath + @"%d.png -i " +
-                        Mp3Path + @" -s " + VideoWidth + "x" + VideoHeight + " -vcodec mpeg4 " +
+                        ImageListPath + @"%d.png " +
+                        mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -vcodec mpeg4 " +
                         VideoSavePath;
                     break;
                 case ".AVI":
                     myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
-                        ImageListPath + @"%d.png -i " +
-                        Mp3Path + @" -s " + VideoWidth + "x" + VideoHeight + " -f AVI " +
+                        ImageListPath + @"%d.png " +
+                        mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -f AVI " +
                         VideoSavePath;
                     break;
                 case ".FLV":
                     myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
-                        ImageListPath + @"%d.png -i " +
-                        Mp3Path + @" -s " + VideoWidth + "x" + VideoHeight + " -f FLV " +
+                        ImageListPath + @"%d.png " +
+                        mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -f FLV " +
                         VideoSavePath;
                     break;
                 default:
                     myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
-                        ImageListPath + @"%d.png -i " +
-                        Mp3Path + @" -s " + VideoWidth + "x" + VideoHeight + " -vcodec mpeg4 " +
+                        ImageListPath + @"%d.png " +
+                        mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -vcodec mpeg4 " +
                         VideoSavePath;
                     break;
             }
@@ -339,12 +420,29 @@ namespace Common.system
             //路径
             string FilePath = (string)FilePathobj;
             string Path = FileToolsCommon.GetDirectoryName(FilePath);
-            string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
+            //扩展名
+            string Extension = FileToolsCommon.GetIOExtension(FilePath);
             //Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
             //foreach (var KillProcess in KillProcessArray)
             //{
             //    KillProcess.Kill();
             //}
+            #region 判断文件是否存在
+            if (Extension.ToUpper() == ".MP3")
+            {
+                if (!FileToolsCommon.IsExistFile(Path + "temp/filelist.d"))
+                {
+                    return;
+                }
+            }
+            else
+            {
+                if (!FileToolsCommon.IsExistFile(Path + "temprs/filelist.d"))
+                {
+                    return;
+                }
+            }
+            #endregion
             myProcess = new Process();
             LogPath = CreateffmpegLog();
             this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
@@ -633,7 +731,7 @@ namespace Common.system
         //录制麦克风的声音
         WaveInEvent waveIn = null; //new WaveInEvent();
         /// <summary>
-        /// 开始录制
+        /// 开始录制麦克风
         /// </summary>
         public bool StartRecordAudio(string audioFile)
         {
@@ -654,6 +752,15 @@ namespace Common.system
                     writer.Dispose();
                     writer = null;
                     waveIn.Dispose();
+                    waveIn = null;
+                    try
+                    {
+                        FileToolsCommon.DeleteFile(audioFile);
+                    }
+                    catch (Exception)
+                    {
+
+                    }
                 };
                 waveIn.StartRecording();
                 return true;
@@ -665,16 +772,69 @@ namespace Common.system
             }
         }
 
-        //结束录制
+        /// <summary>
+        /// 结束录制音频
+        /// </summary>
         public void StopRecordAudio()
         {
             try
             {
-                waveIn.StopRecording();
+                if (waveIn != null)
+                {
+                    waveIn.StopRecording(); 
+                }
+                if (capture != null)
+                {
+                    capture.StopRecording();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【麦克风】麦克风不可用:" + ex.Message, ex);
+            }
+        }
+
+
+        //录制扬声器的声音
+        WasapiLoopbackCapture capture = null; //new WasapiLoopbackCapture();
+
+        /// <summary>
+        /// 开始录制扬声器
+        /// </summary>
+        public bool StartRecordSpeakerAudio(string audioFile)
+        {
+            try
+            {
+                capture = new WasapiLoopbackCapture();
+                //生成音频文件的对象
+                WaveFileWriter writer = new WaveFileWriter(audioFile, capture.WaveFormat);
+                capture.DataAvailable += (s, a) =>
+                {
+                    writer.Write(a.Buffer, 0, a.BytesRecorded);
+                };
+                //结束录音
+                capture.RecordingStopped += (s, a) =>
+                {
+                    writer.Dispose();
+                    writer = null;
+                    capture.Dispose();
+                    capture = null;
+                    try
+                    {
+                        FileToolsCommon.DeleteFile(audioFile);
+                    }
+                    catch (Exception)
+                    {
+
+                    }
+                };
+                capture.StartRecording();
+                return true;
             }
             catch (Exception ex)
             {
                 LogHelper.WriteErrLog("【麦克风】麦克风不可用:" + ex.Message, ex);
+                return false;
             }
         }
     }

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -218,6 +218,49 @@ namespace XHWK.WKTool
             {
                 if (IsFirstRS)
                 {
+                    #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
+
                     VideoInfo = new Model_Video();
                     VideoInfo.VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"));
                     VideoInfo.WkType = Enum_WKVidetype.RecordingScreen;

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1248,6 +1248,10 @@ namespace XHWK.WKTool
         /// 是否开始截图计数
         /// </summary>
         bool IsStartCount = false;
+        /// <summary>
+        /// 是否录制了音频
+        /// </summary>
+        bool IsRecordAudio = false;
         #endregion
         /// <summary>
         /// 录制窗口内容
@@ -1275,6 +1279,7 @@ namespace XHWK.WKTool
             {
                 HideAngleBorder();
             }
+
             //btnStop.IsEnabled = true;//停止录制按钮可点击
             StartRecord();
         }
@@ -1305,6 +1310,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)
                     {
@@ -1438,7 +1486,7 @@ namespace XHWK.WKTool
                     new Thread(new ThreadStart(new Action(() =>
                     {
                         Thread.Sleep(1000);
-                        APP.FFmpeg.StartRecordingAudio(AudioPathName);
+                        IsRecordAudio = APP.FFmpeg.StartRecordingAudio(AudioPathName);
                         Thread.Sleep(1000);
                         Dispatcher.Invoke(() =>
                         {
@@ -1606,22 +1654,30 @@ namespace XHWK.WKTool
                             IsStartCount = false;
                             timer.Stop();
                         });
-                    //}))).Start();
-                    //new Thread(new ThreadStart(new Action(() =>
-                    //{
+                        //}))).Start();
+                        //new Thread(new ThreadStart(new Action(() =>
+                        //{
                         //判断音频是否存在 判断音频临时文件夹是否存在
-                        if (!FileToolsCommon.IsExistFile(AudioPathName))
+                        if (IsRecordAudio)
                         {
-                            Thread.Sleep(100);
+                            if (!FileToolsCommon.IsExistFile(AudioPathName))
+                            {
+                                Thread.Sleep(100);
+                            }
+                            if (FileToolsCommon.IsExistDirectory(FileToolsCommon.GetDirectoryName(AudioPathName) + "temp/"))
+                            {
+                                Thread.Sleep(100);
+                            }
                         }
-                        if (FileToolsCommon.IsExistDirectory(FileToolsCommon.GetDirectoryName(AudioPathName) + "temp/"))
+                        else
                         {
-                            Thread.Sleep(100);
+                            //没有录制音频
+                            AudioPathName = null;
                         }
                         APP.FFmpeg.SynthesisVideo(ImgPath, AudioPathName, VideoSavePathName, 5, gridActWidth, gridActHeight);
-                    //}))).Start();
-                    //new Thread(new ThreadStart(new Action(() =>
-                    //{
+                        //}))).Start();
+                        //new Thread(new ThreadStart(new Action(() =>
+                        //{
                         while (!FileToolsCommon.IsExistFile(VideoSavePathName))
                         {
                             Thread.Sleep(100);
@@ -3328,9 +3384,22 @@ namespace XHWK.WKTool
         {
             try
             {
-            Thumb thu = (Thumb)sender;
-            Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
-            Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                Thumb thu = (Thumb)sender;
+                #region 判断是否超出 暂无
+                double plul = Canvas.GetLeft(RectLeftUp);
+                double plut = Canvas.GetTop(RectLeftUp);
+                double prdl = Canvas.GetLeft(RectRightDown);
+                double prdt = Canvas.GetTop(RectRightDown);
+                if (prdl - plul > 50)
+                {
+                }
+                if (prdt - plut > 50)
+                {
+                }
+                #endregion
+                
+                    Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+                    Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
                 switch (thu.Name)
                 {
                     case "RectLeftUp":