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

Common/Common.csproj

@@ -117,6 +117,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Model\DownloadInfoModel.cs" />
+    <Compile Include="system\LatticeFileHelper.cs" />
     <Compile Include="system\PdfTrunImage.cs" />
     <Compile Include="system\BlackboardNew.cs" />
     <Compile Include="system\CameraHelper.cs" />

Common/system/LatticeFileHelper.cs

@@ -0,0 +1,266 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing.Printing;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Common.system
+{
+    /// <summary>
+    /// 点阵文件制作打印
+    /// 创建时间：2020年9月1日
+    /// </summary>
+    public class LatticeFileHelper
+    {
+        /// <summary>
+        /// 打印进程
+        /// </summary>
+        public static Process PrintProcess = null;
+        /// <summary>
+        /// 输出日志文件地址  每个文件2MB左右
+        /// </summary>
+        static string LogPath = "";
+        /// <summary>
+        /// 运行配置 首次打开必须运行
+        /// </summary>
+        public static void RunPrintConfig()
+        {
+            string Path = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintConfig.exe");
+            Process myProcess = new Process();
+            LogPath = CreateLog();
+            myProcess.StartInfo.FileName = Path;   //绝对路径
+            //myProcess.StartInfo.Arguments = "";
+            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();               //释放资源
+        }
+
+        /// <summary>
+        /// 生成点阵打印文件
+        /// </summary>
+        /// <param name="PDFPath">PDF文件位置</param>
+        /// <param name="SavePath">保存文件位置 TPF</param>
+        /// <param name="PrintResult">输出结果，非0为失败</param>
+        public static void GeneratingPDF(string PDFPath, string SavePath, out int PrintResult, int PointType = 0)
+        {
+            //XML点阵文件位置
+            string XmlFile = FileToolsCommon.GetFileAbsolutePath("/LatticeXML/print_license.xml");
+            string ContentParameter = null;
+            ContentParameter = "-sMode=Generate \"-sPDF=" + PDFPath + "\" \"-sLIC=" + XmlFile + "\" \"-oTPF=" + SavePath + "\" \"-dType=" + PointType + "\" ";//[-dType=0] [-dPrint=0] [-pStart=0]
+            #region 制作点阵文件参数说明
+            //-sMode = Generate - sPDF = d:\l\e.pdf - sLIC = d:\l\a.xml - oPDF = d:\l\11210.pdf"
+            //当 - sMode = Generate，参数如下：
+            //PrintTool.exe - sMode = Generate - sPDF = -sLIC = < -oPDF =| -oTPF=> [dType=] [-dPrint] [-pStart =]
+            //- sPDF 原始 PDF 文件路径
+            //- sLIC 点阵资源文件路径
+            //- oPDF 生成的点阵 PDF 文件路径，-oPDF 与 - oTPF 至少设置一个。PDF 与 TPF 说明参见 2 生成文件类型说明
+            //- oTPF 生成的 TPF 文件，-oPDF 与 - oTPF 至少设置一个。PDF 与 TPF 说明参见 2 生成文件类型说明 
+            //- dType 0 为方点，1 为圆点；可选参数，默认 0。详细参数区别，参见 3.1 点阵形状
+            //- dPrint 0 为激光打印机，1 为印刷机；可选参数，默认 0。详细参数区别，参见 3.2 点阵 PDF 适用打印场景
+            //- pStart 整数，选择从哪页点阵资源开始制作点阵文件， 即起始点阵资源页序号；可选参数，默认0。关于 - pStart 的功能说明，参见 1.3.1.高级设置
+            #endregion
+            while (PrintProcess != null)
+            {
+                Thread.Sleep(100);
+            }
+            Process[] KillProcessArray = Process.GetProcessesByName("PrintTool");
+            foreach (var KillProcess in KillProcessArray)
+            {
+                KillProcess.Kill();
+            }
+            PrintProcess = new Process();
+            LogPath = CreateLog();
+            PrintProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintTool.exe");   //绝对路径
+            PrintProcess.StartInfo.Arguments = ContentParameter;
+            PrintProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
+            PrintProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
+            PrintProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
+            PrintProcess.StartInfo.RedirectStandardInput = true;      //用于模拟该进程控制台的输入
+            //外部程序(这里是FFMPEG)输出流时候产生的事件,这里是把流的处理过程转移到下面的方法中,详细请查阅MSDN
+            PrintProcess.ErrorDataReceived += new DataReceivedEventHandler(Output);
+            PrintProcess.Start();                 //启动线程
+            PrintProcess.BeginErrorReadLine();    //开始异步读取
+            PrintProcess.WaitForExit();           //阻塞等待进程结束
+            PrintResult = PrintProcess.ExitCode;     //打印结果 非0则为打印失败
+            Output("【制作点阵文件】" + ContentParameter);//记录打印日志
+            PrintProcess.Close();                 //关闭进程
+            PrintProcess.Dispose();               //释放资源
+            #region 进程是否已经释放
+            bool IsRunning = true;
+            while (IsRunning)
+            {
+                IsRunning = false;
+                Process[] ProcessArray = Process.GetProcessesByName("PrintTool");
+                foreach (var KillProcess in ProcessArray)
+                {
+                    IsRunning = true;
+                    Thread.Sleep(100);
+                }
+            }
+            #endregion
+            PrintProcess = null;
+        }
+
+        /// <summary>
+        /// 获取打印机列表
+        /// </summary>
+        /// <param name="DefaultPrinter">默认打印机</param>
+        /// <returns>打印机列表</returns>
+        public static List<string> GetPrinterList(out string DefaultPrinter)
+        {
+            List<string> PrintersList = new List<string>();
+            DefaultPrinter = null;
+            try
+            {
+                PrintDocument print = new PrintDocument();
+                DefaultPrinter = print.PrinterSettings.PrinterName;//默认打印机名
+                foreach (string sPrint in PrinterSettings.InstalledPrinters)//获取所有打印机名称
+                {
+                    PrintersList.Add(sPrint);
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return PrintersList;
+        }
+
+        /// <summary>
+        /// 打印TPF点阵文件
+        /// </summary>
+        /// <param name="TPFPath">TPF路径</param>
+        /// <param name="PrinterNum">打印份数</param>
+        /// <param name="PrinterName">打印机名称</param>
+        /// <param name="PrintResult">输出结果，非0为失败</param>
+        public static void PrinterTPFFile(string TPFPath, int PrinterNum, string PrinterName, out int PrintResult)
+        {
+            //XML点阵文件位置
+            string XmlFile = FileToolsCommon.GetFileAbsolutePath("/LatticeXML/print_license.xml");
+            string ContentParameter = null;
+            ContentParameter = "-sMode=Print \"-sTPF =" + TPFPath + "\" \"-dCopy= " + PrinterNum + "\" \"-dPaperSize=9\" \"-sPrinter=" + PrinterName + "\"";//[-dPaperSize =] 
+            #region 打印参数说明
+            //-sMode = Print，参数如下：
+            //PrintTool.exe - sMode = Print - sTPF = [-dCopy =][-dPaperSize =] - sPrinter =
+            //-sTPF 需要打印的 TPF 文件路径
+            //- dCopy 整数，可选参数，打印份数，默认 1 
+            //- dPaperSize 整数，可选参数，设置打印纸张尺寸。不设置此值，系统自动选择匹配纸张打印；A4："-dPaperSize=9"  DMPAPER_A4	9	A4 210 x 297 mm   如
+            //  需要手动设置纸张尺寸，不同尺寸纸张对应值，参见 https://docs.microsoft.com/en-us/windows/win32/intl/paper-sizes
+            //- sPrinter 打印机名称
+            // 打印完成后，如果打印成功，PrintTool.exe 退出值为 0。
+            //如果打印失败，程序退出值为非 0。
+            #endregion
+            while (PrintProcess != null)
+            {
+                Thread.Sleep(100);
+            }
+            Process[] KillProcessArray = Process.GetProcessesByName("PrintTool");
+            foreach (var KillProcess in KillProcessArray)
+            {
+                KillProcess.Kill();
+            }
+            PrintProcess = new Process();
+            LogPath = CreateLog();
+            PrintProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintTool.exe");   //绝对路径
+            PrintProcess.StartInfo.Arguments = ContentParameter;
+            PrintProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
+            PrintProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
+            PrintProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
+            PrintProcess.StartInfo.RedirectStandardInput = true;      //用于模拟该进程控制台的输入
+            //外部程序(这里是FFMPEG)输出流时候产生的事件,这里是把流的处理过程转移到下面的方法中,详细请查阅MSDN
+            PrintProcess.ErrorDataReceived += new DataReceivedEventHandler(Output);
+            PrintProcess.Start();                 //启动线程
+            PrintProcess.BeginErrorReadLine();    //开始异步读取
+            PrintProcess.WaitForExit();           //阻塞等待进程结束
+            PrintResult = PrintProcess.ExitCode;     //打印结果 非0则为打印失败
+            Output("【打印TPF文件】" + ContentParameter);//记录打印日志
+            PrintProcess.Close();                 //关闭进程
+            PrintProcess.Dispose();               //释放资源
+            #region 进程是否已经释放
+            bool IsRunning = true;
+            while (IsRunning)
+            {
+                IsRunning = false;
+                Process[] ProcessArray = Process.GetProcessesByName("PrintTool");
+                foreach (var KillProcess in ProcessArray)
+                {
+                    IsRunning = true;
+                    Thread.Sleep(100);
+                }
+            }
+            #endregion
+            PrintProcess = null;
+        }
+
+        /// <summary>
+        /// 创建日志文件
+        /// </summary>
+        /// <returns></returns>
+        private static string CreateLog()
+        {
+            string LogFileName = DateTime.Now.ToString("yyyyMMdd");
+            string LogFilePath = FileToolsCommon.GetFileAbsolutePath("/Log/PrintLog/");
+            FileToolsCommon.CreateDirectory(LogFilePath);
+            string LogName = LogFilePath + LogFileName + ".log";
+            try
+            {
+                if (!FileToolsCommon.IsExistFile(LogName))
+                {
+                    FileToolsCommon.CreateFile(LogName);
+                    FileToolsCommon.AppendText(LogName, "\r\n****************************************************************************************************" +
+                        "****************************************************************************************************\r\n");
+                    return LogName;
+                }
+                else
+                {
+                    int num = 0;
+                    while (FileToolsCommon.GetFileSizeByMB(LogName) > 2)
+                    {
+                        num++;
+                        LogName = LogFilePath + LogFileName + "_" + num + ".log";
+                        FileToolsCommon.CreateFile(LogName);
+                    }
+                    FileToolsCommon.AppendText(LogName, "\r\n****************************************************************************************************" +
+                        "****************************************************************************************************\r\n");
+                    return LogName;
+                }
+            }
+            catch (Exception)
+            {
+                return LogName;
+            }
+        }
+
+        /// <summary>
+        /// 输出日志
+        /// </summary>
+        /// <param name="Message"></param>
+        private static void Output(string Message)
+        {
+            if (!String.IsNullOrEmpty(Message))
+            {
+                FileToolsCommon.AppendText(LogPath, Message + "\r\n");
+            }
+        }
+        /// <summary>
+        /// 输出结果
+        /// </summary>
+        /// <param name="sendProcess"></param>
+        /// <param name="output"></param>
+        private static void Output(object sendProcess, DataReceivedEventArgs output)
+        {
+            Output(output.Data);
+        }
+    }
+}

XHWK.WKTool/App.cs

@@ -25,6 +25,10 @@ namespace XHWK.WKTool
         /// </summary>
         public static string ServerMsg=string.Empty;
         /// <summary>
+        /// 用户微课列表模型
+        /// </summary>
+        public static List<Model_WKData> WKDataList = null;
+        /// <summary>
         /// 微课模型
         /// </summary>
         public static Model_WKData WKData = null;
@@ -86,13 +90,15 @@ namespace XHWK.WKTool
             // 定义Application对象作为整个应用程序入口
             Application app = new Application();
             UserInfo = new Model_UserInfo();
-             WKData = new Model_WKData();
+             WKDataList = new List<Model_WKData>();
+            WKData = new Model_WKData();
             VideoList = new List<Model_Video>();
             //app.DispatcherUnhandledException += MyApp_DispatcherUnhandledException;
             CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
             app.Run(win);
             //LogHelper.WriteInfoLog("启动项目");
             StopSameProcess();
+            LatticeFileHelper.RunPrintConfig();
         }
         /// <summary>
         /// 结束已运行的程序
@@ -143,14 +149,49 @@ namespace XHWK.WKTool
             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(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);
+            }
+        }
+
+        /// <summary>
+        /// 读取微课信息
+        /// </summary>
+        public static void ReadWkData()
+        {
+            if (UserInfo == null)
+            {
+                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 != null)
+                    {
+                        WKDataList.RemoveAll(x => x.WkName == WKData.WkName);
+                    }
+                }
             }
-            //if(APP.UserInfo)
-            //APP.UserInfo.Wkdata.Add(APP.WKData);
         }
 
         #region 内存处理 -创建人：赵耀 -创建时间：2020年8月12日

XHWK.WKTool/LoginWindow.xaml.cs

@@ -76,6 +76,8 @@ namespace XHWK.WKTool
                 APP.IsLoginType = true;
                 txbAccountNumber.Text = string.Empty;
                 pobPassword.Password = string.Empty;
+                //读取微课数据
+                APP.ReadWkData();
                 this.Hide();
             }
             else

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -194,6 +194,8 @@ namespace XHWK.WKTool
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
                         APP.VideoList.Add(VideoInfo);
+                        //保存数据
+                        APP.SaveWkData();
                     }))).Start();
                 }
                 catch (Exception ex)

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -193,6 +193,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
+            APP.SaveWkData();
             System.Environment.Exit(0);
         }
         /// <summary>
@@ -903,6 +904,8 @@ namespace XHWK.WKTool
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
                         APP.VideoList.Add(VideoInfo);
+                        //保存数据
+                        APP.SaveWkData();
                     }))).Start();
                     //List<Model_Video> VideoList
                 }