冲突

Common/Model/DownloadInfoModel.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 
 namespace Common.Model
 {
@@ -91,14 +88,14 @@ namespace Common.Model
         /// </summary>
         public List<string> downloadUrlList
         {
-            get {return _downloadUrlList;}
+            get { return _downloadUrlList; }
 
             set
             {
                 List<string> UTF8ValueList = new List<string>();
                 foreach (string val in value)
                 {
-                    string path = val.Substring(0, val.LastIndexOf("/")+1);
+                    string path = val.Substring(0, val.LastIndexOf("/") + 1);
                     string name = val.Substring(val.LastIndexOf("/") + 1);
                     string UTF8Name = System.Web.HttpUtility.UrlEncode(name);
                     string UTF8Url = path + UTF8Name;

Common/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的一般信息由以下

Common/system/CLeopardZip.cs

@@ -1,11 +1,9 @@
-using System;
+using ICSharpCode.SharpZipLib.Checksums;
+using ICSharpCode.SharpZipLib.Zip;
+
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
-using ICSharpCode.SharpZipLib;
-using ICSharpCode.SharpZipLib.Zip;
-using ICSharpCode.SharpZipLib.Checksums;
 
 namespace Common.system
 {

Common/system/CameraHelper.cs

@@ -1,10 +1,10 @@
-using System;
-using System.Windows;
-using System.IO;
+using AForge.Controls;
+using AForge.Video.DirectShow;
+
+using System;
 using System.Drawing;
 using System.Drawing.Imaging;
-using AForge.Video.DirectShow;
-using AForge.Controls;
+using System.IO;
 
 
 namespace Common.system

Common/system/DataConvertCommon.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Common.system
+namespace Common.system
 {
     /// <summary>
     /// 数据转换帮助类

Common/system/DownloadManager.cs

@@ -1,9 +1,9 @@
 using Common.Model;
+
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 
 namespace Common.system
@@ -110,7 +110,7 @@ namespace Common.system
                             }
                             catch (Exception)//无法获取文件名时  使用传入保存名称
                             {
-                                dlInfo.fileName = dlInfo.saveFileName; 
+                                dlInfo.fileName = dlInfo.saveFileName;
                             }
 
                             //默认给流总数

Common/system/DownloadService.cs

@@ -1,10 +1,8 @@
 using Common.Model;
+
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
-using System.Text;
 
 namespace Common.system
 {

Common/system/FFMpeg.cs

@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading;
 
 using VisioForge.Shared.NAudio.CoreAudioApi;
@@ -96,7 +93,7 @@ namespace Common.system
         /// 录制音频
         /// </summary>
         /// <param name="Mp3Path">MP3音频位置</param>
-        private void StartRecordingAudio(string Mp3Path)
+        public void StartRecordingAudio(string Mp3Path)
         {
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
             Debug.WriteLine(KillProcessArray.Length.ToString());
@@ -168,7 +165,7 @@ namespace Common.system
         /// <param name="Frequency">每秒帧率</param>
         /// <param name="VideoWidth">视频宽度</param>
         /// <param name="VideoHeight">视频高度</param>
-        private void SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight)
+        public void SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight)
         {
             Thread thread = new Thread(delegate ()
             {
@@ -296,7 +293,7 @@ namespace Common.system
         /// </summary>
         /// <param name="VideoPath">视频地址</param>
         /// <param name="ImagePath">图片地址</param>
-        void GenerateThumbnails(string VideoPath, string ImagePath)
+        public void GenerateThumbnails(string VideoPath, string ImagePath)
         {
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
             Debug.WriteLine(KillProcessArray.Length.ToString());

Common/system/FileToolsCommon.cs

@@ -1,9 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
-using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
 namespace Common.system
@@ -15,6 +14,8 @@ namespace Common.system
     /// </summary>
     public static class FileToolsCommon
     {
+        #region 获取文件的绝对路径
+
         /// <summary>
         /// 获取文件的绝对路径
         /// </summary>
@@ -43,6 +44,61 @@ namespace Common.system
                 return Path;
             }
         }
+        /// <summary>
+        /// 获取合法路径 结尾带/
+        /// </summary>
+        /// <returns></returns>
+        public static string GetLegalPath(string FilePath)
+        {
+            FilePath = System.IO.Path.Combine(FilePath.Replace("\\", "/"));
+            FilePath += (FilePath.Substring(FilePath.Length - 1, 1) == "/" ? "" : "/");
+            return FilePath;
+        }
+        #endregion
+
+        #region 检测路径是否合法
+        /// <summary>
+        /// 检测路径是否合法
+        /// </summary>
+        /// <param name="FilePathName">绝对路径</param>
+        /// <param name="ErrMessage">返回错误</param>
+        /// <returns></returns>
+        public static bool IsLegalPath(string FilePathName, out string ErrMessage)
+        {
+            string FilePath;
+            string FileName;
+            ErrMessage = "";
+            try
+            {
+                FilePath = GetDirectoryName(FilePathName);
+                FileName = GetIOFileName(FilePathName);
+            }
+            catch (Exception)
+            {
+                ErrMessage = "路径或文件名不合法！";
+                return false;
+            }
+            Regex regex = new Regex(@"^([a-zA-Z]:\\)?[^\/\:\*\?\""\<\>\|\,]*$");
+            Match m = regex.Match(FilePath);
+            if (!m.Success)
+            {
+                ErrMessage = "非法的文件保存路径！";
+                return false;
+            }
+            if (!string.IsNullOrWhiteSpace(FileName))
+            {
+                regex = new Regex(@"^[^\/\:\*\?\""\<\>\|\,]+$");
+                m = regex.Match(FileName);
+                if (!m.Success)
+                {
+                    ErrMessage = "非法的文件名！文件名中包含\\ / : * ？ \" < > |等字符!";
+                    return false;
+                }
+            }
+            return true;
+
+        }
+        #endregion
 
         #region 检测指定目录是否存在
         /// <summary>  
@@ -128,7 +184,7 @@ namespace Common.system
             try
             {
                 //获取指定的文件列表  
-                string[] fileNames = GetFileNames(directoryPath, searchPattern, true);
+                string[] fileNames = GetFileNames(directoryPath, searchPattern, isSearchChild);
 
                 //判断指定文件是否存在  
                 return fileNames.Length != 0;
@@ -292,7 +348,7 @@ namespace Common.system
                 return null;//throw new FileNotFoundException();
             }
             DirectoryInfo folder = new DirectoryInfo(directoryPath);
-            FileInfo[] fileList = null;
+            FileInfo[] fileList;
             if (files == null)
                 fileList = folder.GetFiles();
             else
@@ -610,7 +666,7 @@ namespace Common.system
 
         #region 从文件的绝对路径中获取路径名
         /// <summary>  
-        /// 从文件的绝对路径中获取扩展名  
+        /// 使用IO从文件的绝对路径中获取路径名  
         /// </summary>  
         /// <param name="filePath">文件的绝对路径</param>          
         public static string GetDirectoryName(string filePath)
@@ -695,7 +751,7 @@ namespace Common.system
         /// </summary>
         /// <param name="directoryPath">目录地址</param>
         /// <returns> 单位：MB</returns>
-        public static double pathSize(string directoryPath)
+        public static double PathSize(string directoryPath)
         {
             DirectoryInfo folder = new DirectoryInfo(directoryPath);
             double DirectorySize = DirSize(folder);

Common/system/FreeMemoryHelper.cs

@@ -1,10 +1,7 @@
 using Microsoft.Win32;
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Common.system
 {

Common/system/HttpHelper.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using System.Threading;
 
 namespace Common.system

Common/system/ImageHelper.cs

@@ -1,14 +1,11 @@
 using System;
-using System.Collections.Generic;
+using System.Configuration;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
-using System.Windows.Media.Imaging;
 using System.Windows;
-using System.Linq;
-using System.Text;
-using System.Drawing.Imaging;
-using System.Configuration;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 namespace Common.system
 {

Common/system/LogHelper.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using log4net;
 
 namespace Common.system
 {
@@ -10,7 +6,7 @@ namespace Common.system
     {
         public static readonly log4net.ILog loginfo = log4net.LogManager.GetLogger("loginfo");
         public static readonly log4net.ILog logerror = log4net.LogManager.GetLogger("logerror");
-        public static void WriteInfoLog(string info) 
+        public static void WriteInfoLog(string info)
         {
             if (loginfo.IsInfoEnabled)
             {

Common/system/PrimaryScreen.cs

@@ -38,9 +38,11 @@ namespace Common.system
             get
             {
                 IntPtr hdc = GetDC(IntPtr.Zero);
-                Size size = new Size();
-                size.Width = GetDeviceCaps(hdc, HORZRES);
-                size.Height = GetDeviceCaps(hdc, VERTRES);
+                Size size = new Size
+                {
+                    Width = GetDeviceCaps(hdc, HORZRES),
+                    Height = GetDeviceCaps(hdc, VERTRES)
+                };
                 ReleaseDC(IntPtr.Zero, hdc);
                 return size;
             }
@@ -79,9 +81,11 @@ namespace Common.system
             get
             {
                 IntPtr hdc = GetDC(IntPtr.Zero);
-                Size size = new Size();
-                size.Width = GetDeviceCaps(hdc, DESKTOPHORZRES);
-                size.Height = GetDeviceCaps(hdc, DESKTOPVERTRES);
+                Size size = new Size
+                {
+                    Width = GetDeviceCaps(hdc, DESKTOPHORZRES),
+                    Height = GetDeviceCaps(hdc, DESKTOPVERTRES)
+                };
                 ReleaseDC(IntPtr.Zero, hdc);
                 return size;
             }
@@ -95,8 +99,8 @@ namespace Common.system
             get
             {
                 IntPtr hdc = GetDC(IntPtr.Zero);
-                int t = GetDeviceCaps(hdc, DESKTOPHORZRES);
-                int d = GetDeviceCaps(hdc, HORZRES);
+                /*int t = */GetDeviceCaps(hdc, DESKTOPHORZRES);
+               /* int d = */GetDeviceCaps(hdc, HORZRES);
                 float ScaleX = (float)GetDeviceCaps(hdc, DESKTOPHORZRES) / (float)GetDeviceCaps(hdc, HORZRES);
                 ReleaseDC(IntPtr.Zero, hdc);
                 return ScaleX;

Common/system/SplashScreen.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 
@@ -32,7 +29,7 @@ namespace Common.system
                 throw (new Exception());
             }
 
-            _SplashThread = new Thread(new ThreadStart(delegate()
+            _SplashThread = new Thread(new ThreadStart(delegate ()
             {
                 CreateInstance(splashFormType);
                 Application.Run(_SplashForm);

Common/system/XmlUtilHelper.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Data;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
 

XHWK.Model/Class1.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XHWK.Model
-{
-    public class Class1
-    {
-    }
-}

XHWK.Model/Model_UserInfo.cs

@@ -0,0 +1,8 @@
+namespace XHWK.Model
+{
+    public class Model_UserInfo
+    {
+        string _wkName;
+        public string WkName { get => _wkName; set => _wkName = value; }
+    }
+}

XHWK.Model/Model_Video.cs

@@ -0,0 +1,69 @@
+namespace XHWK.Model
+{
+    /// <summary>
+    /// 视频模型
+    /// </summary>
+    public class Model_Video
+    {
+        private string _videPath;
+        private string _thumbnailPath;
+        private Emum_VideoType _videoType;
+        private Enum_WKVidetype _wkType;
+        private string _RSTime;
+        private string _videoSize;
+        private string _drawDataPath;
+        /// <summary>
+        /// 视频路径
+        /// </summary>
+        public string VidePath { get => _videPath; set => _videPath = value; }
+        /// <summary>
+        /// 缩略图路径
+        /// </summary>
+        public string ThumbnailPath { get => _thumbnailPath; set => _thumbnailPath = value; }
+        /// <summary>
+        /// 视频类型
+        /// </summary>
+        public Emum_VideoType VideoType { get => _videoType; set => _videoType = value; }
+        /// <summary>
+        /// 微课类型
+        /// </summary>
+        public Enum_WKVidetype WkType { get => _wkType; set => _wkType = value; }
+        /// <summary>
+        /// 录制时间
+        /// </summary>
+        public string RSTime { get => _RSTime; set => _RSTime = value; }
+        /// <summary>
+        /// 视频大小
+        /// </summary>
+        public string VideoSize { get => _videoSize; set => _videoSize = value; }
+        /// <summary>
+        /// 画板数据存储路径
+        /// </summary>
+        public string DrawDataPath { get => _drawDataPath; set => _drawDataPath = value; }
+    }
+    /// <summary>
+    /// 视频格式类型
+    /// </summary>
+    public enum Emum_VideoType
+    {
+        MP4 = 1,
+        FlV = 2,
+        AVI = 3
+    }
+
+    /// <summary>
+    /// 录制视频类型
+    /// </summary>
+    public enum Enum_WKVidetype
+    {
+        /// <summary>
+        /// 录屏
+        /// </summary>
+        RecordingScreen = 1,
+        /// <summary>
+        /// 录课
+        /// </summary>
+        RecordingLessons = 2
+    }
+
+}

XHWK.Model/Model_WKData.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace XHWK.Model
+{
+    public class Model_WKData
+    {
+        private string _wkName;
+        private List<Model_Video> _videoList;
+        private string _wkPath;
+        /// <summary>
+        /// 微课名
+        /// </summary>
+        public string WkName { get => _wkName; set => _wkName = value; }
+        /// <summary>
+        /// 视频列表
+        /// </summary>
+        public List<Model_Video> VideoList { get => _videoList; set => _videoList = value; }
+        /// <summary>
+        /// 微课路径
+        /// </summary>
+        public string WkPath { get => _wkPath; set => _wkPath = value; }
+    }
+}

XHWK.Model/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的一般信息由以下

XHWK.Model/XHWK.Model.csproj

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>445a4527-849b-4fa9-aa97-8ed1098d211e</ProjectGuid>
+    <ProjectGuid>{445A4527-849B-4FA9-AA97-8ED1098D211E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XHWK.Model</RootNamespace>
@@ -31,24 +31,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System"/>
-    
-    <Reference Include="System.Core"/>
-    <Reference Include="System.Xml.Linq"/>
-    <Reference Include="System.Data.DataSetExtensions"/>
-    
-    
-    <Reference Include="Microsoft.CSharp"/>
-    
-    <Reference Include="System.Data"/>
-    
-    <Reference Include="System.Net.Http"/>
-    
-    <Reference Include="System.Xml"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Class1.cs" />
+    <Compile Include="Model_UserInfo.cs" />
+    <Compile Include="Model_Video.cs" />
+    <Compile Include="Model_WKData.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- </Project>
+</Project>

XHWK.WKTool/App.config

@@ -7,7 +7,7 @@
     <!--图片压缩等级-->
     <add key="ImageCompressionLevel" value="30" />
     <!--文件存放路径  路径\账户名\讲解名称_x.MP4-->
-    <add key="VideoSavePath" value="30" />
+    <add key="VideoSavePath" value="D:\星火微课" />
     <!--视频格式 1、MP4 2、FlV 3、AVI-->
     <add key="VideoType" value="1" />
   </appSettings>

XHWK.WKTool/App.cs

@@ -1,19 +1,30 @@
 using Common.system;
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
 
+using XHWK.Model;
+
 namespace XHWK.WKTool
 {
     public partial class APP : Application
     {
+        #region 全局变量
+        /// <summary>
+        /// 微课模型
+        /// </summary>
+        public static Model_WKData WKData = null;
+        /// <summary>
+        /// 讲解名称
+        /// </summary>
+        public static string WkName = null;
+        /// <summary>
+        /// 微课保存路径
+        /// </summary>
+        public static string WkSavePath = null;
         /// <summary>
         /// 主页面
         /// </summary>
@@ -26,6 +37,7 @@ namespace XHWK.WKTool
         /// 录像工具栏
         /// </summary>
         public static ScreenRecordingToolbarWindow W_ScreenRecordingToolbarWindow = null;
+        #endregion
 
         [STAThread]
         private static void Main()

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -1,19 +1,6 @@
-using AForge.Imaging;
-using Common.system;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 
 namespace XHWK.WKTool
@@ -35,8 +22,10 @@ namespace XHWK.WKTool
             //this.Hide();
             //MediaElement.Position
             //((MediaElement)((object)ImgGif)).Position= TimeSpan.Zero;
-            timer = new DispatcherTimer();
-            timer.Interval = TimeSpan.FromMilliseconds(2500);
+            timer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromMilliseconds(2500)
+            };
             timer.Tick += Timer_Tick;
             timer.Start();
         }
@@ -66,7 +55,6 @@ 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

@@ -1,25 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Common.system;
+
+using System;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Forms;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace XHWK.WKTool
 {
     /// <summary>
     /// 创建微课
     /// </summary>
-    public partial class CreateAMicroLessonWindow : Window 
+    public partial class CreateAMicroLessonWindow : Window
     {
         #region 字段
         private FolderBrowserDialog ofd;
@@ -32,6 +23,7 @@ namespace XHWK.WKTool
         public CreateAMicroLessonWindow()
         {
             InitializeComponent();
+            txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
         }
 
         #region 事件
@@ -40,7 +32,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnDown_Click(object sender, RoutedEventArgs e)
+        private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
 
         }
@@ -49,7 +41,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnBrowse_Click(object sender, RoutedEventArgs e)
+        private void BtnBrowse_Click(object sender, RoutedEventArgs e)
         {
             string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
             ofd = new System.Windows.Forms.FolderBrowserDialog();
@@ -71,8 +63,45 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnStart_Click(object sender, RoutedEventArgs e)
+        private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
+            #region 合法性判断
+            if (string.IsNullOrWhiteSpace(txbExplainName.Text.Trim()))
+            {
+                System.Windows.MessageBox.Show("讲解名称不可为空！");
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(txbStoragePath.Text.Trim()))
+            {
+                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))
+            {
+                //微课已存在
+                MessageBoxResult dr = System.Windows.MessageBox.Show("讲解已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
+                if (dr == MessageBoxResult.OK)
+                {
+                    FileToolsCommon.DeleteDirectory(PathName);
+                }
+                else
+                {
+                    return;
+                }
+            }
+            #endregion
+            //创建文件夹
+            FileToolsCommon.CreateDirectory(PathName);
+            //存储文件
+            FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Text);
+            APP.WkName = txbExplainName.Text;
+            APP.WkSavePath = PathName;
+            FileToolsCommon.CreateDirectory(APP.WkSavePath);
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -1,16 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
+using System.Windows;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace XHWK.WKTool
 {

XHWK.WKTool/LoginWindow.xaml.cs

@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace XHWK.WKTool
 {

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -73,7 +73,7 @@
                 <Image Grid.Row="1"  Source="./Images/Toobar0.png"/>
             <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  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" 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"/>
                 </Button>
                 <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnStopRecordingScreen_Click">

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -1,17 +1,9 @@
 using Common.system;
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+
+using XHWK.Model;
 
 namespace XHWK.WKTool
 {
@@ -20,14 +12,123 @@ namespace XHWK.WKTool
     /// </summary>
     public partial class ScreenRecordingToolbarWindow : Window
     {
+        #region 初始变量
+        /// <summary>
+        /// 视频存储路径
+        /// </summary>
+        string RSPath;
+        /// <summary>
+        /// 是否正在录制
+        /// </summary>
+        bool IsStartRS = false;
+        /// <summary>
+        /// 是否暂停
+        /// </summary>
+        bool IsSuspend = true;
+        /// <summary>
+        /// 录屏
+        /// </summary>
+        FFMpeg Ffmpeg = null;
+        #endregion
+
+        #region 初始化
+        /// <summary>
+        /// 录屏工具栏
+        /// </summary>
         public ScreenRecordingToolbarWindow()
         {
             InitializeComponent();
         }
+        /// <summary>
+        /// 初始化
+        /// </summary>
         public void Initialize()
         {
+            //隐藏画笔工具栏
             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>
+        /// <param name="e"></param>
+        private void BtnRecordingScreen_Click(object sender, RoutedEventArgs e)
+        {
+            if (IsSuspend)
+            {
+                if(IsStartRS)
+                {
+                }
+                //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 = "暂停录制";
+                try
+                {
+                    RSPath = APP.WkSavePath;
+                    FileToolsCommon.CreateDirectory(RSPath);
+                    RSPath += "." + ((Emum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+                    Ffmpeg.StartRecordingVideo(RSPath);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message);
+                }
+            }
+            else
+            {
+                IsSuspend = true;
+                try
+                {
+                    Ffmpeg.SuspendFFmpeg();
+                    Ffmpeg.StopFFmpeg(RSPath);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message);
+                }
+            }
         }
+        #endregion
+
+        #region 画笔相关
         /// <summary>
         /// 画笔工具栏关闭事件
         /// </summary>
@@ -75,19 +176,6 @@ 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();
-        }
+        #endregion
     }
 }

XHWK.WKTool/UCCamera.xaml.cs

@@ -1,18 +1,6 @@
 using Common.system;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace XHWK.WKTool
 {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -170,7 +170,7 @@
                         <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="523" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
                     </Border>
                     <!--浏览按钮-->
-                    <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="btnBrowse_Click">
+                    <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1,19 +1,11 @@
 using Common.system;
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Forms;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace XHWK.WKTool
 {
@@ -51,7 +43,7 @@ namespace XHWK.WKTool
             //InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
             blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
             drawingAttributes.FitToCurve = true;
-        } 
+        }
         #endregion
 
         #region 事件
@@ -118,8 +110,10 @@ namespace XHWK.WKTool
 
             if (APP.W_ScreenRecordingToolbarWindow == null)
             {
-                APP.W_ScreenRecordingToolbarWindow = new ScreenRecordingToolbarWindow();
-                APP.W_ScreenRecordingToolbarWindow.Topmost = true;
+                APP.W_ScreenRecordingToolbarWindow = new ScreenRecordingToolbarWindow
+                {
+                    Topmost = true
+                };
                 APP.W_ScreenRecordingToolbarWindow.Initialize();
 
             }
@@ -177,7 +171,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnBrowse_Click(object sender, RoutedEventArgs e)
+        private void BtnBrowse_Click(object sender, RoutedEventArgs e)
         {
             string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
             Ofd = new System.Windows.Forms.FolderBrowserDialog();
@@ -218,7 +212,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnRed_Click(object sender, RoutedEventArgs e)
         {
-        
+
             //设置 DrawingAttributes 的 Color 属性设置颜色  
             drawingAttributes.Color = Colors.Red;
         }