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

XHWK.Model/Model_DrawData.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    /// <summary>
+    /// 画板模型
+    /// </summary>
+    public class Model_DrawData
+    {
+        private int _PageNum;
+        private string _pageCode;
+        private string _pageImagePath;
+        private PointF _ImageLocation;
+        private SizeF _ImageSize;
+        private string _PenColor;
+        private int _PenWigth;
+        //private List<PointF> _Handwriting;
+        /// <summary>
+        /// 页码
+        /// </summary>
+        public int PageNum { get => _PageNum; set => _PageNum = value; }
+        /// <summary>
+        /// 页编号
+        /// </summary>
+        public string PageCode { get => _pageCode; set => _pageCode = value; }
+        /// <summary>
+        /// 页面图片路径
+        /// </summary>
+        public string PageImagePath { get => _pageImagePath; set => _pageImagePath = value; }
+        /// <summary>
+        /// 图片坐标
+        /// </summary>
+        public PointF ImageLocation { get => _ImageLocation; set => _ImageLocation = value; }
+        /// <summary>
+        /// 图片大小
+        /// </summary>
+        public SizeF ImageSize { get => _ImageSize; set => _ImageSize = value; }
+        /// <summary>
+        /// 笔颜色 十六进制
+        /// </summary>
+        public string PenColor { get => _PenColor; set => _PenColor = value; }
+        /// <summary>
+        /// 线宽
+        /// </summary>
+        public int PenWigth { get => _PenWigth; set => _PenWigth = value; }
+        ///// <summary>
+        ///// 笔迹 暂无
+        ///// </summary>
+        //public List<PointF> Handwriting { get => _Handwriting; set => _Handwriting = value; }
+    }
+}

XHWK.Model/XHWK.Model.csproj

@@ -40,6 +40,7 @@
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -50,6 +51,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Model_Canvas.cs" />
+    <Compile Include="Model_DrawData.cs" />
     <Compile Include="Model_Page.cs" />
     <Compile Include="Model_Screenshot.cs" />
     <Compile Include="Model_UserInfo.cs" />

XHWK.WKTool/App.cs

@@ -38,35 +38,12 @@ namespace XHWK.WKTool
         /// 微课视频列表
         /// </summary>
         public static List<Model_Video> VideoList = null;
-        /// <summary>
-        /// 主页面
-        /// </summary>
-        public static XHMicroLessonSystemWindow W_XHMicroLessonSystemWindow = null;
+        public static List<Model_DrawData> PageDrawList = null;
         /// <summary>
         /// 录屏工具
         /// </summary>
         public static FFMpeg FFmpeg = new FFMpeg();
         /// <summary>
-        /// 开始录像
-        /// </summary>
-        public static CountdownWindow W_CountdownWindow = null;
-        /// <summary>
-        /// 录像工具栏
-        /// </summary>
-        public static ScreenRecordingToolbarWindow W_ScreenRecordingToolbarWindow = null;
-        /// <summary>
-        /// 登陆
-        /// </summary>
-        public static LoginWindow W_LoginWindow = null;
-        /// <summary>
-        /// 截图
-        /// </summary>
-        public static JieTuWindow W_JieTuWindow = null;
-        /// <summary>
-        /// 批注
-        /// </summary>
-        public static PracticeWindow W_PracticeWindow = null;
-        /// <summary>
         /// 登陆状态 false 未登录 true已登陆
         /// </summary>
         public static bool IsLoginType = false;
@@ -87,8 +64,8 @@ namespace XHWK.WKTool
         /// <summary>
         /// 页码IP
         /// </summary>
-        public static string[] OutPut = new string[] { }; 
-
+        public static string[] OutPut = new string[] { };
+        #region 点阵笔
         /// <summary>
         /// 点阵笔
         /// </summary>
@@ -102,6 +79,37 @@ namespace XHWK.WKTool
         /// </summary>
         public static bool PenStatus;
         #endregion
+        #region 页面
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        public static XHMicroLessonSystemWindow W_XHMicroLessonSystemWindow = null;
+        /// <summary>
+        /// 创建微课页面
+        /// </summary>
+        public static CreateAMicroLessonWindow W_CreateAMicroLessonWindow = null;
+        /// <summary>
+        /// 开始录像
+        /// </summary>
+        public static CountdownWindow W_CountdownWindow = null;
+        /// <summary>
+        /// 录像工具栏
+        /// </summary>
+        public static ScreenRecordingToolbarWindow W_ScreenRecordingToolbarWindow = null;
+        /// <summary>
+        /// 登陆
+        /// </summary>
+        public static LoginWindow W_LoginWindow = null;
+        /// <summary>
+        /// 截图
+        /// </summary>
+        public static JieTuWindow W_JieTuWindow = null;
+        /// <summary>
+        /// 批注
+        /// </summary>
+        public static PracticeWindow W_PracticeWindow = null;
+        #endregion
+        #endregion
 
         [STAThread]
         private static void Main()
@@ -113,10 +121,11 @@ namespace XHWK.WKTool
             WKData = new Model_WKData();
             VideoList = new List<Model_Video>();
             //app.DispatcherUnhandledException += MyApp_DispatcherUnhandledException;
-            CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
-            app.Run(win);
+            W_CreateAMicroLessonWindow = new CreateAMicroLessonWindow();
+            app.Run(W_CreateAMicroLessonWindow);
             //LogHelper.WriteInfoLog("启动项目");
             StopSameProcess();
+            Killffmpeg();
             LatticeFileHelper.RunPrintConfig();
         }
         /// <summary>
@@ -156,63 +165,132 @@ namespace XHWK.WKTool
             e.Handled = true;
         }
 
+        #region 数据保存和读取
         /// <summary>
         /// 保存微课信息
         /// </summary>
         public static void SaveWkData()
         {
-            if(UserInfo == null)
+            try
             {
-                return;
+                if (UserInfo == null)
+                {
+                    return;
+                }
+                if (!string.IsNullOrWhiteSpace(APP.UserInfo.Username))
+                {
+                    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);
+                }
             }
-            if (!string.IsNullOrWhiteSpace(APP.UserInfo.Username))
+            catch (Exception ex)
             {
-                WKData.VideoList = VideoList;
-                if (WKDataList != null)
+                LogHelper.WriteErrLog("【微课数据保存】（SaveWkData）保存失败：" + ex.Message, ex);
+            }
+        }
+        /// <summary>
+        /// 读取微课信息 
+        /// </summary>
+        public static void ReadWkData()
+        {
+            try
+            {
+                if (UserInfo == null)
                 {
-                    WKDataList.RemoveAll(x => x.WkName == WKData.WkName);
+                    return;
                 }
-                else
+                if (!string.IsNullOrWhiteSpace(APP.UserInfo.Username))
                 {
-                    WKDataList = new List<Model_WKData>();
+                    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);
+                    }
                 }
-                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);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【微课数据读取】（ReadWkData）读取失败：" + ex.Message, ex);
             }
         }
-
         /// <summary>
-        /// 读取微课信息
+        /// 保存画板数据
         /// </summary>
-        public static void ReadWkData()
+        public static void SaveDraw()
         {
-            if (UserInfo == null)
+            try
             {
-                return;
+                if (PageDrawList == null)
+                {
+                    return;
+                }
+                if (PageDrawList.Count < 1)
+                {
+                    return;
+                }
+                FileToolsCommon.CreateDirectory(WKData.WkPath);
+                string SavePath = WKData.WkPath + "PageData.d";
+                FileToolsCommon.DeleteFile(SavePath);
+                string PageDataXmlStr = XmlUtilHelper.XmlSerialize(PageDrawList);
+                FileToolsCommon.WriteText(SavePath, PageDataXmlStr);
             }
-            if (!string.IsNullOrWhiteSpace(APP.UserInfo.Username))
+            catch (Exception ex)
             {
-                string SavePath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + "/");
-                FileToolsCommon.CreateDirectory(SavePath);
-                string SaveName = SavePath + "UserWkDate.d";
-                if (FileToolsCommon.IsExistFile(SaveName))
+                LogHelper.WriteErrLog("【画板数据保存】（SaveDraw）保存失败：" + ex.Message, ex);
+            }
+        }
+        /// <summary>
+        /// 读取文件
+        /// </summary>
+        public static void ReadDrawData()
+        {
+            try
+            {
+                PageDrawList = new List<Model_DrawData>();
+                FileToolsCommon.CreateDirectory(WKData.WkPath);
+                string SavePath = WKData.WkPath + "PageData.d";
+                if (FileToolsCommon.IsExistFile(SavePath))
                 {
-                    string WkDateXmlStr=FileToolsCommon.FileToString(SaveName);
-                    WKDataList = XmlUtilHelper.DESerializer<List<Model_WKData>>(WkDateXmlStr);
-                    if (WKDataList != null)
-                    {
-                        WKDataList.RemoveAll(x => x.WkName == WKData.WkName);
-                    }
+                    string PageDataXmlStr = FileToolsCommon.FileToString(SavePath);
+                    PageDrawList = XmlUtilHelper.DESerializer<List<Model_DrawData>>(PageDataXmlStr);
                 }
             }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【画板数据读取】(ReadDraw)读取失败：" + ex.Message, ex);
+            }
+        }
+        #endregion
+        /// <summary>
+        /// 杀死正在运行的ffmpeg
+        /// </summary>
+        public static void Killffmpeg()
+        {
+            Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
+            foreach (var KillProcess in KillProcessArray)
+            {
+                KillProcess.Kill();
+            }
         }
-
         #region 内存处理 -创建人：赵耀 -创建时间：2020年8月12日
 
         /// <summary>

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -34,7 +34,15 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
-            System.Environment.Exit(0);
+            MessageBoxResult dr = System.Windows.MessageBox.Show("确定退出系统？", "提示", MessageBoxButton.OKCancel);
+            if (dr == MessageBoxResult.OK)
+            {
+                System.Environment.Exit(0);
+            }
+            else
+            {
+                return;
+            }
         }
         /// <summary>
         /// 浏览
@@ -76,23 +84,27 @@ namespace XHWK.WKTool
                 System.Windows.MessageBox.Show("路径不可为空！");
                 return;
             }
-            //if (!FileToolsCommon.IsLegalPath(txbStoragePath.Text.Trim(), out string ErrMessage))
-            //{
-            //    System.Windows.MessageBox.Show(ErrMessage);
-            //    return;
-            //}
             APP.WKData.WkPath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/";
-            if (FileToolsCommon.IsExistDirectory(APP.WKData.WkPath))
+            if (APP.UserInfo != null)
             {
-                //微课已存在
-                MessageBoxResult dr = System.Windows.MessageBox.Show("讲解已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
-                if (dr == MessageBoxResult.OK)
-                {
-                    FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
-                }
-                else
+                if (!string.IsNullOrWhiteSpace(APP.UserInfo.Username))
                 {
-                    return;
+                    //判断课程是否存在
+                    if (APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
+                    {
+                        MessageBoxResult dr = System.Windows.MessageBox.Show("此微课已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
+                        if (dr == MessageBoxResult.OK)
+                        {
+                            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
+                            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+                            APP.WKDataList.RemoveAll(x => x.WkName == APP.WKData.WkName);
+                        }
+                        else
+                        {
+                            return;
+                        }
+                    }
+                    APP.WKData.WkPath += APP.UserInfo.Username + "/";
                 }
             }
             #endregion

XHWK.WKTool/LoginWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using Common.system;
+using System;
 using System.Configuration;
 using System.Windows;
 using XHWK.WKTool.DAL;
@@ -78,6 +79,26 @@ namespace XHWK.WKTool
                 pobPassword.Password = string.Empty;
                 //读取微课数据
                 APP.ReadWkData();
+                APP.ReadDrawData();
+                APP.WKData.WkPath += APP.UserInfo.Username + "/";
+                //判断微课是否存在，存在则询问
+                if (APP.WKDataList != null)
+                {
+                    if(APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
+                    {
+                        MessageBoxResult dr = System.Windows.MessageBox.Show("此微课已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
+                        if (dr == MessageBoxResult.OK)
+                        {
+                            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
+                            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+                            APP.WKDataList.RemoveAll(x => x.WkName == APP.WKData.WkName);
+                        }
+                        else
+                        {
+                            APP.W_CreateAMicroLessonWindow.Show();
+                        }
+                    }
+                }
                 this.Hide();
             }
             else

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -243,8 +243,34 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
-            APP.SaveWkData();
-            System.Environment.Exit(0);
+            if (IsFirstR)
+            {
+                APP.Killffmpeg();
+                APP.SaveWkData();
+                APP.SaveDraw();
+                Thread.Sleep(100);
+                System.Environment.Exit(0);
+            }
+            else
+            {
+                MessageBoxResult dr = System.Windows.MessageBox.Show("当前正在录制，是否停止录制？", "提示", MessageBoxButton.OKCancel);
+                if (dr == MessageBoxResult.OK)
+                {
+                    APP.SaveWkData();
+                    APP.SaveDraw();
+                    BtnStop_Click(null, null);
+                    while (!IsFirstR)
+                    {
+                        Thread.Sleep(100);
+                    }
+                    System.Environment.Exit(0);
+
+                }
+                else
+                {
+                    return;
+                }
+            }
         }
         /// <summary>
         /// 设置 保存事件
@@ -324,8 +350,6 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBrowse_Click(object sender, RoutedEventArgs e)
         {
-
-
             System.Diagnostics.Process.Start(APP.WKData.WkPath);
             //string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
             //Ofd = new System.Windows.Forms.FolderBrowserDialog();
@@ -730,7 +754,7 @@ namespace XHWK.WKTool
         /// </summary>
         bool IsSuspendR = true;
         /// <summary>
-        /// 是否首次录制
+        /// 录制是否已停止
         /// </summary>
         bool IsFirstR = true;
         /// <summary>
@@ -914,7 +938,6 @@ namespace XHWK.WKTool
         {
             if (!IsFirstR)
             {
-                IsFirstR = true;
                 IsSuspendR = true;
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
                 TxbRecordingWord.Text = "录制";
@@ -962,6 +985,7 @@ namespace XHWK.WKTool
                         APP.VideoList.Add(VideoInfo);
                         //保存数据
                         APP.SaveWkData();
+                        IsFirstR = true;
                     }))).Start();
                     //List<Model_Video> VideoList
                 }