打印优化，新增清除临时文件

XHWK.WKTool/App.config

@@ -33,8 +33,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="20" />
-    <add key="VersionName" value="1.1.9" />
+    <add key="VersionCode" value="21" />
+    <add key="VersionName" value="1.2.0" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/App.cs

@@ -239,7 +239,16 @@ namespace XHWK.WKTool
                 //}
                 #endregion
 
-
+                try
+                {
+                    if(Directory.Exists(AppDomain.CurrentDomain.BaseDirectory+"temp"))//清除临时文件
+                    {
+                        Directory.Delete(AppDomain.CurrentDomain.BaseDirectory + "temp",true);
+                    }
+                }
+                catch (Exception ex)
+                {
+                }
 
                 //如果本地文件为空，弹出弹窗 输密匙
                 //本地文件不为空， 解析

XHWK.WKTool/PrintWindow.xaml.cs

@@ -3,6 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing;
+using System.IO;
 using System.Threading;
 using System.Windows;
 using System.Windows.Input;
@@ -54,8 +56,12 @@ namespace XHWK.WKTool
                 cmbClass.SelectedIndex = 0;
             }
         }
-        public void Initialize(string _imgPath)
+        double wit = 0;
+        double hei = 0;
+        public void Initialize(string _imgPath, double _wit,double _hei)
         {
+            wit = _wit;
+            hei = _hei;
             if (!string.IsNullOrWhiteSpace(_imgPath))
             {
                 imgPri.Source = new BitmapImage(new Uri(_imgPath));
@@ -136,6 +142,111 @@ namespace XHWK.WKTool
         /// </summary>
         void StartPrint(object obj)
         {
+          
+                try
+            {
+                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0, 0, 0, 0);
+                //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
+                ////设置纸张横向
+                //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
+                int ipdf = 102;
+                string imgPath = FileToolsCommon.GetFileAbsolutePath("temp/");
+                string tempImgPath = imgPath;
+                FileToolsCommon.CreateDirectory(imgPath);
+                imgPath += "101.pdf";
+                while(File.Exists(imgPath))
+                {
+                    imgPath = tempImgPath + ipdf.ToString() + ".pdf";
+                    ipdf++;
+                }
+                iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(imgPath, FileMode.Create, FileAccess.ReadWrite));
+                document.Open();
+                iTextSharp.text.Image image;
+                for (int i = 0; i < APP.PageDrawList.Count; i++)
+                {
+                    long ii = Timestamp();
+                    string directoryPath = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                    string filePathOutPut = Path.Combine(directoryPath, string.Format("print{0}{1}.jpg", ii, i));
+                    RectangleF rectangleFs = new RectangleF();
+                    MergerImg("", filePathOutPut, rectangleFs, out string errmsg);
+                    image = iTextSharp.text.Image.GetInstance(filePathOutPut);
+                    if (string.IsNullOrEmpty(APP.PageDrawList[i].PageImagePath))//没有图片
+                    {
+
+                    }
+                    else if (APP.PageDrawList[i].ImgDocumentation == true && !APP.PageDrawList[i].Type.Equals("ppt"))
+                    {
+                        image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
+                    }
+                    else
+                    {
+                        RectangleF rectangleF = new RectangleF(0,0,0,0) ;
+                        Dispatcher.Invoke(() =>
+                        {
+                             rectangleF = new RectangleF
+                            {
+                                Width = (float)APP.PageDrawList[i].ImageSizes.CenterX,
+                                Height = (float)APP.PageDrawList[i].ImageSizes.CenterY,
+                                X = (float)APP.PageDrawList[i].ImageLocation.X,
+                                Y = (float)APP.PageDrawList[i].ImageLocation.Y
+                            };
+                        });
+                   
+
+
+                        string msgs = string.Empty;
+
+               
+                            bool isImg = MergerImg(APP.PageDrawList[i].PageImagePath, filePathOutPut, rectangleF, out msgs);
+                            if (isImg)
+                            {
+                                image = iTextSharp.text.Image.GetInstance(filePathOutPut);
+                            }
+                            else
+                            {
+                                image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
+                            }
+                   
+                     
+                    }
+                    if (image.Height > iTextSharp.text.PageSize.A4.Height)
+                    {
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
+                    }
+                    else if (image.Width > iTextSharp.text.PageSize.A4.Width)
+                    {
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
+                    }
+                    image.Alignment = iTextSharp.text.Image.ALIGN_MIDDLE;
+                    document.NewPage();
+                    document.Add(image);
+                    //iTextSharp.text.Chunk c1 = new iTextSharp.text.Chunk("Hello World");
+                    //iTextSharp.text.Phrase p1 = new iTextSharp.text.Phrase();
+                    //p1.Leading = 150;      //行间距
+                    //document.Add(p1);
+                }
+                Console.WriteLine("转换成功！");
+                document.Close();
+            }
+            catch (Exception ex)
+            {
+
+
+
+                Dispatcher.Invoke(() =>
+                {
+                    btnClose.IsEnabled = true;
+                    btnPrint.IsEnabled = true;
+                    times.Stop();
+                    tip_outer.Visibility = Visibility.Collapsed;
+                    MessageWindow.Show(ex.Message);
+                    return;
+                });
+                LogHelper.WriteErrLog("打印转换PDF失败，原因：" + ex.Message,ex);
+            }
+
+
+
             List<string> objStr = (List<string>)obj;
             string SourcePath= objStr[0];
             int PrinterNum=int.Parse(objStr[1]);
@@ -183,7 +294,64 @@ namespace XHWK.WKTool
                 });
             }
         }
+        /// <summary>
+        /// 返回一个时间戳到毫秒
+        /// </summary>
+        /// <returns></returns>
+        public static long Timestamp()
+        {
+            TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            long timestr = Convert.ToInt64(ts.TotalMilliseconds);
+            return timestr;
+        }
+        /// <summary>
+        /// 生成图片
+        /// </summary>
+        /// <param name="_path">图片地址</param>
+        /// <param name="_saveimg">保存位置</param>
+        /// <param name="_rectangle">图片位置</param>
+        /// <param name="errmsg">错误消息</param>
+        /// <returns></returns>
+        private bool MergerImg(string _path, string _saveimg, RectangleF _rectangle, out string errmsg)
+        {
+            errmsg = null;
+            try
+            {
+                Bitmap bitmap = null;
 
+                //创建要显示的图片对象,根据参数的个数设置宽度
+                Bitmap backgroudImg = new Bitmap((int)/*gridM.ActualWidth*/wit, (int)/*gridM.ActualHeight*/hei);
+                Graphics g = Graphics.FromImage(backgroudImg);
+                //清除画布,背景设置为白色
+                g.Clear(System.Drawing.Color.White);
+
+                if (!string.IsNullOrWhiteSpace(_path))
+                {
+                    bitmap = ImageHelper.ReadBitmapFile(_path);
+                    g.DrawImage(bitmap, _rectangle);
+                }
+
+
+                backgroudImg.Save(_saveimg);
+
+                g.Dispose();
+                backgroudImg.Dispose();
+                if (bitmap != null)
+                {
+                    bitmap.Dispose();
+                }
+
+                GC.Collect();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                errmsg = ex.Message;
+                LogHelper.WriteErrLog("【截图合成】（MergerImg）图片合成失败：" + ex.Message, ex);
+                return false;
+            }
+
+        }
         /// <summary>
         /// 打印-开始
         /// </summary>

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.9.0")]
-[assembly: AssemblyFileVersion("1.1.9.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -3384,80 +3384,77 @@ namespace XHWK.WKTool
                 }
 
 
-                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0, 0, 0, 0);
-                //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
-                ////设置纸张横向
-                //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
-
-                string imgPath = FileToolsCommon.GetFileAbsolutePath("temp/");
-                FileToolsCommon.CreateDirectory(imgPath);
-                imgPath += "101.pdf";
-                iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(imgPath, FileMode.Create, FileAccess.ReadWrite));
-                document.Open();
-                iTextSharp.text.Image image;
-                for (int i = 0; i < APP.PageDrawList.Count; i++)
-                {
-                    long ii = Timestamp();
-                    string directoryPath = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
-                    string filePathOutPut = Path.Combine(directoryPath, string.Format("print{0}{1}.jpg", ii, i));
-                    RectangleF rectangleFs = new RectangleF();
-                    MergerImg("", filePathOutPut, rectangleFs, out string errmsg);
-                    image = iTextSharp.text.Image.GetInstance(filePathOutPut);
-                    if (string.IsNullOrEmpty(APP.PageDrawList[i].PageImagePath))//没有图片
-                    {
-
-                    }
-                    else if (APP.PageDrawList[i].ImgDocumentation == true&& !APP.PageDrawList[i].Type.Equals("ppt"))
-                    {
-                        image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
-                    }
-                    else
-                    {
-                        RectangleF rectangleF = new RectangleF
-                        {
-                            Width = (float)APP.PageDrawList[i].ImageSizes.CenterX,
-                            Height = (float)APP.PageDrawList[i].ImageSizes.CenterY,
-                            X = (float)APP.PageDrawList[i].ImageLocation.X,
-                            Y = (float)APP.PageDrawList[i].ImageLocation.Y
-                        };
-
-
-                        string msg = string.Empty;
-                        bool isImg = MergerImg(APP.PageDrawList[i].PageImagePath, filePathOutPut, rectangleF, out msg);
-                        if (isImg)
-                        {
-                            image = iTextSharp.text.Image.GetInstance(filePathOutPut);
-                        }
-                        else
-                        {
-                            image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
-                        }
-                    }
-
+                //iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0, 0, 0, 0);
+                ////iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
+                //////设置纸张横向
+                ////document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
+
+                //string imgPath = FileToolsCommon.GetFileAbsolutePath("temp/");
+                //FileToolsCommon.CreateDirectory(imgPath);
+                //imgPath += "101.pdf";
+                //iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(imgPath, FileMode.Create, FileAccess.ReadWrite));
+                //document.Open();
+                //iTextSharp.text.Image image;
+                //for (int i = 0; i < APP.PageDrawList.Count; i++)
+                //{
+                //    long ii = Timestamp();
+                //    string directoryPath = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                //    string filePathOutPut = Path.Combine(directoryPath, string.Format("print{0}{1}.jpg", ii, i));
+                //    RectangleF rectangleFs = new RectangleF();
+                //    MergerImg("", filePathOutPut, rectangleFs, out string errmsg);
+                //    image = iTextSharp.text.Image.GetInstance(filePathOutPut);
+                //    if (string.IsNullOrEmpty(APP.PageDrawList[i].PageImagePath))//没有图片
+                //    {
 
+                //    }
+                //    else if (APP.PageDrawList[i].ImgDocumentation == true&& !APP.PageDrawList[i].Type.Equals("ppt"))
+                //    {
+                //        image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
+                //    }
+                //    else
+                //    {
+                //        RectangleF rectangleF = new RectangleF
+                //        {
+                //            Width = (float)APP.PageDrawList[i].ImageSizes.CenterX,
+                //            Height = (float)APP.PageDrawList[i].ImageSizes.CenterY,
+                //            X = (float)APP.PageDrawList[i].ImageLocation.X,
+                //            Y = (float)APP.PageDrawList[i].ImageLocation.Y
+                //        };
 
 
-                    if (image.Height > iTextSharp.text.PageSize.A4.Height)
-                    {
-                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
-                    }
-                    else if (image.Width > iTextSharp.text.PageSize.A4.Width)
-                    {
-                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
-                    }
-                    image.Alignment = iTextSharp.text.Image.ALIGN_MIDDLE;
-                    document.NewPage();
-                    document.Add(image);
-                    //iTextSharp.text.Chunk c1 = new iTextSharp.text.Chunk("Hello World");
-                    //iTextSharp.text.Phrase p1 = new iTextSharp.text.Phrase();
-                    //p1.Leading = 150;      //行间距
-                    //document.Add(p1);
-                }
-                Console.WriteLine("转换成功！");
-                document.Close();
+                //        string msg = string.Empty;
+                //        bool isImg = MergerImg(APP.PageDrawList[i].PageImagePath, filePathOutPut, rectangleF, out msg);
+                //        if (isImg)
+                //        {
+                //            image = iTextSharp.text.Image.GetInstance(filePathOutPut);
+                //        }
+                //        else
+                //        {
+                //            image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
+                //        }
+                //    }
+                //    if (image.Height > iTextSharp.text.PageSize.A4.Height)
+                //    {
+                //        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
+                //    }
+                //    else if (image.Width > iTextSharp.text.PageSize.A4.Width)
+                //    {
+                //        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
+                //    }
+                //    image.Alignment = iTextSharp.text.Image.ALIGN_MIDDLE;
+                //    document.NewPage();
+                //    document.Add(image);
+                //    //iTextSharp.text.Chunk c1 = new iTextSharp.text.Chunk("Hello World");
+                //    //iTextSharp.text.Phrase p1 = new iTextSharp.text.Phrase();
+                //    //p1.Leading = 150;      //行间距
+                //    //document.Add(p1);
+                //}
+                //Console.WriteLine("转换成功！");
+                //document.Close();
             }
             catch (Exception ex)
             {
+                MessageWindow.Show(ex.Message);
                 Console.WriteLine("转换失败，原因：" + ex.Message);
             }
             //document.Close();
@@ -3472,11 +3469,11 @@ namespace XHWK.WKTool
             }
             if (APP.PageDrawList.Count > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[0].PageImagePath))
             {
-                APP.W_PrintWindow.Initialize(APP.PageDrawList[0].PageImagePath);
+                APP.W_PrintWindow.Initialize(APP.PageDrawList[0].PageImagePath, gridM.ActualWidth, gridM.ActualHeight);
             }
             else
             {
-                APP.W_PrintWindow.Initialize("");
+                APP.W_PrintWindow.Initialize("", gridM.ActualWidth,gridActHeight);
             }
             APP.W_PrintWindow.ShowDialog();
             //int pr = 1;