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

Common/system/FFMpeg.cs

@@ -17,7 +17,7 @@ namespace Common.system
     /// </summary>
     public class FFMpeg
     {
-        Process myProcess = null;
+        public Process myProcess = null;
         /// <summary>
         /// ffmpeg输出日志文件地址  每个文件2MB左右
         /// </summary>
@@ -28,13 +28,16 @@ namespace Common.system
         /// <param name="FilePath">文件存储路径</param>
         public void StartRecordingVideo(string FilePath)
         {
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
             //路径
-            string Path = FileToolsCommon.GetDirectoryName(FilePath) + @"\";
+            string Path = FileToolsCommon.GetDirectoryName(FilePath);
             string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
             //文件保存路径
             string PathName = GetFilePathName(FilePath);
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            Debug.WriteLine(KillProcessArray.Length.ToString());
             foreach (var KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
@@ -95,8 +98,13 @@ namespace Common.system
         /// <param name="Mp3Path">MP3音频位置</param>
         public void StartRecordingAudio(string Mp3Path)
         {
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
+            //文件保存路径
+            string PathName = GetFilePathName(Mp3Path);
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            Debug.WriteLine(KillProcessArray.Length.ToString());
             foreach (var KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
@@ -107,12 +115,12 @@ namespace Common.system
             string MicrophoneName = GetMicrophone();
             if (string.IsNullOrWhiteSpace(MicrophoneName))
             {
-                myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" " + Mp3Path;
+                myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" " + PathName;
             }
             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 " + Mp3Path;
+                        MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 " + PathName;
             }
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
@@ -127,14 +135,29 @@ namespace Common.system
         /// <summary>
         /// 暂停录制
         /// </summary>
-        public void SuspendFFmpeg()
+        public bool SuspendFFmpeg()
         {
-            if (myProcess == null)
-                return;
-            myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
-            myProcess.Close();//关闭进程
-            myProcess.Dispose();//释放资源
+            if (myProcess != null)
+            {
+                myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
+                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;
+            return true;
             //myProcess.Kill();
         }
 
@@ -142,17 +165,32 @@ namespace Common.system
         /// 停止录制并合成文件
         /// </summary>
         /// <param name="FilePath">文件存储路径 必须与开始时的路径完全一致</param>
-        public void StopFFmpeg(string FilePath)
+        public bool StopFFmpeg(string FilePath)
         {
             //文件完整路径
-            if (myProcess == null)
-                return;
-            myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
-            myProcess.Close();//关闭进程
-            myProcess.Dispose();//释放资源
+            if (myProcess != null)
+            {
+                myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
+                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 t1 = new Thread(MergeVideoOrAudio);
             t1.Start(FilePath);
+            return true;
             //文件合成
         }
 
@@ -167,14 +205,16 @@ namespace Common.system
         /// <param name="VideoHeight">视频高度</param>
         public void SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight)
         {
-            Thread thread = new Thread(delegate ()
+            new Thread(new ThreadStart(new Action(() =>
             {
-                //// 允许不同线程间的调用
-                //Control.CheckForIllegalCrossThreadCalls = false;
                 Thread.Sleep(500);
+                while (myProcess != null)
+                {
+                    Thread.Sleep(100);
+                }
                 string Extension = FileToolsCommon.GetIOExtension(VideoSavePath);//扩展名
                 Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-                Debug.WriteLine(KillProcessArray.Length.ToString());
+                //Debug.WriteLine(KillProcessArray.Length.ToString());
                 foreach (var KillProcess in KillProcessArray)
                 {
                     KillProcess.Kill();
@@ -220,23 +260,53 @@ namespace Common.system
                 myProcess.WaitForExit();           //阻塞等待进程结束
                 myProcess.Close();                 //关闭进程
                 myProcess.Dispose();               //释放资源
-                                                   //生成视频后删除图片保存列表
-                FileToolsCommon.DeleteDirectory(ImageListPath);
-            });
+                #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));
+
+                //Dispatcher.Invoke(() =>
+                //{
+                //});
+                //// 允许不同线程间的调用
+                //Control.CheckForIllegalCrossThreadCalls = false;
+            }))).Start();
         }
 
         /// <summary>
         /// 视频音频合成
         /// </summary>
         /// <param name="FilePath">存储路径</param>
-        void MergeVideoOrAudio(object FilePathobj)
+        public void MergeVideoOrAudio(object FilePathobj)
         {
-            Thread.Sleep(500);
+            //new Thread(new ThreadStart(new Action(() =>
+            //{
+            //Dispatcher.Invoke(() =>
+            //{
+            //});
+            //}))).Start();
+
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
             //路径
             string FilePath = (string)FilePathobj;
-            string Path = FileToolsCommon.GetDirectoryName(FilePath) + @"\";
+            string Path = FileToolsCommon.GetDirectoryName(FilePath);
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            Debug.WriteLine(KillProcessArray.Length.ToString());
             foreach (var KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
@@ -256,6 +326,20 @@ namespace Common.system
             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;
         }
 
         /// <summary>
@@ -266,7 +350,7 @@ namespace Common.system
         string GetFilePathName(string FilePath)
         {
             //路径
-            string Path = FileToolsCommon.GetDirectoryName(FilePath) + @"\";
+            string Path = FileToolsCommon.GetDirectoryName(FilePath);
             //Path.GetFileName(FilePath);//获取文件名
             string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
             string tempFilePath = Path + "temp/";
@@ -295,8 +379,11 @@ namespace Common.system
         /// <param name="ImagePath">图片地址</param>
         public void GenerateThumbnails(string VideoPath, string ImagePath)
         {
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            Debug.WriteLine(KillProcessArray.Length.ToString());
             foreach (var KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
@@ -317,6 +404,20 @@ namespace Common.system
             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;
         }
 
         /// <summary>

Common/system/FileToolsCommon.cs

@@ -70,6 +70,7 @@ namespace Common.system
             ErrMessage = "";
             try
             {
+                FilePathName = GetLegalPath(FilePathName);
                 FilePath = GetDirectoryName(FilePathName);
                 FileName = GetIOFileName(FilePathName);
             }
@@ -671,7 +672,7 @@ namespace Common.system
         /// <param name="filePath">文件的绝对路径</param>          
         public static string GetDirectoryName(string filePath)
         {
-            string DirectoryName = (System.IO.Path.GetDirectoryName(filePath) + "\\").Replace("\\", "/");
+            string DirectoryName = (System.IO.Path.GetDirectoryName(filePath+ "\\") ).Replace("\\", "/");
             return DirectoryName;
         }
         #endregion

Common/system/ImageHelper.cs

@@ -85,44 +85,44 @@ namespace Common.system
         /// <returns></returns>
         public static BitmapImage GetScreenshot(Rectangle ScreenSize, string ImageSavePath, long level = -1)
         {
-            try
-            {
-                System.Drawing.Size bounds = PrimaryScreen.DESKTOP;
-                //if (string.IsNullOrEmpty(ImageSavePath))
-                //{
-                //    ImageSavePath = GetTempImagePath();//如果为空则指定临时存储路径
-                //}
-                double scaleWidth = (bounds.Width * 1.0) / SystemParameters.PrimaryScreenWidth;
-                double scaleHeight = (bounds.Height * 1.0) / SystemParameters.PrimaryScreenHeight;
-                int width = bounds.Width;
-                int height = bounds.Height;
-                if (ScreenSize.Size != new System.Drawing.Size(0, 0))
-                {
-                    width = (int)(ScreenSize.Size.Width * scaleWidth);
-                    height = (int)(ScreenSize.Size.Height * scaleHeight);
-                }
-                int l = (int)(ScreenSize.X * scaleWidth);
-                int t = (int)(ScreenSize.Y * scaleHeight);
-                //if (_Bitmap != null)
-                //{
-                //    _Bitmap.Dispose();
-                //}
-                Bitmap _Bitmap = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-                using (Graphics g = Graphics.FromImage(_Bitmap))
-                {
-                    g.CopyFromScreen(l, t, 0, 0, _Bitmap.Size, CopyPixelOperation.SourceCopy);
-                    Compress(_Bitmap, ImageSavePath, level);
-                }
-                Uri uri = new Uri(ImageSavePath, UriKind.Absolute);
-                BitmapImage bimg = new BitmapImage(uri);
-                GC.Collect();
-                return bimg;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteErrLog("【截图】(GetBitmapSource)截图失败，" + ex.Message, ex);
-                return null;
-            }
+            //try
+            //{
+            //    System.Drawing.Size bounds = PrimaryScreen.DESKTOP;
+            //    //if (string.IsNullOrEmpty(ImageSavePath))
+            //    //{
+            //    //    ImageSavePath = GetTempImagePath();//如果为空则指定临时存储路径
+            //    //}
+            //    double scaleWidth = (bounds.Width * 1.0) / SystemParameters.PrimaryScreenWidth;
+            //    double scaleHeight = (bounds.Height * 1.0) / SystemParameters.PrimaryScreenHeight;
+            //    int width = bounds.Width;
+            //    int height = bounds.Height;
+            //    if (ScreenSize.Size != new System.Drawing.Size(0, 0))
+            //    {
+            //        width = (int)(ScreenSize.Size.Width * scaleWidth);
+            //        height = (int)(ScreenSize.Size.Height * scaleHeight);
+            //    }
+            //    int l = (int)(ScreenSize.X * scaleWidth);
+            //    int t = (int)(ScreenSize.Y * scaleHeight);
+            //    //if (_Bitmap != null)
+            //    //{
+            //    //    _Bitmap.Dispose();
+            //    //}
+            //    Bitmap _Bitmap = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+            //    using (Graphics g = Graphics.FromImage(_Bitmap))
+            //    {
+            //        g.CopyFromScreen(l, t, 0, 0, _Bitmap.Size, CopyPixelOperation.SourceCopy);
+            //        Compress(_Bitmap, ImageSavePath, level);
+            //    }
+            //    Uri uri = new Uri(ImageSavePath, UriKind.Absolute);
+            //    BitmapImage bimg = new BitmapImage(uri);
+            //    GC.Collect();
+            //    return bimg;
+            //}
+            //catch (Exception ex)
+            //{
+            //    //LogHelper.WriteErrLog("【截图】(GetBitmapSource)截图失败，" + ex.Message, ex);
+            return null;
+            //}
         }
 
         //private static Bitmap _Bitmap = null;
@@ -164,7 +164,7 @@ namespace Common.system
         {
             if (level <= -1)
             {
-                int ImageCompressionLevel = int.Parse(ConfigurationManager.AppSettings["ImageCompressionLevel"]);
+                int ImageCompressionLevel = int.Parse(FileToolsCommon.GetConfigValue("ImageCompressionLevel"));
                 level = ImageCompressionLevel;
             }
             Stream s = new FileStream(destFile, FileMode.Create);
@@ -336,7 +336,6 @@ namespace Common.system
         #endregion 图片压缩
 
         #region 截屏指定UI控件
-
         /// <summary>
         /// 保存图片
         /// </summary>
@@ -344,7 +343,7 @@ namespace Common.system
         /// <param name="filePathName">图片保存地址 命名 1.png</param>
         /// <param name="width">保存宽</param>
         /// <param name="height">保存高</param>
-        private void SaveUIToImage(FrameworkElement ui, string filePathName, int width, int height)
+        public static void SaveUIToImage(FrameworkElement ui, string filePathName, int width, int height)
         {
             try
             {

XHWK.Model/Model_Video.cs

@@ -7,7 +7,7 @@
     {
         private string _videPath;
         private string _thumbnailPath;
-        private Emum_VideoType _videoType;
+        private Enum_VideoType _videoType;
         private Enum_WKVidetype _wkType;
         private string _RSTime;
         private string _videoSize;
@@ -22,7 +22,7 @@
         /// <summary>
         /// 视频类型
         /// </summary>
-        public Emum_VideoType VideoType { get => _videoType; set => _videoType = value; }
+        public Enum_VideoType VideoType { get => _videoType; set => _videoType = value; }
         /// <summary>
         /// 微课类型
         /// </summary>
@@ -39,7 +39,7 @@
     /// <summary>
     /// 视频格式类型
     /// </summary>
-    public enum Emum_VideoType
+    public enum Enum_VideoType
     {
         MP4 = 1,
         FlV = 2,

XHWK.Model/Model_WKData.cs

@@ -7,7 +7,7 @@ namespace XHWK.Model
         private string _wkName;
         private List<Model_Video> _videoList;
         private string _wkPath;
-        private string _wkDateTime;
+        private string _wkCreateDateTime;
         private string _drawDataPath;
         /// <summary>
         /// 微课名
@@ -24,7 +24,7 @@ namespace XHWK.Model
         /// <summary>
         /// 微课时间
         /// </summary>
-        public string WkDateTime { get => _wkDateTime; set => _wkDateTime = value; }
+        public string WkCreateDateTime { get => _wkCreateDateTime; set => _wkCreateDateTime = value; }
         /// <summary>
         /// 画板数据存储路径
         /// </summary>

XHWK.WKTool/App.config

@@ -10,7 +10,11 @@
     <add key="VideoSavePath" value="D:\星火微课" />
     <!--视频格式 1、MP4 2、FlV 3、AVI-->
     <add key="VideoType" value="1" />
+    <!--图片压缩质量-->
+    <add key="ImageCompressionLevel" value="50"/>
+    <!--用户名-->
     <add key="userName" value="" />
+    <!--记住密码-->
     <add key="isRemind" value="" />
   </appSettings>
 </configuration>

XHWK.WKTool/App.cs

@@ -26,18 +26,14 @@ namespace XHWK.WKTool
         /// </summary>
         public static Model_WKData WKData = null;
         /// <summary>
-        /// 讲解名称
-        /// </summary>
-        public static string WkName = null;
-        /// <summary>
-        /// 微课保存路径
-        /// </summary>
-        public static string WkSavePath = null;
-        /// <summary>
         /// 主页面
         /// </summary>
         public static XHMicroLessonSystemWindow W_XHMicroLessonSystemWindow = null;
         /// <summary>
+        /// 录屏工具
+        /// </summary>
+        public static FFMpeg FFmpeg = new FFMpeg();
+        /// <summary>
         /// 开始录像
         /// </summary>
         public static CountdownWindow W_CountdownWindow = null;
@@ -69,6 +65,7 @@ namespace XHWK.WKTool
         {
             // 定义Application对象作为整个应用程序入口
             Application app = new Application();
+            WKData = new Model_WKData();
             //app.DispatcherUnhandledException += MyApp_DispatcherUnhandledException;
             CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
             app.Run(win);

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -34,7 +34,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
-
+            System.Environment.Exit(0);
         }
         /// <summary>
         /// 浏览
@@ -76,18 +76,19 @@ namespace XHWK.WKTool
                 System.Windows.MessageBox.Show("路径不可为空！");
                 return;
             }
-            if (!FileToolsCommon.IsLegalPath(txbExplainName.Text.Trim(), out string ErrMessage))
-            {
-                System.Windows.MessageBox.Show(ErrMessage);
-            }
-            string PathName = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/";
-            if (FileToolsCommon.IsExistDirectory(PathName))
+            //if (!FileToolsCommon.IsLegalPath(txbStoragePath.Text.Trim(), out string ErrMessage))
+            //{
+            //    System.Windows.MessageBox.Show(ErrMessage);
+            //    return;
+            //}
+            APP.WKData.WkPath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/";
+            if (FileToolsCommon.IsExistDirectory(APP.WKData.WkPath))
             {
                 //微课已存在
                 MessageBoxResult dr = System.Windows.MessageBox.Show("讲解已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
                 if (dr == MessageBoxResult.OK)
                 {
-                    FileToolsCommon.DeleteDirectory(PathName);
+                    FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
                 }
                 else
                 {
@@ -96,12 +97,11 @@ namespace XHWK.WKTool
             }
             #endregion
             //创建文件夹
-            FileToolsCommon.CreateDirectory(PathName);
+            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
             //存储文件
             FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Text);
-            APP.WkName = txbExplainName.Text;
-            APP.WkSavePath = PathName;
-            FileToolsCommon.CreateDirectory(APP.WkSavePath);
+            APP.WKData.WkName = txbExplainName.Text;
+            APP.WKData.WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -74,10 +74,10 @@
             <TextBlock Grid.Row="1" Text="01:35" FontSize="23" Foreground="#FFFFFF" Margin="30,50,0,0"/>
             <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,15,0">
                 <Button x:Name="BtnRecordingScreen"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnRecordingScreen_Click">
-                    <Image Source="./Images/Toobar25.png"/>
+                    <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar25.png"/>
                 </Button>
                 <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnStopRecordingScreen_Click">
-                    <Image Source="./Images/Toobar14.png"/>
+                    <Image x:Name="ImgEndRecordingScreen" Source="./Images/Toobar14.png"/>
                 </Button>
                 <Button  Cursor="Hand" x:Name="btnBrush" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnBrush_Click">
                     <Image Source="./Images/Toobar8.png"/>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -2,7 +2,7 @@
 
 using System;
 using System.Windows;
-
+using System.Windows.Media.Imaging;
 using XHWK.Model;
 
 namespace XHWK.WKTool
@@ -16,19 +16,19 @@ namespace XHWK.WKTool
         /// <summary>
         /// 视频存储路径
         /// </summary>
-        string RSPath;
+        string RecordingPath;
         /// <summary>
-        /// 是否正在录制
+        /// 视频保存名称
         /// </summary>
-        bool IsStartRS = false;
+        string VideoSavePathName;
         /// <summary>
-        /// 是否暂停
+        /// 是否首次录屏
         /// </summary>
-        bool IsSuspend = true;
+        bool IsFirstRS = true;
         /// <summary>
-        /// 录屏
+        /// 是否暂停
         /// </summary>
-        FFMpeg Ffmpeg = null;
+        bool IsSuspend = true;
         #endregion
 
         #region 初始化
@@ -46,41 +46,11 @@ namespace XHWK.WKTool
         {
             //隐藏画笔工具栏
             BtnToolbarDown_Click(null, null);
-            IsStartRS = false;
-            IsSuspend = true;
-            RSPath = null;
-            if (Ffmpeg == null)
-            {
-                Ffmpeg = new FFMpeg();
-            }
         }
         #endregion
 
         #region 录制
         /// <summary>
-        /// 停止录像
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnStopRecordingScreen_Click(object sender, RoutedEventArgs e)
-        {
-            if (APP.W_XHMicroLessonSystemWindow == null)
-            {
-                APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
-            }
-            APP.W_XHMicroLessonSystemWindow.Show();
-            try
-            {
-                Ffmpeg.StopFFmpeg(RSPath);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message);
-            }
-            IsStartRS = false;
-            Hide();
-        }
-        /// <summary>
         /// 开始或暂停录制
         /// </summary>
         /// <param name="sender"></param>
@@ -89,23 +59,31 @@ namespace XHWK.WKTool
         {
             if (IsSuspend)
             {
-                if(IsStartRS)
+                if(IsFirstRS)
                 {
+                    RecordingPath = APP.WKData.WkPath;
+                    //FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
+                    FileToolsCommon.CreateDirectory(RecordingPath);
+                    VideoSavePathName = RecordingPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+                    if (FileToolsCommon.IsExistFile(VideoSavePathName))
+                    {
+                        MessageBoxResult dr = System.Windows.MessageBox.Show("已存在录屏是否覆盖？", "提示", MessageBoxButton.OKCancel);
+                        if (dr == MessageBoxResult.OK)
+                        {
+                            FileToolsCommon.DeleteFile(VideoSavePathName);
+                        }
+                        else
+                        {
+                            return;
+                        }
+                    }
+                    IsFirstRS = false;
                 }
-                //timer = new DispatcherTimer();
-                //timer.Interval = TimeSpan.FromMilliseconds(1000);
-                //timer.Tick += Timer_Tick;//你的事件
-                //dt = Convert.ToDateTime("2020-01-01 00:00:00");
-                //FileToolsCommon.DeleteDirectory(RSPath);
                 IsSuspend = false;
-                IsStartRS = true;
-                BtnRecordingScreen.Content = "暂停录制";
+                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
                 try
                 {
-                    RSPath = APP.WkSavePath;
-                    FileToolsCommon.CreateDirectory(RSPath);
-                    RSPath += "." + ((Emum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
-                    Ffmpeg.StartRecordingVideo(RSPath);
+                    APP.FFmpeg.StartRecordingVideo(VideoSavePathName);
                 }
                 catch (Exception ex)
                 {
@@ -115,10 +93,10 @@ namespace XHWK.WKTool
             else
             {
                 IsSuspend = true;
+                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
                 try
                 {
-                    Ffmpeg.SuspendFFmpeg();
-                    Ffmpeg.StopFFmpeg(RSPath);
+                    APP.FFmpeg.SuspendFFmpeg();
                 }
                 catch (Exception ex)
                 {
@@ -126,6 +104,29 @@ namespace XHWK.WKTool
                 }
             }
         }
+        /// <summary>
+        /// 停止录像
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnStopRecordingScreen_Click(object sender, RoutedEventArgs e)
+        {
+            if (APP.W_XHMicroLessonSystemWindow == null)
+            {
+                APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+            }
+            APP.W_XHMicroLessonSystemWindow.Show();
+            try
+            {
+                APP.FFmpeg.StopFFmpeg(VideoSavePathName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+            IsFirstRS = true;
+            Hide();
+        }
         #endregion
 
         #region 画笔相关

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -68,7 +68,7 @@
                             <TextBlock Text="导入" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnRecord" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="60,0,30,0" Click="BtnRecord_Click">
+                    <Button Cursor="Hand" x:Name="BtnRecord" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="60,0,30,0" Click="BtnRecord_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgRecord" Source="./Images/microLessonSystem_14.png"/>
                             <Image x:Name="ImgRecordTwo" Source="./Images/microLessonSystem_13.png" Visibility="Collapsed"/>
@@ -122,7 +122,7 @@
                 </StackPanel>
             </Grid>
             <!--主内容-->
-            <Grid Grid.Row="1" x:Name="gridMain"  Margin="20,0,20,0" Background="#FFFFFF" Height="793.700787401575" Width="1142.51968503937" Visibility="Visible">
+            <Grid Grid.Row="1" x:Name="GridMain"  Margin="20,0,20,0" Background="#FFFFFF" Height="793.700787401575" Width="1142.51968503937" Visibility="Visible">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="auto"/>
                 </Grid.RowDefinitions>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -14,6 +14,8 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
+using XHWK.Model;
+
 namespace XHWK.WKTool
 {
     /// <summary>
@@ -53,6 +55,7 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
+
             //创建 DrawingAttributes 类的一个实例  
             drawingAttributes = new DrawingAttributes();
             //将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
@@ -183,7 +186,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnSave_Click(object sender, RoutedEventArgs e)
         {
-            gridMain.Visibility = Visibility.Visible;
+            GridMain.Visibility = Visibility.Visible;
             gridSetUp.Visibility = Visibility.Collapsed;
         }
         /// <summary>
@@ -193,7 +196,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnSetUp_Click(object sender, RoutedEventArgs e)
         {
-            gridMain.Visibility = Visibility.Collapsed;
+            GridMain.Visibility = Visibility.Collapsed;
             gridSetUp.Visibility = Visibility.Visible;
         }
         /// <summary>
@@ -427,6 +430,8 @@ namespace XHWK.WKTool
                 }
             }
         }
+        #region 录制窗口
+
         /// <summary>
         /// 录制窗口内容
         /// </summary>
@@ -439,7 +444,165 @@ namespace XHWK.WKTool
                 Login();
                 return;
             }
+
+        }
+        /// <summary>
+        /// 视频保存路径
+        /// </summary>
+        string RecordingPath;
+        /// <summary>
+        /// 图片保存路径
+        /// </summary>
+        string ImgPath;
+        /// <summary>
+        /// 音频保存路径名
+        /// </summary>
+        string AudioPathName;
+        /// <summary>
+        /// 视频保存路径名
+        /// </summary>
+        string VideoSavePathName;
+        /// <summary>
+        /// 暂停录制
+        /// </summary>
+        bool IsSuspendR = true;
+        /// <summary>
+        /// 是否首次录制
+        /// </summary>
+        bool IsFirstR = true;
+        /// <summary>
+        /// 图片
+        /// </summary>
+        int ImgNum = 0;
+        /// <summary>
+        /// 是否开始截图计数
+        /// </summary>
+        bool IsStartCount = false;
+
+        /// <summary>
+        /// 开始录制和暂停录制
+        /// </summary>
+        void StartRecord()
+        {
+            if (IsSuspendR)
+            {
+                if (IsFirstR)//是否第一次录制  初始化录制
+                {
+                    RecordingPath = APP.WKData.WkPath;
+                    ImgPath = APP.WKData.WkPath+"temp/Image/";
+                    AudioPathName = APP.WKData.WkPath + "temp/audio/";
+                    FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
+                    FileToolsCommon.CreateDirectory(RecordingPath);
+                    FileToolsCommon.CreateDirectory(ImgPath);
+                    FileToolsCommon.CreateDirectory(AudioPathName);
+                    AudioPathName += APP.WKData.WkName+".MP3";
+                    VideoSavePathName = RecordingPath + APP.WKData.WkName+"_录制."+ ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+                    if(FileToolsCommon.IsExistFile(VideoSavePathName))
+                    {
+
+                    }
+                    IsFirstR = false;
+                    ImgNum = 0;
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        while (true)
+                        {
+                            Thread.Sleep(200);
+                            if (IsStartCount)
+                            {
+                                ImgNum++;
+                                Dispatcher.Invoke(() =>
+                                {
+                                    string FilePathName = ImgPath + ImgNum + ".png";
+                                    ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)GridMain.ActualWidth, (int)GridMain.ActualHeight);
+                                });
+                            }
+                        }
+                    }))).Start();
+                }
+                //继续录制
+                IsSuspendR = false;
+                //BtnRecording.Content = "暂停录制";
+                ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_23.png"));
+                try
+                {
+                    APP.FFmpeg.StartRecordingAudio(AudioPathName);
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        Thread.Sleep(1000);
+                        //Dispatcher.Invoke(() =>
+                        //{
+                            IsStartCount = true;
+                        //});
+                    }))).Start();
+                }
+                catch (Exception ex)
+                {
+                    System.Windows.MessageBox.Show(ex.Message);
+                }
+            }
+            else
+            {
+                //暂停
+                IsSuspendR = true;
+                ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
+                try
+                {
+                    APP.FFmpeg.SuspendFFmpeg();
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        while (APP.FFmpeg.myProcess != null)
+                        {
+                            Thread.Sleep(100);
+                        }
+                        IsStartCount = false;
+                    }))).Start();
+                }
+                catch (Exception ex)
+                {
+                    System.Windows.MessageBox.Show(ex.Message);
+                }
+            }
         }
+        /// <summary>
+        /// 停止录制并生成录制文件
+        /// </summary>
+        void EndRecord()
+        {
+            IsFirstR = true;
+            IsSuspendR = true;
+            ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
+            try
+            {
+                APP.FFmpeg.StopFFmpeg(AudioPathName);
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    while (APP.FFmpeg.myProcess != null)
+                    {
+                        Thread.Sleep(100);
+                    }
+                    Dispatcher.Invoke(() =>
+                    {
+                        IsStartCount = false;
+                    });
+                }))).Start();
+
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    while (APP.FFmpeg.myProcess != null)
+                    {
+                        Thread.Sleep(100);
+                    }
+                }))).Start();
+                APP.FFmpeg.SynthesisVideo(ImgPath, AudioPathName, VideoSavePathName, 5, (int)GridMain.ActualWidth, (int)GridMain.ActualHeight);
+            }
+            catch (Exception ex)
+            {
+                System.Windows.MessageBox.Show(ex.Message);
+            }
+        }
+        #endregion
+
         /// <summary>
         /// 停止录制窗口内容
         /// </summary>