zhao：增加增加暂停功能，多视频录制合并

Common/system/FFMpeg.cs

@@ -4,6 +4,8 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
+
 using VisioForge.Shared.NAudio.CoreAudioApi;
 using VisioForge.Shared.NAudio.Wave;
 
@@ -11,6 +13,8 @@ namespace Common.system
 {
     /// <summary>
     /// ffmpeg帮助类
+    /// 创建人：赵耀
+    /// 创建时间：：2020年8月22日
     /// 需要安装\ffmpeg\bin\Setup Screen Capturer Recorder v0.12.10.exe
     /// 本地调试需要配置环境变量 将ffmpeg.exe位置配置到环境变量的path中
     /// </summary>
@@ -24,10 +28,14 @@ namespace Common.system
         /// <summary>
         /// 录制屏幕
         /// </summary>
-        /// <param name="PathName">文件存储路径</param>
-        /// <param name="VideoType">视频类型</param>
-        public void StartRecordingVideo(string PathName, string VideoType)
+        /// <param name="FilePath">文件存储路径</param>
+        public void StartRecordingVideo(string 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)
@@ -38,7 +46,7 @@ namespace Common.system
             LogPath = CreateffmpegLog();
             string MicrophoneName = GetMicrophone();
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
-            switch (VideoType.ToUpper())
+            switch (Extension.ToUpper())
             {
                 case "MP4":
                     if (string.IsNullOrWhiteSpace(MicrophoneName))
@@ -55,12 +63,12 @@ namespace Common.system
                 case "FLV":
                     if (string.IsNullOrWhiteSpace(MicrophoneName))
                     {
-                        myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f "+ VideoType.ToLower() + " " + PathName;  //ffmpeg的参数
+                        myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
                     }
                     else
                     {
                         myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" -f dshow -i audio=\"" +
-                            MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec h264 -preset:v ultrafast -tune:v zerolatency -acodec aac -ar 44100 -ac 2 -f " + VideoType.ToLower() + " " + PathName;  //ffmpeg的参数
+                            MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec h264 -preset:v ultrafast -tune:v zerolatency -acodec aac -ar 44100 -ac 2 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
                     }
                     break;
                 default:
@@ -120,11 +128,10 @@ namespace Common.system
         }
 
         /// <summary>
-        /// 停止录制
+        /// 暂停录制
         /// </summary>
-        public void StopFFmpeg()
+        public void SuspendFFmpeg()
         {
-            //Thread.Sleep(3000);
             if (myProcess == null)
                 return;
             myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
@@ -135,7 +142,25 @@ namespace Common.system
         }
 
         /// <summary>
-        /// 合成视频
+        /// 停止录制并合成文件
+        /// </summary>
+        /// <param name="FilePath">文件存储路径 必须与开始时的路径完全一致</param>
+        public void StopFFmpeg(string FilePath)
+        {
+            //文件完整路径
+            if (myProcess == null)
+                return;
+            myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
+            myProcess.Close();//关闭进程
+            myProcess.Dispose();//释放资源
+            myProcess = null;
+            Thread t1 = new Thread(MergeVideoOrAudio);
+            t1.Start(FilePath);
+            //文件合成
+        }
+
+        /// <summary>
+        /// 图片音频合成视频
         /// </summary>
         /// <param name="ImageListPath">图片列表位置 命名为1.png 2.png</param>
         /// <param name="Mp3Path">MP3音频位置</param>
@@ -143,9 +168,76 @@ namespace Common.system
         /// <param name="Frequency">每秒帧率</param>
         /// <param name="VideoWidth">视频宽度</param>
         /// <param name="VideoHeight">视频高度</param>
-        /// <param name="VideoType">视频类型  MP4 FLV AVI</param>
-        private void SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight, string VideoType)
+        private void SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight)
+        {
+            Thread thread = new Thread(delegate ()
+            {
+                //// 允许不同线程间的调用
+                //Control.CheckForIllegalCrossThreadCalls = false;
+                Thread.Sleep(500);
+                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();               //释放资源
+                                                   //生成视频后删除图片保存列表
+                FileToolsCommon.DeleteDirectory(ImageListPath);
+            });
+        }
+
+        /// <summary>
+        /// 视频音频合成
+        /// </summary>
+        /// <param name="FilePath">存储路径</param>
+        void MergeVideoOrAudio(object FilePathobj)
         {
+            Thread.Sleep(500);
+            //路径
+            string FilePath = (string)FilePathobj;
+            string Path = FileToolsCommon.GetDirectoryName(FilePath) + @"\";
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
             Debug.WriteLine(KillProcessArray.Length.ToString());
             foreach (var KillProcess in KillProcessArray)
@@ -153,35 +245,9 @@ namespace Common.system
                 KillProcess.Kill();
             }
             myProcess = new Process();
-            LogPath=CreateffmpegLog();
+            LogPath = CreateffmpegLog();
             this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
-            switch (VideoType.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.Arguments = "-f concat  -safe 0 -i " + Path + "temp/filelist.d -c copy " + FilePath;
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
             myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -193,17 +259,44 @@ namespace Common.system
             myProcess.WaitForExit();           //阻塞等待进程结束
             myProcess.Close();                 //关闭进程
             myProcess.Dispose();               //释放资源
-            //生成视频后删除图片保存列表
-            FileToolsCommon.DeleteDirectory(ImageListPath);
-            
         }
-        
+
+        /// <summary>
+        /// 获取文件完整路径
+        /// </summary>
+        /// <param name="FilePath">文件路径</param>
+        /// <returns></returns>
+        string GetFilePathName(string FilePath)
+        {
+            //路径
+            string Path = FileToolsCommon.GetDirectoryName(FilePath) + @"\";
+            //Path.GetFileName(FilePath);//获取文件名
+            string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
+            string tempFilePath = Path + "temp/";
+            //创建临时目录
+            FileToolsCommon.CreateDirectory(tempFilePath);
+            //创建记录文件
+            if (!FileToolsCommon.IsExistFile(tempFilePath + "filelist.d"))
+            {
+                FileToolsCommon.CreateFile(tempFilePath + "filelist.d");
+            }
+            int num = 1;
+            string CompleteFilePath = tempFilePath + num + Extension;
+            while (FileToolsCommon.IsExistFile(CompleteFilePath))
+            {
+                num++;
+                CompleteFilePath = tempFilePath + num + Extension;
+            }
+            FileToolsCommon.AppendText(tempFilePath + "filelist.d", "file ./" + num + Extension + "\r\n");
+            return CompleteFilePath;
+        }
+
         /// <summary>
         /// 生成缩略图
         /// </summary>
         /// <param name="VideoPath">视频地址</param>
         /// <param name="ImagePath">图片地址</param>
-        void GenerateThumbnails(string VideoPath,string ImagePath)
+        void GenerateThumbnails(string VideoPath, string ImagePath)
         {
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
             Debug.WriteLine(KillProcessArray.Length.ToString());

Common/system/FileToolsCommon.cs

@@ -20,7 +20,7 @@ namespace Common.system
         /// </summary>
         /// <param name="Path">相对路径</param>
         /// <returns></returns>
-        public static string GetFileAbsolutePath(string Path="")
+        public static string GetFileAbsolutePath(string Path = "")
         {
             try
             {
@@ -155,9 +155,9 @@ namespace Common.system
                     Directory.CreateDirectory(directoryPath);
                 }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                throw  new ApplicationException("请使用管理员权限运行！");
+                throw new ApplicationException(ex.Message); //"请使用管理员权限运行！"
             }
         }
         #endregion
@@ -284,7 +284,7 @@ namespace Common.system
         /// 获取指定目录中所有文件列表  
         /// </summary>  
         /// <param name="directoryPath">指定目录的绝对路径</param>          
-        public static FileInfo[] GetFileInfos(string directoryPath,string files=null)
+        public static FileInfo[] GetFileInfos(string directoryPath, string files = null)
         {
             //如果目录不存在，则抛出异常  
             if (!IsExistDirectory(directoryPath))
@@ -515,7 +515,7 @@ namespace Common.system
         public static string FileToString(string filePath)
         {
             //return FileToString(filePath, Encoding.Default); 
-            return FileToString(filePath, Encoding.UTF8); 
+            return FileToString(filePath, Encoding.UTF8);
         }
         /// <summary>  
         /// 将文件读取到字符串中  
@@ -554,6 +554,14 @@ namespace Common.system
             FileInfo fi = new FileInfo(filePath);
             return fi.Name;
         }
+        /// <summary>  
+        /// 使用IO从文件的绝对路径中获取文件名( 包含扩展名 )  
+        /// </summary>  
+        /// <param name="filePath">文件的绝对路径</param>          
+        public static string GetIOFileName(string filePath)
+        {
+            return Path.GetFileName(filePath);
+        }
         #endregion
 
         #region 从文件的绝对路径中获取文件名( 不包含扩展名 )
@@ -567,6 +575,14 @@ namespace Common.system
             FileInfo fi = new FileInfo(filePath);
             return fi.Name.Split('.')[0];
         }
+        /// <summary>  
+        /// 使用IO从文件的绝对路径中获取文件名( 不包含扩展名 )  
+        /// </summary>  
+        /// <param name="filePath">文件的绝对路径</param>          
+        public static string GetIOFileNameNoExtension(string filePath)
+        {
+            return System.IO.Path.GetFileNameWithoutExtension(filePath);
+        }
         #endregion
 
         #region 从文件的绝对路径中获取扩展名
@@ -580,6 +596,28 @@ namespace Common.system
             FileInfo fi = new FileInfo(filePath);
             return fi.Extension;
         }
+        /// <summary>  
+        /// 使用IO从文件的绝对路径中获取扩展名 
+        /// </summary>  
+        /// <param name="filePath">文件的绝对路径</param>          
+        public static string GetIOExtension(string filePath)
+        {
+            string Extension = System.IO.Path.GetExtension(filePath);
+            return Extension;
+        }
+
+        #endregion
+
+        #region 从文件的绝对路径中获取路径名
+        /// <summary>  
+        /// 从文件的绝对路径中获取扩展名  
+        /// </summary>  
+        /// <param name="filePath">文件的绝对路径</param>          
+        public static string GetDirectoryName(string filePath)
+        {
+            string DirectoryName = (System.IO.Path.GetDirectoryName(filePath) + "\\").Replace("\\", "/");
+            return DirectoryName;
+        }
         #endregion
 
         #region 清空指定目录

XHWK.WKTool/App.cs

@@ -14,6 +14,19 @@ namespace XHWK.WKTool
 {
     public partial class APP : Application
     {
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        public static XHMicroLessonSystemWindow W_XHMicroLessonSystemWindow = null;
+        /// <summary>
+        /// 开始录像
+        /// </summary>
+        public static CountdownWindow W_CountdownWindow = null;
+        /// <summary>
+        /// 录像工具栏
+        /// </summary>
+        public static ScreenRecordingToolbarWindow W_ScreenRecordingToolbarWindow = null;
+
         [STAThread]
         private static void Main()
         {

XHWK.WKTool/CountdownWindow.xaml

@@ -14,7 +14,7 @@
         <SolidColorBrush Opacity="0.96" Color="#292C2E" />
     </Window.Background>
     <Grid>
-        <Image
+        <Image x:Name="ImgGif"
                     Width="600"
                     Height="600"
                     gifLib:ImageBehavior.AnimatedSource=".\Images\countdown.gif" MediaElement.MediaEnded="Image_MediaEnded"/>

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -1,4 +1,6 @@
-using System;
+using AForge.Imaging;
+using Common.system;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,6 +14,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using System.Windows.Threading;
 
 namespace XHWK.WKTool
 {
@@ -20,16 +23,30 @@ namespace XHWK.WKTool
     /// </summary>
     public partial class CountdownWindow : Window
     {
+        DispatcherTimer timer = null;
         public CountdownWindow()
         {
             InitializeComponent();
-            
+            Initialize();
         }
         public void Initialize()
         {
             //Thread.Sleep(1200);
             //this.Hide();
+            //MediaElement.Position
+            //((MediaElement)((object)ImgGif)).Position= TimeSpan.Zero;
+            timer = new DispatcherTimer();
+            timer.Interval = TimeSpan.FromMilliseconds(2500);
+            timer.Tick += Timer_Tick;
+            timer.Start();
         }
+
+        private void Timer_Tick(object sender, EventArgs e)
+        {
+            this.Hide();
+            timer.Stop();
+        }
+
         /// <summary>
         /// 跳转页面
         /// </summary>
@@ -37,18 +54,6 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void Window_ContentRendered(object sender, EventArgs e)
         {
-            ScreenRecordingToolbarWindow win = new ScreenRecordingToolbarWindow();
-            win.Topmost = true;
-            win.Show();
-            //显示在右下角
-            double xpos = this.Left + this.Width - win.Width-10;
-            double ypos = this.Top + this.Height - win.Height - 60;
-
-
-            win.Left = xpos;
-            win.Top = ypos;
-            this.Hide();
-
             //Thread.Sleep(800);
             ////imgLoding.Source= new BitmapImage(new Uri("pack://application:,,/Images/countdown_2.png"));
             ////Thread.Sleep(300);
@@ -61,6 +66,7 @@ namespace XHWK.WKTool
 
         private void Image_MediaEnded(object sender, RoutedEventArgs e)
         {
+            System.Windows.Controls.Image img = (System.Windows.Controls.Image)sender;
             ((MediaElement)sender).Position = ((MediaElement)sender).Position.Add(TimeSpan.FromMilliseconds(10000));
         }
     }

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -73,10 +73,13 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void btnStart_Click(object sender, RoutedEventArgs e)
         {
-            XHMicroLessonSystemWindow win = new XHMicroLessonSystemWindow();
-            //win.Topmost = true;
-            win.ShowDialog();
-            this.Close();
+            if (APP.W_XHMicroLessonSystemWindow == null)
+            {
+                APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+                //APP.W_XHMicroLessonSystemWindow .Topmost = true;
+            }
+            APP.W_XHMicroLessonSystemWindow.Show();
+            this.Hide();
         }
         /// <summary>
         /// 窗体移动

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -8,7 +8,7 @@
         Title="ScreenRecordingToolbarWindow" Height="450" Width="300" AllowsTransparency="True" 
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
-    WindowStyle="None">
+    WindowStyle="None" Margin="0" Left="0" Top="0">
     <Window.Background>
         <SolidColorBrush Opacity="0" Color="#292C2E" />
     </Window.Background>
@@ -74,9 +74,9 @@
             <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 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0">
-                    <Image Source="./Images/Toobar25.png"/>
+                    <Image Source="Images/microLessonSystem_23.png"/>
                 </Button>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0">
+                <Button x:Name="BtnStopRecordingScreen" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnStopRecordingScreen_Click">
                     <Image Source="./Images/Toobar14.png"/>
                 </Button>
                 <Button x:Name="btnBrush" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnBrush_Click">

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using Common.system;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -23,6 +24,10 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
         }
+        public void Initialize()
+        {
+            BtnToolbarDown_Click(null, null);
+        }
         /// <summary>
         /// 画笔工具栏关闭事件
         /// </summary>
@@ -39,7 +44,14 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBrush_Click(object sender, RoutedEventArgs e)
         {
-            gridToolbar.Visibility = Visibility.Visible;
+            if (gridToolbar.Visibility == Visibility.Visible)
+            {
+                gridToolbar.Visibility = Visibility.Hidden;
+            }
+            else
+            {
+                gridToolbar.Visibility = Visibility.Visible;
+            }
         }
         /// <summary>
         /// 画笔粗细事件
@@ -61,5 +73,19 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Visible;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+        /// <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();
+            Hide();
+        }
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -21,7 +21,7 @@ namespace XHWK.WKTool
     /// </summary>
     public partial class XHMicroLessonSystemWindow : Window
     {
-        #region 字段
+        #region 初始值
         /// <summary>
         /// 文件目录窗口
         /// </summary>
@@ -97,10 +97,34 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnScreenRecording_Click(object sender, RoutedEventArgs e)
         {
-            CountdownWindow win = new CountdownWindow();
-            win.Topmost = true;
-            win.Show();
-            this.Close();
+            if (APP.W_CountdownWindow == null)
+            {
+                APP.W_CountdownWindow = new CountdownWindow();
+                //APP.W_CountdownWindow.Topmost = true;
+            }
+            else
+            {
+                APP.W_CountdownWindow.Initialize();
+                APP.W_CountdownWindow.Topmost = true;
+            }
+            APP.W_CountdownWindow.Show();
+
+            if (APP.W_ScreenRecordingToolbarWindow == null)
+            {
+                APP.W_ScreenRecordingToolbarWindow = new ScreenRecordingToolbarWindow();
+                APP.W_ScreenRecordingToolbarWindow.Topmost = true;
+                APP.W_ScreenRecordingToolbarWindow.Initialize();
+
+            }
+            else
+            {
+                APP.W_ScreenRecordingToolbarWindow.Initialize();
+            }
+            //显示在右下角
+            //APP.W_ScreenRecordingToolbarWindow.Left= PrimaryScreen.DESKTOP.Width - APP.W_ScreenRecordingToolbarWindow.Width - 10;
+            //APP.W_ScreenRecordingToolbarWindow.Top= PrimaryScreen.DESKTOP.Height - APP.W_ScreenRecordingToolbarWindow.Height - 60;
+            this.Hide();
+            Hide();
         }
         /// <summary>
         /// 上传事件

XHWK.WKTool/XHWK.WKTool.csproj

@@ -58,6 +58,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />