zhao：修改存储

Common/system/FFMpeg.cs

@@ -235,86 +235,88 @@ namespace Common.system
         /// <param name="VideoHeight">视频高度</param>
         public void SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight)
         {
-            new Thread(new ThreadStart(new Action(() =>
+            //new Thread(new ThreadStart(new Action(() =>
+            //{
+
+            //}))).Start();
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
+            string Extension = FileToolsCommon.GetIOExtension(VideoSavePath);//扩展名
+            Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
+            //Debug.WriteLine(KillProcessArray.Length.ToString());
+            foreach (var KillProcess in KillProcessArray)
+            {
+                KillProcess.Kill();
+            }
+            myProcess = new Process();
+            LogPath = CreateffmpegLog();
+            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 " +
+                        VideoSavePath;
+                    break;
+                case "AVI":
+                    myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
+                        ImageListPath + @"%d.png -i " +
+                        Mp3Path + @" -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 " +
+                        VideoSavePath;
+                    break;
+                default:
+                    myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
+                        ImageListPath + @"%d.png -i " +
+                        Mp3Path + @" -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)
             {
-                Thread.Sleep(500);
-                while (myProcess != null)
+                IsRunning = false;
+                Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
+                foreach (var KillProcess in ProcessArray)
                 {
+                    IsRunning = true;
                     Thread.Sleep(100);
                 }
-                string Extension = FileToolsCommon.GetIOExtension(VideoSavePath);//扩展名
-                Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-                //Debug.WriteLine(KillProcessArray.Length.ToString());
-                foreach (var KillProcess in KillProcessArray)
-                {
-                    KillProcess.Kill();
-                }
-                myProcess = new Process();
-                LogPath = CreateffmpegLog();
-                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 " +
-                            VideoSavePath;
-                        break;
-                    case "AVI":
-                        myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
-                            ImageListPath + @"%d.png -i " +
-                            Mp3Path + @" -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 " +
-                            VideoSavePath;
-                        break;
-                    default:
-                        myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
-                            ImageListPath + @"%d.png -i " +
-                            Mp3Path + @" -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)
-                    {
-                        IsRunning = true;
-                        Thread.Sleep(100);
-                    }
-                }
-                #endregion
-                myProcess = null;
-                //生成视频后删除图片和音频保存列表
-                //FileToolsCommon.DeleteDirectory(ImageListPath);
-                //FileToolsCommon.DeleteDirectory(FileToolsCommon.GetDirectoryName(Mp3Path));
-                FileToolsCommon.DeleteDirectory(FileToolsCommon.GetDirectoryName(VideoSavePath) + "temp");
+            }
+            #endregion
+            myProcess = null;
+            //生成视频后删除图片和音频保存列表
+            //FileToolsCommon.DeleteDirectory(ImageListPath);
+            //FileToolsCommon.DeleteDirectory(FileToolsCommon.GetDirectoryName(Mp3Path));
 
-                //Dispatcher.Invoke(() =>
-                //{
-                //});
-                //// 允许不同线程间的调用
-                //Control.CheckForIllegalCrossThreadCalls = false;
-            }))).Start();
+            Thread.Sleep(100);
+            FileToolsCommon.DeleteDirectory(FileToolsCommon.GetDirectoryName(VideoSavePath) + "temp");
+
+            //Dispatcher.Invoke(() =>
+            //{
+            //});
+            //// 允许不同线程间的调用
+            //Control.CheckForIllegalCrossThreadCalls = false;
         }
 
         /// <summary>
@@ -338,11 +340,11 @@ namespace Common.system
             string FilePath = (string)FilePathobj;
             string Path = FileToolsCommon.GetDirectoryName(FilePath);
             string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
-            Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            foreach (var KillProcess in KillProcessArray)
-            {
-                KillProcess.Kill();
-            }
+            //Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
+            //foreach (var KillProcess in KillProcessArray)
+            //{
+            //    KillProcess.Kill();
+            //}
             myProcess = new Process();
             LogPath = CreateffmpegLog();
             this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
@@ -381,7 +383,9 @@ namespace Common.system
             #endregion
             myProcess = null;
             if (Extension.ToUpper() == ".MP3")
+            {
                 FileToolsCommon.DeleteDirectory(Path + "temp/");
+            }
             else
                 FileToolsCommon.DeleteDirectory(Path + "temprs/");
         }

XHWK.WKTool/App.cs

@@ -289,6 +289,8 @@ namespace XHWK.WKTool
                     if (WKDataList.Exists(x => x.WkPath == WkPath))
                     {
                         WKData = WKDataList.Find(x => x.WkPath == WkPath);
+                        VideoList = new List<Model_Video>();
+                        VideoList = WKData.VideoList;
                     }
                 }
             }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -188,7 +188,7 @@ namespace XHWK.WKTool
                         if (I > 10010)
                         {
                             long time = Timestamp();
-                        string imgPath= FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
+                            string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
                             //string FilePathName = ImgPath + RsImgName.Count + ".png";
                             string path = CameraHelper.CaptureImage(imgPath, time.ToString());
                             if (!string.IsNullOrWhiteSpace(path))
@@ -335,7 +335,7 @@ namespace XHWK.WKTool
                     TxbRecordScreenWord.Text = "录屏";
                 });
             }))).Start();
-           
+
         }
 
         /// <summary>
@@ -350,7 +350,7 @@ namespace XHWK.WKTool
                 Login();
                 return;
             }
-            if(APP.fileDirectoryWindow==null)
+            if (APP.fileDirectoryWindow == null)
             {
                 APP.fileDirectoryWindow = new FileDirectoryWindow();
                 //APP.fileDirectoryWindow.Topmost = true;
@@ -715,7 +715,7 @@ namespace XHWK.WKTool
             {
                 if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
                 {
-                    if(APP.pageData.currpage==0)
+                    if (APP.pageData.currpage == 0)
                     {
                         APP.pageData.pagenum += 1;
                         APP.pageData.currpage = APP.pageData.pagenum;
@@ -928,21 +928,21 @@ namespace XHWK.WKTool
                             string paths = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
                             string[] page = ConvertWordToImage(filepath, paths, "", 0, 0, null, 0).ToArray();
                             int num = 0;
-                            for (int i = 0+ APP.pageData.pagenum; i < page.Length+ APP.pageData.pagenum; i++)//给画板模型加图片路径
+                            for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
                             {
-                                if (APP.PageDrawList!=null&&APP.PageDrawList.Count > i)
+                                if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
                                 {
-                                    APP.PageDrawList[i].PageImagePath = page[i- APP.pageData.pagenum]; //zxycs
-                                    APP.PageDrawList[i].PdfImagePath = page[i- APP.pageData.pagenum];
+                                    APP.PageDrawList[i].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
+                                    APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
                                     APP.PageDrawList[i].PageNum = i + 1;
                                     APP.PageDrawList[i].ImgDocumentation = true;
                                 }
                                 else
                                 {
-                                  
+
                                     Model_DrawData model_DrawData = new Model_DrawData();
-                                    model_DrawData.PageImagePath = page[i- APP.pageData.pagenum];
-                                    model_DrawData.PdfImagePath = page[i- APP.pageData.pagenum];
+                                    model_DrawData.PageImagePath = page[i - APP.pageData.pagenum];
+                                    model_DrawData.PdfImagePath = page[i - APP.pageData.pagenum];
                                     model_DrawData.PageNum = i + 1;
                                     model_DrawData.ImgDocumentation = true;
                                     APP.PageDrawList.Add(model_DrawData);
@@ -953,12 +953,12 @@ namespace XHWK.WKTool
                                 APP.SaveDraw();
                                 num++;
                             }
-                            if(num>0)
+                            if (num > 0)
                             {
                                 APP.pageData.currpage = APP.pageData.pagenum + 1;
                                 APP.pageData.pagenum += num;
                             }
-                            if (APP.pageData.currpage>0 && APP.pageData.currpage < APP.PageDrawList.Count)
+                            if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
                                 imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                                 imgCanvas.Source = null;
@@ -1039,7 +1039,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnRecord_Click(object sender, RoutedEventArgs e)
         {
-            if(APP.pageData.currpage > 0)
+            if (APP.pageData.currpage > 0)
             {
                 blackboard_canvas.Visibility = Visibility.Visible;
             }
@@ -1306,7 +1306,7 @@ namespace XHWK.WKTool
                 ImgSetUpTwo.Visibility = Visibility.Collapsed;
                 btnSetUp.IsEnabled = true;
 
-                btnLoginType.IsEnabled = true; 
+                btnLoginType.IsEnabled = true;
                 #endregion
 
                 IsSuspendR = true;
@@ -1326,9 +1326,17 @@ namespace XHWK.WKTool
                 #endregion
                 try
                 {
+                    //缩略图
+                    string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
+                    FileToolsCommon.CreateDirectory(ThumbnailPath);
+                    //缩略图存储位置
+                    string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileNameNoExtension(VideoSavePathName) + ".JPG";
+                    int gridActWidth = (int)GridMain.ActualWidth;
+                    int gridActHeight = (int)GridMain.ActualHeight;
                     APP.FFmpeg.StopFFmpeg(AudioPathName);
                     new Thread(new ThreadStart(new Action(() =>
                     {
+                        //停止截图
                         while (APP.FFmpeg.myProcess != null)
                         {
                             Thread.Sleep(100);
@@ -1338,23 +1346,22 @@ namespace XHWK.WKTool
                             IsStartCount = false;
                             timer.Stop();
                         });
-                    }))).Start();
-
-                    new Thread(new ThreadStart(new Action(() =>
-                    {
-                        while (APP.FFmpeg.myProcess != null)
+                    //}))).Start();
+                    //new Thread(new ThreadStart(new Action(() =>
+                    //{
+                        //判断音频是否存在 判断音频临时文件夹是否存在
+                        if (!FileToolsCommon.IsExistFile(AudioPathName))
                         {
                             Thread.Sleep(100);
                         }
-                    }))).Start();
-                    APP.FFmpeg.SynthesisVideo(ImgPath, AudioPathName, VideoSavePathName, 5, (int)GridMain.Width, (int)GridMain.Height);
-                    //生成缩略图
-                    string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
-                    FileToolsCommon.CreateDirectory(ThumbnailPath);
-                    //缩略图存储位置
-                    string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileNameNoExtension(VideoSavePathName) + ".JPG";
-                    new Thread(new ThreadStart(new Action(() =>
-                    {
+                        if (FileToolsCommon.IsExistDirectory(FileToolsCommon.GetDirectoryName(AudioPathName) + "temp/"))
+                        {
+                            Thread.Sleep(100);
+                        }
+                        APP.FFmpeg.SynthesisVideo(ImgPath, AudioPathName, VideoSavePathName, 5, gridActWidth, gridActHeight);
+                    //}))).Start();
+                    //new Thread(new ThreadStart(new Action(() =>
+                    //{
                         while (!FileToolsCommon.IsExistFile(VideoSavePathName))
                         {
                             Thread.Sleep(100);
@@ -1402,36 +1409,36 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnAdd_Click(object sender, RoutedEventArgs e)
         {
-      //      RectangleF rectangleF = new RectangleF();
-      //      rectangleF.Width = (float)APP.PageDrawList[0].ImageSizes.CenterX;
-      //      rectangleF.Height = (float)APP.PageDrawList[0].ImageSizes.CenterY;
-      //      rectangleF.X= (float)APP.PageDrawList[0].ImageLocation.X;
-      //      rectangleF.Y = (float)APP.PageDrawList[0].ImageLocation.Y;
+            //      RectangleF rectangleF = new RectangleF();
+            //      rectangleF.Width = (float)APP.PageDrawList[0].ImageSizes.CenterX;
+            //      rectangleF.Height = (float)APP.PageDrawList[0].ImageSizes.CenterY;
+            //      rectangleF.X= (float)APP.PageDrawList[0].ImageLocation.X;
+            //      rectangleF.Y = (float)APP.PageDrawList[0].ImageLocation.Y;
 
-      //      //CESHI 
-      //bool isImg=    MergerImg(APP.PageDrawList[0].PageImagePath, @"G:\102H.jpg", rectangleF, out string errmsg);
+            //      //CESHI 
+            //bool isImg=    MergerImg(APP.PageDrawList[0].PageImagePath, @"G:\102H.jpg", rectangleF, out string errmsg);
 
 
 
-                if (APP.pageData.currpage>0)
-                {
-                    APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
-                }
-                if(IsStartCount&& blackboard_canvas.Visibility == Visibility.Collapsed)
-                {
-                    blackboard_canvas.Visibility = Visibility.Visible;
-                }
-                APP.pageData.pagenum += 1;
-                APP.pageData.currpage = APP.pageData.pagenum;
-                myblackboard.changepage(APP.pageData.currpage - 1);
-                ///清空页面图片UI
-                imgCanvas.Source = null;
+            if (APP.pageData.currpage > 0)
+            {
+                APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
+            }
+            if (IsStartCount && blackboard_canvas.Visibility == Visibility.Collapsed)
+            {
+                blackboard_canvas.Visibility = Visibility.Visible;
+            }
+            APP.pageData.pagenum += 1;
+            APP.pageData.currpage = APP.pageData.pagenum;
+            myblackboard.changepage(APP.pageData.currpage - 1);
+            ///清空页面图片UI
+            imgCanvas.Source = null;
             imgDocumentation.Source = null;
-                ///画板模型增加一页
-                Model_DrawData model_DrawData = new Model_DrawData();
-                model_DrawData.PageNum = APP.pageData.currpage;
-                APP.PageDrawList.Add(model_DrawData);
-                APP.SaveDraw();
+            ///画板模型增加一页
+            Model_DrawData model_DrawData = new Model_DrawData();
+            model_DrawData.PageNum = APP.pageData.currpage;
+            APP.PageDrawList.Add(model_DrawData);
+            APP.SaveDraw();
             ///截图可用
             ImgScreenshot.Visibility = Visibility.Visible;
             ImgScreenshotTwo.Visibility = Visibility.Collapsed;
@@ -1450,7 +1457,7 @@ namespace XHWK.WKTool
 
 
 
-                    iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
+                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
                 //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
                 ////设置纸张横向
                 //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
@@ -1473,7 +1480,7 @@ namespace XHWK.WKTool
                     {
 
                     }
-                    else if(APP.PageDrawList[i].ImgDocumentation==true)
+                    else if (APP.PageDrawList[i].ImgDocumentation == true)
                     {
                         image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
                     }
@@ -1488,7 +1495,7 @@ namespace XHWK.WKTool
 
                         string msg = string.Empty;
                         bool isImg = MergerImg(APP.PageDrawList[i].PageImagePath, filePathOutPut, rectangleF, out msg);
-                        if(isImg)
+                        if (isImg)
                         {
                             image = iTextSharp.text.Image.GetInstance(filePathOutPut);
                         }
@@ -1498,7 +1505,7 @@ namespace XHWK.WKTool
                         }
                     }
 
-                   
+
 
 
                     if (image.Height > iTextSharp.text.PageSize.A4.Height - 25)
@@ -1526,7 +1533,7 @@ namespace XHWK.WKTool
             }
 
 
-         
+
 
 
 
@@ -1697,7 +1704,7 @@ namespace XHWK.WKTool
                     }
                     if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
                     {
-                        if(APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
+                        if (APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
                         {
                             imgCanvas.Source = null;
                             imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
@@ -1751,45 +1758,45 @@ namespace XHWK.WKTool
         /// <param name="_rectangle">图片位置</param>
         /// <param name="errmsg">错误消息</param>
         /// <returns></returns>
-        private bool MergerImg(string _path,string _saveimg,RectangleF _rectangle, out string errmsg)
+        private bool MergerImg(string _path, string _saveimg, RectangleF _rectangle, out string errmsg)
         {
             errmsg = null;
             try
             {
                 Bitmap bitmap = null;
 
-                 //创建要显示的图片对象,根据参数的个数设置宽度
-                 Bitmap backgroudImg = new Bitmap((int)gridM.ActualWidth, (int)gridM.ActualHeight);
+                //创建要显示的图片对象,根据参数的个数设置宽度
+                Bitmap backgroudImg = new Bitmap((int)gridM.ActualWidth, (int)gridM.ActualHeight);
                 Graphics g = Graphics.FromImage(backgroudImg);
                 //清除画布,背景设置为白色
                 g.Clear(System.Drawing.Color.White);
 
-                if(!string.IsNullOrWhiteSpace(_path))
+                if (!string.IsNullOrWhiteSpace(_path))
                 {
-                     bitmap = ImageHelper.ReadBitmapFile(_path);
+                    bitmap = ImageHelper.ReadBitmapFile(_path);
                     g.DrawImage(bitmap, _rectangle);
                 }
 
 
                 backgroudImg.Save(_saveimg);
-               
+
                 g.Dispose();
                 backgroudImg.Dispose();
-                if(bitmap!=null)
+                if (bitmap != null)
                 {
                     bitmap.Dispose();
                 }
-              
+
                 GC.Collect();
                 return true;
             }
             catch (Exception ex)
             {
                 errmsg = ex.Message;
-                LogHelper.WriteErrLog("【截图合成】（MergerImg）图片合成失败：" + ex.Message,ex);
+                LogHelper.WriteErrLog("【截图合成】（MergerImg）图片合成失败：" + ex.Message, ex);
                 return false;
             }
-        
+
         }
         /// <summary>
         /// 将Word文档转换为图片的方法（该方法基于第三方DLL），你可以像这样调用该方法： ConvertPDF2Image("F:\\PdfFile.doc", "F:\\",
@@ -2388,7 +2395,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnShrink_Click(object sender, RoutedEventArgs e)
         {
-            if(this.WindowState == WindowState.Minimized)
+            if (this.WindowState == WindowState.Minimized)
             {
                 this.WindowState = WindowState.Normal;
             }
@@ -2402,7 +2409,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void BtnOk_Click(object sender, RoutedEventArgs e) 
+        private void BtnOk_Click(object sender, RoutedEventArgs e)
         {
             //APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
             //btnOk.Visibility = Visibility.Collapsed;