zhao：1增加视频转码 2修改录屏倒计时 3修改缩略图名

Common/system/BlackboardNew.cs

@@ -319,7 +319,23 @@ namespace Common.system
                 if (stroke != null && stroke.StylusPoints.Count > 1)
                 {
                     isFirst = true;
-                    strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
+                    try
+                    {
+                        strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
+                    }
+                    catch (Exception ex)
+                    {
+                        if (strokes_page_all != null)
+                        {
+                            if (strokes_page_all.Count == 0)
+                            {
+                                ZBBPage pagetemp = new ZBBPage();
+                                pagetemp.lines.Add(new ZBBPageStep());
+                                strokes_page_all.Add(pagetemp);
+                            }
+                        }
+                        LogHelper.WriteErrLog("【画板】（changepages）添加失败，strokes_page_all为0，" + ex.Message, ex);
+                    }
                 }
                 stylusPoints = new StylusPointCollection();
                 stylusPoint = new StylusPoint();

Common/system/FFMpeg.cs

@@ -65,7 +65,7 @@ namespace Common.system
             {
 
             }
-            if(StartRecordSpeakerAudio(audioSpeakerPath))
+            if (StartRecordSpeakerAudio(audioSpeakerPath))
             {
                 IsRecordSpeaker = true;
             }
@@ -94,7 +94,7 @@ namespace Common.system
             {
                 SpeakerStr = "-f dshow -i audio=\"virtual-audio-capturer\" ";
             }
-            if(IsRecordMicrophone)
+            if (IsRecordMicrophone)
             {
                 MicrophoneName = GetMicrophone();
                 if (!string.IsNullOrWhiteSpace(MicrophoneName))
@@ -118,7 +118,7 @@ namespace Common.system
                     break;
                 case ".AVI":
                 case ".FLV":
-                    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;
+                    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的参数
@@ -204,16 +204,16 @@ namespace Common.system
             myProcess = new Process();
             LogPath = CreateffmpegLog();
             this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
-            if(IsRecordSpeaker && IsRecordMicrophone)
+            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)
+            else if (IsRecordSpeaker)
             {
                 myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" " + PathName;
             }
-            else if(IsRecordMicrophone)
+            else if (IsRecordMicrophone)
             {
                 //录制麦克风
                 if (!string.IsNullOrWhiteSpace(MicrophoneName))
@@ -304,7 +304,7 @@ namespace Common.system
         /// <param name="Frequency">每秒帧率</param>
         /// <param name="VideoWidth">视频宽度</param>
         /// <param name="VideoHeight">视频高度</param>
-        public void SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight)
+        public bool SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight)
         {
             //new Thread(new ThreadStart(new Action(() =>
             //{
@@ -322,77 +322,86 @@ namespace Common.system
                 KillProcess.Kill();
             }
             myProcess = new Process();
-            LogPath = CreateffmpegLog();
-            string mp3Str = "";
-            #region 判断音频是否存在
-            if (!string.IsNullOrWhiteSpace(Mp3Path))
+            try
             {
-                if (FileToolsCommon.IsExistFile(Mp3Path))
+
+                LogPath = CreateffmpegLog();
+                string mp3Str = "";
+                #region 判断音频是否存在
+                if (!string.IsNullOrWhiteSpace(Mp3Path))
                 {
-                    mp3Str = "-i " + 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 " +
-                        mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -vcodec mpeg4 " +
-                        VideoSavePath;
-                    break;
-                case ".AVI":
-                    myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
-                        ImageListPath + @"%d.png " +
-                        mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -f AVI " +
-                        VideoSavePath;
-                    break;
-                case ".FLV":
-                    myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
-                        ImageListPath + @"%d.png " +
-                        mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -f FLV " +
-                        VideoSavePath;
-                    break;
-                default:
-                    myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
-                        ImageListPath + @"%d.png " +
-                        mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -vcodec mpeg4 " +
-                        VideoSavePath;
-                    break;
-            }
-            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 (var KillProcess in ProcessArray)
+                #endregion
+                this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+                switch (Extension.ToUpper())
                 {
-                    IsRunning = true;
-                    Thread.Sleep(100);
+                    case ".MP4":
+                        myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
+                            ImageListPath + @"%d.png " +
+                            mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -vcodec mpeg4 " +
+                            VideoSavePath;
+                        break;
+                    case ".AVI":
+                        myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
+                            ImageListPath + @"%d.png " +
+                            mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -f AVI " +
+                            VideoSavePath;
+                        break;
+                    case ".FLV":
+                        myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
+                            ImageListPath + @"%d.png " +
+                            mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -f FLV " +
+                            VideoSavePath;
+                        break;
+                    default:
+                        myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
+                            ImageListPath + @"%d.png " +
+                            mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -vcodec mpeg4 " +
+                            VideoSavePath;
+                        break;
                 }
-            }
-            #endregion
-            myProcess = null;
-            //生成视频后删除图片和音频保存列表
-            //FileToolsCommon.DeleteDirectory(ImageListPath);
-            //FileToolsCommon.DeleteDirectory(FileToolsCommon.GetDirectoryName(Mp3Path));
-
-            Thread.Sleep(100);
-            FileToolsCommon.DeleteDirectory(FileToolsCommon.GetDirectoryName(VideoSavePath) + "temp");
+                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 (var KillProcess in ProcessArray)
+                    {
+                        IsRunning = true;
+                        Thread.Sleep(100);
+                    }
+                }
+                #endregion
+                myProcess = null;
+                //生成视频后删除图片和音频保存列表
+                //FileToolsCommon.DeleteDirectory(ImageListPath);
+                //FileToolsCommon.DeleteDirectory(FileToolsCommon.GetDirectoryName(Mp3Path));
 
+                Thread.Sleep(100);
+                FileToolsCommon.DeleteDirectory(FileToolsCommon.GetDirectoryName(VideoSavePath) + "temp");
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【视频合成】（SynthesisVideo）视频生成失败，" + ex.Message, ex);
+                return false;
+            }
             //Dispatcher.Invoke(() =>
             //{
             //});
@@ -552,7 +561,7 @@ namespace Common.system
         /// </summary>
         /// <param name="VideoPath">视频地址</param>
         /// <param name="ImagePath">图片地址</param>
-        public void GenerateThumbnails(string VideoPath, string ImagePath)
+        public bool GenerateThumbnails(string VideoPath, string ImagePath)
         {
             while (myProcess != null)
             {
@@ -563,36 +572,105 @@ namespace Common.system
             {
                 KillProcess.Kill();
             }
-            myProcess = new Process();
-            LogPath = CreateffmpegLog();
-            this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //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 -f image2 \"" + ImagePath + "\"";
-            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)
+            try
             {
-                IsRunning = false;
-                Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
-                foreach (var KillProcess in ProcessArray)
+                myProcess = new Process();
+                LogPath = CreateffmpegLog();
+                this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //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 -f image2 \"" + ImagePath + "\"";
+                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 = true;
-                    Thread.Sleep(100);
+                    IsRunning = false;
+                    Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
+                    foreach (var KillProcess in ProcessArray)
+                    {
+                        IsRunning = true;
+                        Thread.Sleep(100);
+                    }
                 }
+                #endregion
+                myProcess = null;
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【生成缩略图】（GenerateThumbnails）缩略图生成失败，" + ex.Message, ex);
+                return false;
+            }
+        }
+        /// <summary>
+        /// 视频转码
+        /// </summary>
+        /// <param name="VideoPathName">源视频</param>
+        /// <param name="VideoSavePathName">目标视频存储路径</param>
+        /// <param name="Width">宽</param>
+        /// <param name="Height">高</param>
+        /// <returns></returns>
+        public bool VideoTranscode(string VideoPathName,string VideoSavePathName,int Width,int Height)
+        {
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
+            Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
+            foreach (var KillProcess in KillProcessArray)
+            {
+                KillProcess.Kill();
+            }
+            try
+            {
+                myProcess = new Process();
+                LogPath = CreateffmpegLog();
+                this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+                myProcess.StartInfo.Arguments = "-i "+ VideoPathName + " -acodec copy -vcodec libx264 -s "+ Width + "*"+ Height + " "+ VideoSavePathName;
+                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 (var 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;
             }
-            #endregion
-            myProcess = null;
         }
 
         /// <summary>
@@ -781,7 +859,7 @@ namespace Common.system
             {
                 if (waveIn != null)
                 {
-                    waveIn.StopRecording(); 
+                    waveIn.StopRecording();
                 }
                 if (capture != null)
                 {

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -455,6 +455,11 @@ namespace XHWK.WKTool
             string filePathName = model_Video.VideoPath;
             string filePath = FileToolsCommon.GetDirectoryName(filePathName);
             string newFilePathName = filePath + NewName;
+            //缩略图
+            string ThumbnailPath = filePath + "ThumbnailPath/";
+            FileToolsCommon.CreateDirectory(ThumbnailPath);
+            //缩略图存储位置
+            string ThumbnailPathName = ThumbnailPath + NewName.Replace(".", "") + ".JPG";
             if (FileToolsCommon.IsExistFile(newFilePathName))
             {
                 Errmessage = "文件已存在，请重新修改文件名！";
@@ -462,8 +467,13 @@ namespace XHWK.WKTool
             }
             else
             {
+                //修改文件名
                 FileToolsCommon.Copy(filePathName, newFilePathName);
                 model_Video.VideoPath = newFilePathName;
+                //修改缩略图名
+                FileToolsCommon.DeleteFile(ThumbnailPathName);
+                FileToolsCommon.Copy(model_Video.ThumbnailPath, ThumbnailPathName);
+                model_Video.ThumbnailPath = ThumbnailPathName;
                 APP.SaveWkData();
                 return true;
             }

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -299,6 +299,19 @@ namespace XHWK.WKTool
                     SetUpVideoPathName();
                     IsFirstRS = false;
                     k_hook.Start();//安装键盘钩子
+
+                    if (APP.W_CountdownWindow == null)
+                    {
+                        APP.W_CountdownWindow = new CountdownWindow();
+                        APP.W_CountdownWindow.Initialize(true, 1800);
+                        //APP.W_CountdownWindow.Topmost = true;
+                    }
+                    else
+                    {
+                        APP.W_CountdownWindow.Initialize(true, 1800);
+                        //APP.W_CountdownWindow.Topmost = true;
+                    }
+                    APP.W_CountdownWindow.Show();
                 }
                 IsSuspend = false;
 
@@ -329,24 +342,15 @@ namespace XHWK.WKTool
                 txbTime.Visibility = Visibility.Visible;//时间显示
                 try
                 {
-                    if (APP.W_CountdownWindow == null)
-                    {
-                        APP.W_CountdownWindow = new CountdownWindow();
-                        APP.W_CountdownWindow.Initialize(true, 1800);
-                        //APP.W_CountdownWindow.Topmost = true;
-                    }
-                    else
-                    {
-                        APP.W_CountdownWindow.Initialize(true, 1800);
-                        //APP.W_CountdownWindow.Topmost = true;
-                    }
-                    APP.W_CountdownWindow.Show();
                     new Thread(new ThreadStart(new Action(() =>
                     {
-                        Thread.Sleep(1000);
+                        if (IsFirstRS)
+                        {
+                            Thread.Sleep(1500);
+                        }
                         APP.FFmpeg.StartRecordingVideo(VideoSavePathName);
 
-                        Thread.Sleep(1800);
+                        Thread.Sleep(1000);
                         Dispatcher.Invoke(() =>
                         {
                             Stack();
@@ -438,7 +442,7 @@ namespace XHWK.WKTool
                     string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
                     FileToolsCommon.CreateDirectory(ThumbnailPath);
                     //缩略图存储位置
-                    string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileNameNoExtension(VideoSavePathName) + ".JPG";
+                    string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".","") + ".JPG";
                     new Thread(new ThreadStart(new Action(() =>
                     {
                         while (!FileToolsCommon.IsExistFile(VideoSavePathName))

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1613,6 +1613,45 @@ namespace XHWK.WKTool
                 APP.myloading.Hide();
             }
         }
+
+        /// <summary>
+        /// 修改文件名
+        /// </summary>
+        /// <param name="Guid">唯一编号</param>
+        /// <param name="NewName">新文件名带后缀 不带路径</param>
+        /// <param name="Errmessage">错误信息</param>
+        /// <returns></returns>
+        bool ModifyPathName(string FileGuid, string NewName, out string Errmessage)
+        {
+            Errmessage = "";
+            Model_Video model_Video = APP.VideoList.Find(x => x.FileGuid == FileGuid);
+            string filePathName = model_Video.VideoPath;
+            string filePath = FileToolsCommon.GetDirectoryName(filePathName);
+            string newFilePathName = filePath + NewName;
+            //缩略图
+            string ThumbnailPath = filePath + "ThumbnailPath/";
+            FileToolsCommon.CreateDirectory(ThumbnailPath);
+            //缩略图存储位置
+            string ThumbnailPathName = ThumbnailPath + NewName.Replace(".", "") + ".JPG";
+            if (FileToolsCommon.IsExistFile(newFilePathName))
+            {
+                Errmessage = "文件已存在，请重新修改文件名！";
+                return false;
+            }
+            else
+            {
+                //修改文件名
+                FileToolsCommon.Copy(filePathName, newFilePathName);
+                model_Video.VideoPath = newFilePathName;
+                //修改缩略图名
+                FileToolsCommon.DeleteFile(ThumbnailPathName);
+                FileToolsCommon.Copy(model_Video.ThumbnailPath, ThumbnailPathName);
+                model_Video.ThumbnailPath = ThumbnailPathName;
+                APP.SaveWkData();
+                return true;
+            }
+        }
+
         #endregion
 
         #region 录制窗口
@@ -1634,6 +1673,10 @@ namespace XHWK.WKTool
         /// </summary>
         string VideoSavePathName;
         /// <summary>
+        /// 视频合成路径名
+        /// </summary>
+        string VideoSynthesisPathName;
+        /// <summary>
         /// 暂停录制
         /// </summary>
         bool IsSuspendR = true;
@@ -1723,7 +1766,8 @@ namespace XHWK.WKTool
         /// </summary>
         private void W_ScreenRecordingToolbarWindow_Click_stopRecordingScreen()
         {
-            TxbRecordScreenWord.Text = "保存中";//
+            txbType.Visibility = Visibility.Visible;
+            txbType.Text = "保存中";
             btnScreenRecording.IsEnabled = false;
 
             new Thread(new ThreadStart(new Action(() =>
@@ -1735,7 +1779,8 @@ namespace XHWK.WKTool
                 Dispatcher.Invoke(() =>
                 {
                     btnScreenRecording.IsEnabled = true;
-                    TxbRecordScreenWord.Text = "录屏";
+                    txbType.Visibility = Visibility.Hidden;
+                    //TxbRecordScreenWord.Text = "录屏";
                 });
             }))).Start();
 
@@ -1867,10 +1912,12 @@ namespace XHWK.WKTool
                     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++;
                     }
 
@@ -2159,7 +2206,7 @@ namespace XHWK.WKTool
                     string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
                     FileToolsCommon.CreateDirectory(ThumbnailPath);
                     //缩略图存储位置
-                    string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileNameNoExtension(VideoSavePathName) + ".JPG";
+                    string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".", "") + ".JPG";
                     int gridActWidth = (int)GridMain.ActualWidth;
                     int gridActHeight = (int)GridMain.ActualHeight;
                     APP.FFmpeg.StopFFmpeg(AudioPathName);
@@ -2174,6 +2221,9 @@ namespace XHWK.WKTool
                         {
                             IsStartCount = false;
                             timer.Stop();
+                            End();
+                            txbTime.Text = "";
+                            txbTime.Visibility = Visibility.Hidden;
                         });
                         //}))).Start();
                         //new Thread(new ThreadStart(new Action(() =>
@@ -2195,35 +2245,54 @@ namespace XHWK.WKTool
                             //没有录制音频
                             AudioPathName = null;
                         }
-                        APP.FFmpeg.SynthesisVideo(ImgPath, AudioPathName, VideoSavePathName, 5, gridActWidth, gridActHeight);
+                        //合成视频
+                        bool SynRes= APP.FFmpeg.SynthesisVideo(ImgPath, AudioPathName, VideoSynthesisPathName, 5, gridActWidth, gridActHeight);
                         //}))).Start();
                         //new Thread(new ThreadStart(new Action(() =>
                         //{
-                        while (!FileToolsCommon.IsExistFile(VideoSavePathName))
+                        if(!SynRes)
                         {
-                            Thread.Sleep(100);
+                            Dispatcher.Invoke(() =>
+                            {
+                                MessageWindow.Show("视频录制失败，无法保存此视频！");
+                                BtnRecord.IsEnabled = true;
+                                btnStop.IsEnabled = true;
+                                TxbRecordingWord.Text = "录制";
+                                txbType.Text = "";
+                            });
+                            return;
                         }
-                        while (FileToolsCommon.IsExistDirectory(FileToolsCommon.GetDirectoryName(VideoSavePathName) + "temp/"))
+                        Dispatcher.Invoke(() =>
+                        {
+                            txbType.Text = "转码中";
+                        });
+                        while (!FileToolsCommon.IsExistFile(VideoSynthesisPathName))
                         {
                             Thread.Sleep(100);
                         }
-                        Dispatcher.Invoke(() =>
+                        while (FileToolsCommon.IsExistDirectory(FileToolsCommon.GetDirectoryName(VideoSynthesisPathName) + "temp/"))
                         {
-                            BtnRecord.IsEnabled = true;
-                            btnStop.IsEnabled = true;
-                            TxbRecordingWord.Text = "录制";
-                            End();
-                            txbTime.Text = "";
-                            txbTime.Visibility = Visibility.Hidden;
-                            txbType.Text = "";
-                        });
+                            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;
-                        APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
+                        //生成缩略图
+                        bool ThuRes = APP.FFmpeg.GenerateThumbnails(VideoSynthesisPathName, ThumbnailPathName);
+                        Thread.Sleep(500);
+                        int imgW = (int)GridMain.ActualWidth + (GridMain.ActualWidth % 2 > 0 ? 1 : 0);
+                        int imgH = (int)GridMain.ActualHeight + (GridMain.ActualHeight % 2 > 0 ? 1 : 0);
+                        if (ThuRes)
+                        {
+                            Bitmap bmp = ImageHelper.ReadBitmapFile(ThumbnailPathName);
+                            imgW = (int)bmp.Width + (bmp.Width % 2 > 0 ? 1 : 0);
+                            imgH = (int)bmp.Height + (bmp.Height % 2 > 0 ? 1 : 0);
+                        }
+
+                        APP.FFmpeg.VideoTranscode(VideoSynthesisPathName, VideoSavePathName, imgW, imgH);
                         VideoInfo.FileGuid = Guid.NewGuid().ToString();
                         VideoInfo.IsUpload = false;
                         VideoInfo.Uploaded = 0;
@@ -2232,6 +2301,13 @@ namespace XHWK.WKTool
                         //保存数据
                         APP.SaveWkData();
                         IsFirstR = true;
+                        Dispatcher.Invoke(() =>
+                        {
+                            BtnRecord.IsEnabled = true;
+                            btnStop.IsEnabled = true;
+                            TxbRecordingWord.Text = "录制";
+                            txbType.Text = "";
+                        });
                     }))).Start();
                     //List<Model_Video> VideoList
                 }