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

Common/system/BlackboardNew.cs

@@ -439,7 +439,6 @@ namespace Common.system
                         //}
                         stroke = null;
                     }
-
                     stylusPoints = new StylusPointCollection();
                     stylusPoint = new StylusPoint();
                     //stroke = new Stroke(stylusPoints);

Common/system/FFMpeg.cs

@@ -36,7 +36,7 @@ namespace Common.system
             string Path = FileToolsCommon.GetDirectoryName(FilePath);
             string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
             //文件保存路径
-            string PathName = GetFilePathName(FilePath);
+            string PathName = GetRSFilePathName(FilePath);
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
             foreach (var KillProcess in KillProcessArray)
             {
@@ -44,7 +44,21 @@ namespace Common.system
             }
             myProcess = new Process();
             LogPath = CreateffmpegLog();
-            string MicrophoneName = GetMicrophone();
+            string MicrophoneName = null;
+            string audioTestPath = FileToolsCommon.GetFileAbsolutePath("ado.m");
+            try
+            {
+                FileToolsCommon.DeleteFile(audioTestPath);
+            }
+            catch (Exception)
+            {
+
+            }
+            if (StartRecordAudio(audioTestPath))
+            {
+                MicrophoneName = GetMicrophone();
+            }
+            StopRecordAudio();
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             switch (Extension.ToUpper())
             {
@@ -102,6 +116,8 @@ namespace Common.system
             {
                 Thread.Sleep(100);
             }
+            //路径
+            string Path = FileToolsCommon.GetDirectoryName(Mp3Path);
             //文件保存路径
             string PathName = GetFilePathName(Mp3Path);
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
@@ -112,7 +128,21 @@ namespace Common.system
             myProcess = new Process();
             LogPath = CreateffmpegLog();
             this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
-            string MicrophoneName = GetMicrophone();
+            string MicrophoneName = null;
+            string audioTestPath = FileToolsCommon.GetFileAbsolutePath("ado.m");
+            try
+            {
+                FileToolsCommon.DeleteFile(audioTestPath);
+            }
+            catch (Exception)
+            {
+
+            }
+            if (StartRecordAudio(audioTestPath))
+            {
+                MicrophoneName = GetMicrophone();
+            }
+            StopRecordAudio();
             if (string.IsNullOrWhiteSpace(MicrophoneName))
             {
                 myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" " + PathName;
@@ -205,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())
             {
-                Thread.Sleep(500);
-                while (myProcess != null)
+                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);
                 }
-                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));
+
+            Thread.Sleep(100);
+            FileToolsCommon.DeleteDirectory(FileToolsCommon.GetDirectoryName(VideoSavePath) + "temp");
 
-                //Dispatcher.Invoke(() =>
-                //{
-                //});
-                //// 允许不同线程间的调用
-                //Control.CheckForIllegalCrossThreadCalls = false;
-            }))).Start();
+            //Dispatcher.Invoke(() =>
+            //{
+            //});
+            //// 允许不同线程间的调用
+            //Control.CheckForIllegalCrossThreadCalls = false;
         }
 
         /// <summary>
@@ -307,15 +339,24 @@ namespace Common.system
             //路径
             string FilePath = (string)FilePathobj;
             string Path = FileToolsCommon.GetDirectoryName(FilePath);
-            Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            foreach (var KillProcess in KillProcessArray)
-            {
-                KillProcess.Kill();
-            }
+            string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
+            //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的绝对路径
-            myProcess.StartInfo.Arguments = "-f concat  -safe 0 -i " + Path + "temp/filelist.d -c copy " + FilePath;
+            if (Extension.ToUpper() == ".MP3")
+            {
+                myProcess.StartInfo.Arguments = "-f concat  -safe 0 -i " + Path + "temp/filelist.d -c copy " + FilePath;
+            }
+            else
+            {
+
+                myProcess.StartInfo.Arguments = "-f concat  -safe 0 -i " + Path + "temprs/filelist.d -c copy " + FilePath;
+            }
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
             myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -341,11 +382,16 @@ namespace Common.system
             }
             #endregion
             myProcess = null;
-            FileToolsCommon.DeleteDirectory(Path + "temp/");
+            if (Extension.ToUpper() == ".MP3")
+            {
+                FileToolsCommon.DeleteDirectory(Path + "temp/");
+            }
+            else
+                FileToolsCommon.DeleteDirectory(Path + "temprs/");
         }
 
         /// <summary>
-        /// 获取文件完整路径
+        /// 获取文件完整路径 音频
         /// </summary>
         /// <param name="FilePath">文件路径</param>
         /// <returns></returns>
@@ -374,6 +420,35 @@ namespace Common.system
             return CompleteFilePath;
         }
 
+        /// <summary>
+        /// 获取文件完整路径 录屏
+        /// </summary>
+        /// <param name="FilePath">文件路径</param>
+        /// <returns></returns>
+        string GetRSFilePathName(string FilePath)
+        {
+            //路径
+            string Path = FileToolsCommon.GetDirectoryName(FilePath);
+            //Path.GetFileName(FilePath);//获取文件名
+            string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
+            string tempFilePath = Path + "temprs/";
+            //创建临时目录
+            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>
@@ -381,45 +456,45 @@ namespace Common.system
         /// <param name="ImagePath">图片地址</param>
         public void GenerateThumbnails(string VideoPath, string ImagePath)
         {
-                while (myProcess != null)
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
+            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的绝对路径
+                                                                                                                  //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 = false;
+                Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
+                foreach (var KillProcess in ProcessArray)
                 {
+                    IsRunning = true;
                     Thread.Sleep(100);
                 }
-                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的绝对路径
-                                                                                                                      //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 = false;
-                    Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
-                    foreach (var KillProcess in ProcessArray)
-                    {
-                        IsRunning = true;
-                        Thread.Sleep(100);
-                    }
-                }
-                #endregion
-                myProcess = null;
+            }
+            #endregion
+            myProcess = null;
         }
 
         /// <summary>
@@ -555,6 +630,52 @@ namespace Common.system
             return devs;
         }
 
+        //录制麦克风的声音
+        WaveInEvent waveIn = null; //new WaveInEvent();
+        /// <summary>
+        /// 开始录制
+        /// </summary>
+        public bool StartRecordAudio(string audioFile)
+        {
+            try
+            {
+                waveIn = new WaveInEvent();
+                //生成音频文件的对象
+                WaveFileWriter writer = new WaveFileWriter(audioFile, waveIn.WaveFormat);
+                //开始录音，写数据
+                waveIn.DataAvailable += (s, a) =>
+                {
+                    writer.Write(a.Buffer, 0, a.BytesRecorded);
+                };
+
+                //结束录音
+                waveIn.RecordingStopped += (s, a) =>
+                {
+                    writer.Dispose();
+                    writer = null;
+                    waveIn.Dispose();
+                };
+                waveIn.StartRecording();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【麦克风】麦克风不可用:" + ex.Message, ex);
+                return false;
+            }
+        }
 
+        //结束录制
+        public void StopRecordAudio()
+        {
+            try
+            {
+                waveIn.StopRecording();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【麦克风】麦克风不可用:" + ex.Message, ex);
+            }
+        }
     }
 }

Common/system/FileToolsCommon.cs

@@ -788,11 +788,20 @@ namespace Common.system
         /// 删除指定目录及其所有子目录  
         /// </summary>  
         /// <param name="directoryPath">指定目录的绝对路径</param>  
-        public static void DeleteDirectory(string directoryPath)
+        public static bool DeleteDirectory(string directoryPath)
         {
-            if (IsExistDirectory(directoryPath))
+            try
             {
-                Directory.Delete(directoryPath, true);
+                if (IsExistDirectory(directoryPath))
+                {
+                    Directory.Delete(directoryPath, true);
+                }
+                return true;
+            }
+            catch (Exception)
+            {
+                //目录中有文件占用
+                return false;
             }
         }
         #endregion

XHWK.WKTool/App.cs

@@ -137,11 +137,13 @@ namespace XHWK.WKTool
         [STAThread]
         private static void Main()
         {
+            StopSameProcess();
+            Killffmpeg();
+            LatticeFileHelper.RunPrintConfig();
             try
             {
                 UserInfo = new Model_UserInfo();
                 WKDataList = new List<Model_WKData>();
-                WKData = new Model_WKData();
                 VideoList = new List<Model_Video>();
                 #region 强制以管理员方式运行 修改人：赵耀 修改时间：2020年9月7日
                 WindowsIdentity identity = WindowsIdentity.GetCurrent();
@@ -186,9 +188,6 @@ namespace XHWK.WKTool
                 string ErrMessage = "【进程】(Main):进程意外关闭。 " + ex.Message;
                 LogHelper.WriteErrLog(ErrMessage, ex);
             }
-            StopSameProcess();
-            Killffmpeg();
-            LatticeFileHelper.RunPrintConfig();
         }
 
         #region 杀死已存在的进程
@@ -201,7 +200,7 @@ namespace XHWK.WKTool
             Process[] processList = Process.GetProcesses();
             foreach (Process process in processList)
             {
-                if (process.ProcessName.ToUpper() == "XHSCHOOL")
+                if (process.ProcessName.ToUpper() == "星火微课")
                 {
                     if (process.Id != current.Id) //忽略当前进程
                     {
@@ -249,30 +248,23 @@ namespace XHWK.WKTool
         {
             try
             {
-                if (UserInfo == null)
+                WKData.VideoList = VideoList;
+                if (WKDataList != null)
                 {
-                    return;
+                    WKDataList.RemoveAll(x => x.WkPath == WKData.WkPath);
                 }
-                if (!string.IsNullOrWhiteSpace(APP.UserInfo.Username))
+                else
                 {
-                    WKData.VideoList = VideoList;
-                    if (WKDataList != null)
-                    {
-                        WKDataList.RemoveAll(x => x.WkName == WKData.WkName);
-                    }
-                    else
-                    {
-                        WKDataList = new List<Model_WKData>();
-                    }
-                    WKDataList.Add(WKData);
-                    //string WkDateXmlStr = XmlUtilHelper.Serializer(typeof(Model_WKData), WKData);
-                    string WkDateXmlStr = XmlUtilHelper.XmlSerialize(WKDataList);
-                    string SavePath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + "/");
-                    FileToolsCommon.CreateDirectory(SavePath);
-                    string SaveName = SavePath + "UserWkDate.d";
-                    FileToolsCommon.DeleteFile(SaveName);
-                    FileToolsCommon.WriteText(SaveName, WkDateXmlStr);
+                    WKDataList = new List<Model_WKData>();
                 }
+                WKDataList.Add(WKData);
+                //string WkDateXmlStr = XmlUtilHelper.Serializer(typeof(Model_WKData), WKData);
+                string WkDateXmlStr = XmlUtilHelper.XmlSerialize(WKDataList);
+                string SavePath = FileToolsCommon.GetFileAbsolutePath("/Data/");
+                FileToolsCommon.CreateDirectory(SavePath);
+                string SaveName = SavePath + "WkDate.d";
+                FileToolsCommon.DeleteFile(SaveName);
+                FileToolsCommon.WriteText(SaveName, WkDateXmlStr);
             }
             catch (Exception ex)
             {
@@ -282,24 +274,23 @@ namespace XHWK.WKTool
         /// <summary>
         /// 读取微课信息 
         /// </summary>
-        public static void ReadWkData()
+        public static void ReadWkData(string WkPath)
         {
             try
             {
-                if (UserInfo == null)
+                string SavePath = FileToolsCommon.GetFileAbsolutePath("/Data/");
+                FileToolsCommon.CreateDirectory(SavePath);
+                string SaveName = SavePath + "WkDate.d";
+                //文件若存在则读取
+                if (FileToolsCommon.IsExistFile(SaveName))
                 {
-                    return;
-                }
-                if (!string.IsNullOrWhiteSpace(APP.UserInfo.Username))
-                {
-                    string SavePath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + "/");
-                    FileToolsCommon.CreateDirectory(SavePath);
-                    string SaveName = SavePath + "UserWkDate.d";
-                    //文件若存在则读取
-                    if (FileToolsCommon.IsExistFile(SaveName))
+                    string WkDateXmlStr = FileToolsCommon.FileToString(SaveName);
+                    WKDataList = XmlUtilHelper.DESerializer<List<Model_WKData>>(WkDateXmlStr);
+                    if (WKDataList.Exists(x => x.WkPath == WkPath))
                     {
-                        string WkDateXmlStr = FileToolsCommon.FileToString(SaveName);
-                        WKDataList = XmlUtilHelper.DESerializer<List<Model_WKData>>(WkDateXmlStr);
+                        WKData = WKDataList.Find(x => x.WkPath == WkPath);
+                        VideoList = new List<Model_Video>();
+                        VideoList = WKData.VideoList;
                     }
                 }
             }
@@ -342,7 +333,6 @@ namespace XHWK.WKTool
             try
             {
                 PageDrawList = new List<Model_DrawData>();
-                FileToolsCommon.CreateDirectory(WKData.WkPath);
                 string SavePath = WKData.WkPath + "PageData.d";
                 if (FileToolsCommon.IsExistFile(SavePath))
                 {

XHWK.WKTool/CountdownWindow.xaml

@@ -11,7 +11,7 @@
     WindowStartupLocation="CenterOwner" WindowState="Maximized"
     WindowStyle="None">
     <Window.Background>
-        <SolidColorBrush Opacity="0.96" Color="#292C2E" />
+        <SolidColorBrush Opacity="0.10" Color="#292C2E" />
     </Window.Background>
     <Grid>
         <!--<Image x:Name="ImgGif"

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -5,8 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="MainWindow" Height="341" Width="454"   AllowsTransparency="True"
-    ShowInTaskbar="False"
+        Title="星火微课" Height="341" Width="454"   AllowsTransparency="True"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None">
     <Viewbox>

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -84,14 +84,22 @@ namespace XHWK.WKTool
                 System.Windows.MessageBox.Show("路径不可为空！");
                 return;
             }
-            APP.WKData.WkPath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/"+APP.UserInfo.Username + "/";
             #endregion
+            string wkpath=FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim()+"/";
+            //读取微课数据
+            APP.ReadWkData(wkpath);
+            if(APP.WKData==null)
+            {
+                APP.WKData = new Model.Model_WKData();
+                APP.WKData.WkPath = wkpath;
+                APP.WKData.WkName = txbExplainName.Text;
+                APP.WKData.WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            }
             //创建文件夹
             FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
             //存储文件
             FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Text);
-            APP.WKData.WkName = txbExplainName.Text;
-            APP.WKData.WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            APP.ReadDrawData();
             #region 微课不允许有多个视频 废弃
             ////判断微课是否存在，存在则询问
             //if (APP.WKDataList != null&& APP.WKDataList.Count>0)

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -274,8 +274,6 @@ namespace XHWK.WKTool
             }
         }
 
-
-
         public static List<T> FindChilds<T>(DependencyObject parent, string childName)
   where T : DependencyObject
         {

XHWK.WKTool/LoginWindow.xaml.cs

@@ -104,9 +104,6 @@ namespace XHWK.WKTool
                 APP.IsLoginType = true;
                 txbAccountNumber.Text = string.Empty;
                 pobPassword.Password = string.Empty;
-                //读取微课数据
-                APP.ReadWkData();
-                APP.ReadDrawData();
                 #region 登陆后 根据用户名设置微课路径 废弃
                 //APP.WKData.WkPath += APP.UserInfo.Username + "/";
                 ////判断微课是否存在，存在则询问

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -162,7 +162,7 @@ namespace XHWK.WKTool
         {
             //FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
             FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
+            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "tempsr/");
             VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
             int num = 1;
             while(FileToolsCommon.IsExistFile(VideoSavePathName))
@@ -220,6 +220,22 @@ namespace XHWK.WKTool
                 TimeOut();
                 IsSuspend = true;
                 ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
+                #region 2秒内不可点击
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        BtnRecordingScreen.IsEnabled = false;
+                        BtnStopRecordingScreen.IsEnabled = false;
+                    });
+                    Thread.Sleep(2000);
+                    Dispatcher.Invoke(() =>
+                    {
+                        BtnRecordingScreen.IsEnabled = true;
+                        BtnStopRecordingScreen.IsEnabled = true;
+                    });
+                }))).Start();
+                #endregion
                 try
                 {
                     APP.FFmpeg.SuspendFFmpeg();
@@ -291,6 +307,7 @@ namespace XHWK.WKTool
                         //保存数据
                         APP.SaveWkData();
                     }))).Start();
+                    Click_stopRecordingScreen();
                 }
                 catch (Exception ex)
                 {
@@ -539,7 +556,14 @@ namespace XHWK.WKTool
         }
         #endregion
         #endregion
-
+        /// <summary>
+        /// 停止录屏
+        /// </summary>
+        public delegate void StopRecordingScreen();
+        /// <summary>
+        /// 停止录屏
+        /// </summary>
+        public event StopRecordingScreen Click_stopRecordingScreen;
 
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -306,6 +306,7 @@ namespace XHWK.WKTool
             {
                 APP.W_ScreenRecordingToolbarWindow.Initialize();
             }
+            APP.W_ScreenRecordingToolbarWindow.Click_stopRecordingScreen += W_ScreenRecordingToolbarWindow_Click_stopRecordingScreen;
             //显示在右下角
             APP.W_ScreenRecordingToolbarWindow.WindowStartupLocation = WindowStartupLocation.Manual;
             APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.DESKTOP.Width - APP.W_ScreenRecordingToolbarWindow.Width - 60;
@@ -313,8 +314,30 @@ namespace XHWK.WKTool
             APP.W_ScreenRecordingToolbarWindow.Topmost = true;
             APP.W_ScreenRecordingToolbarWindow.Show();
             Hide();
-            TxbRecordScreenWord.Text = "录屏";
         }
+        /// <summary>
+        /// 保存录屏中
+        /// </summary>
+        private void W_ScreenRecordingToolbarWindow_Click_stopRecordingScreen()
+        {
+            TxbRecordScreenWord.Text = "保存中";//
+            btnScreenRecording.IsEnabled = false;
+
+            new Thread(new ThreadStart(new Action(() =>
+            {
+                while (FileToolsCommon.IsExistDirectory(APP.WKData.WkPath + "temprs/"))
+                {
+                    Thread.Sleep(100);
+                }
+                Dispatcher.Invoke(() =>
+                {
+                    btnScreenRecording.IsEnabled = true;
+                    TxbRecordScreenWord.Text = "录屏";
+                });
+            }))).Start();
+
+        }
+
         /// <summary>
         /// 上传事件
         /// </summary>
@@ -1140,7 +1163,7 @@ namespace XHWK.WKTool
                 else
                 {
                     APP.W_CountdownWindow.Initialize();
-                    APP.W_CountdownWindow.Topmost = true;
+                    //APP.W_CountdownWindow.Topmost = true;
                 }
                 APP.W_CountdownWindow.Show();
                 #endregion
@@ -1151,6 +1174,22 @@ namespace XHWK.WKTool
                 ImgStop.Visibility = Visibility.Collapsed;
                 ImgStopTwo.Visibility = Visibility.Visible;
                 TxbRecordingWord.Text = "暂停";
+                #region 2秒内不可点击
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        BtnRecord.IsEnabled = false;
+                        btnStop.IsEnabled = false;
+                    });
+                    Thread.Sleep(2000);
+                    Dispatcher.Invoke(() =>
+                    {
+                        BtnRecord.IsEnabled = true;
+                        btnStop.IsEnabled = true;
+                    });
+                }))).Start();
+                #endregion
                 try
                 {
                     APP.FFmpeg.StartRecordingAudio(AudioPathName);
@@ -1177,6 +1216,22 @@ namespace XHWK.WKTool
                 ImgStop.Visibility = Visibility.Visible;
                 ImgStopTwo.Visibility = Visibility.Collapsed;
                 TxbRecordingWord.Text = "继续";
+                #region 2秒内不可点击
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        BtnRecord.IsEnabled = false;
+                        btnStop.IsEnabled = false;
+                    });
+                    Thread.Sleep(2000);
+                    Dispatcher.Invoke(() =>
+                    {
+                        BtnRecord.IsEnabled = true;
+                        btnStop.IsEnabled = true;
+                    });
+                }))).Start();
+                #endregion
                 try
                 {
                     APP.FFmpeg.SuspendFFmpeg();
@@ -1258,12 +1313,30 @@ namespace XHWK.WKTool
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
                 ImgStop.Visibility = Visibility.Visible;
                 ImgStopTwo.Visibility = Visibility.Collapsed;
-                TxbRecordingWord.Text = "已录制";
+                TxbRecordingWord.Text = "保存中";
+                #region 2秒内不可点击
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        BtnRecord.IsEnabled = false;
+                        btnStop.IsEnabled = false;
+                    });
+                }))).Start();
+                #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);
@@ -1273,27 +1346,36 @@ 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);
                         }
+                        while (FileToolsCommon.IsExistDirectory(FileToolsCommon.GetDirectoryName(VideoSavePathName) + "temp/"))
+                        {
+                            Thread.Sleep(100);
+                        }
+                        Dispatcher.Invoke(() =>
+                        {
+                            BtnRecord.IsEnabled = true;
+                            btnStop.IsEnabled = true;
+                            TxbRecordingWord.Text = "录制";
+                        });
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
                         VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                         Thread.Sleep(500);
@@ -2283,10 +2365,14 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnShrink_Click(object sender, RoutedEventArgs e)
         {
-            if (Visibility == Visibility.Hidden)
-                Visibility = Visibility.Visible;
+            if (this.WindowState == WindowState.Minimized)
+            {
+                this.WindowState = WindowState.Normal;
+            }
             else
-                Visibility = Visibility.Hidden;
+            {
+                this.WindowState = WindowState.Minimized;
+            }
         }
         /// <summary>
         /// 位置确定
@@ -2299,5 +2385,6 @@ namespace XHWK.WKTool
             //btnOk.Visibility = Visibility.Collapsed;
             //blackboard_canvas.Visibility = Visibility.Visible;
         }
+
     }
 }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{57591E23-644E-416D-B1CA-BB04C550130F}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>XHWK.WKTool</RootNamespace>
-    <AssemblyName>XHWK.WKTool</AssemblyName>
+    <AssemblyName>星火微课</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -146,6 +146,9 @@
     <Compile Include="PrintWindow.xaml.cs">
       <DependentUpon>PrintWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PromptWindow.xaml.cs">
+      <DependentUpon>PromptWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ScreenRecordingToolbarWindow.xaml.cs">
       <DependentUpon>ScreenRecordingToolbarWindow.xaml</DependentUpon>
     </Compile>
@@ -177,6 +180,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="PromptWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>