zhao：增加TQL铺码SDK，兼容TQL130点阵笔

Common/Common.csproj

@@ -118,6 +118,7 @@
   <ItemGroup>
     <Compile Include="AESHelper.cs" />
     <Compile Include="Model\DownloadInfoModel.cs" />
+    <Compile Include="system\AutoStartHelper.cs" />
     <Compile Include="system\DataProvider.cs" />
     <Compile Include="system\KeyboardHookCommon.cs" />
     <Compile Include="system\LatticeFileHelper.cs" />

Common/system/AutoStartHelper.cs

@@ -0,0 +1,121 @@
+using Microsoft.Win32;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Common.system
+{
+    /// <summary>
+    /// 自启帮助类
+    /// </summary>
+    public static class AutoStartHelper
+    {
+        /// <summary>
+        /// 开机自启动
+        /// </summary>
+        /// <param name="strName">需要启动软件的路径</param>
+        /// <param name="Message">错误信息</param>
+        /// <returns></returns>
+        public static bool OpenAutoStart(string strName,out string Message)
+        {
+
+            #region 设置开机自启
+            if (!System.IO.File.Exists(strName))//判断要自动运行的应用程序文件是否存在
+            {
+                Message = "未检测到应用程序启动项。";
+                return false;
+            }
+            string strnewName = strName.Substring(strName.LastIndexOf("\\") + 1);//获取应用程序文件名，不包括路径
+            try
+            {
+                RegistryKey registry = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);//检索指定的子项
+                if (registry == null)//若指定的子项不存在
+                    registry = Registry.LocalMachine.CreateSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run");//则创建指定的子项
+                registry.SetValue(strnewName, strName);//设置该子项的新的“键值对”
+                Message = "";
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Message = "设置失败，操作被拒绝：" + ex.Message;
+                LogHelper.WriteErrLog(Message, ex);
+                return false;
+            }
+
+            //if (MessageBox.Show("设置完毕") == DialogResult.OK)
+            //{
+            //    RefreshSystem();//刷新系统
+            //}
+            #endregion
+        }
+        /// <summary>
+        /// 关闭自启
+        /// </summary>
+        /// <param name="strName">软件名称</param>
+        /// <param name="Message">错误消息</param>
+        /// <returns></returns>
+        public static bool CloseAutoStart(string strName, out string Message)
+        {
+            #region 取消开机自启
+            if (!System.IO.File.Exists(strName))//判断要取消的应用程序文件是否存在
+            {
+                Message = "未检测到应用程序启动项。";
+                return false;
+            }
+            string strnewName = strName.Substring(strName.LastIndexOf("\\") + 1);///获取应用程序文件名，不包括路径
+            try
+            {
+                RegistryKey registry = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);//读取指定的子项
+                if (registry == null)//若指定的子项不存在
+                    registry = Registry.LocalMachine.CreateSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run");//则创建指定的子项
+                registry.DeleteValue(strnewName, false);//删除指定“键名称”的键/值对
+                Message = "";
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Message = "设置失败，操作被拒绝："+ex.Message;
+                LogHelper.WriteErrLog(Message, ex);
+                return false;
+            }
+            //if (MessageBox.Show("设置完毕") == DialogResult.OK)
+            //{
+            //    RefreshSystem();
+            //}
+            #endregion
+        }
+
+
+        /// <summary>
+        /// 开机自启动
+        /// </summary>
+        /// <param name="strName">程序名称</param>
+        /// <param name="Message">错误信息</param>
+        /// <returns></returns>
+        public static bool OpenAutoStart1(string exeName, out string Message)
+        {
+
+            #region 设置开机自启
+            try
+            {
+                Message = "";
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Message = "设置失败，操作被拒绝：" + ex.Message;
+                LogHelper.WriteErrLog(Message, ex);
+                return false;
+            }
+
+            //if (MessageBox.Show("设置完毕") == DialogResult.OK)
+            //{
+            //    RefreshSystem();//刷新系统
+            //}
+            #endregion
+        }
+    }
+}

Common/system/FileToolsCommon.cs

@@ -347,7 +347,8 @@ namespace Common.system
         /// <summary>  
         /// 获取指定目录中所有文件列表  
         /// </summary>  
-        /// <param name="directoryPath">指定目录的绝对路径</param>          
+        /// <param name="directoryPath">指定目录的绝对路径</param>     
+        /// <param name="files">匹配关键字</param>       
         public static FileInfo[] GetFileInfos(string directoryPath, string files = null)
         {
             //如果目录不存在，则抛出异常  

Common/system/HttpHelper.cs

@@ -400,7 +400,7 @@ namespace Common.system
             for (int i = 0; i < files.Length; i++)
             {
                 memStream.Write(boundarybytes, 0, boundarybytes.Length);
-                string header = string.Format(headerTemplate, "file", files[i]);
+                string header = string.Format(headerTemplate, "fileData", files[i]);
                 byte[] headerbytes = System.Text.Encoding.UTF8.GetBytes(header);
 
                 memStream.Write(headerbytes, 0, headerbytes.Length);

XHWK.Model/Model_TmatrixCode.cs

@@ -0,0 +1,200 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    #region 铺码模型
+    /// <summary>
+    /// TQL铺码模型
+    /// </summary>
+    public class Model_TmatrixCode
+    {
+        /// <summary>
+        /// 返回标志
+        /// </summary>
+        public string state { get; set; }
+        /// <summary>
+        /// 返回标志说明
+        /// </summary>
+        public string message { get; set; }
+        /// <summary>
+        /// 文件名
+        /// </summary>
+        public string filename { get; set; }
+        /// <summary>
+        /// 文件原始宽度
+        /// </summary>
+        public string width { get; set; }
+        /// <summary>
+        /// 文件原始高度
+        /// </summary>
+        public string hight { get; set; }
+        /// <summary>
+        /// 分配的铺码 ID
+        /// </summary>
+        public string pageserial { get; set; }
+        /// <summary>
+        /// 铺码文件使用的 sectionId
+        /// </summary>
+        public string sectionId { get; set; }
+        /// <summary>
+        /// 铺码文件使用的 ownerId
+        /// </summary>
+        public string ownerId { get; set; }
+        /// <summary>
+        /// 铺码文件使用的 bookId
+        /// </summary>
+        public string bookId { get; set; }
+        /// <summary>
+        /// 铺码文件的 page 信息
+        /// </summary>
+        public List<Model_PageInfoItem> pageInfo { get; set; }
+
+    }
+    /// <summary>
+    /// PDF页码对应铺码ID
+    /// </summary>
+    public class Model_PageInfoItem
+    {
+        /// <summary>
+        /// Pdf 文件页码
+        /// </summary>
+        public string pagenumber { get; set; }
+        /// <summary>
+        /// Pdf 文件页码对应使用的铺码pageid
+        /// </summary>
+        public string pageid { get; set; }
+    }
+
+    #endregion
+
+    #region 查询进度
+    /// <summary>
+    /// 进度查询
+    /// </summary>
+    public class Model_ScheduleQuery
+    {
+        /// <summary>
+        /// 结果
+        /// </summary>
+        public string state { get; set; }
+        /// <summary>
+        /// 消息
+        /// </summary>
+        public string message { get; set; }
+        /// <summary>
+        /// 进度列表
+        /// </summary>
+        public List<Model_ScheduleQueryState> list { get; set; }
+    }
+    /// <summary>
+    /// 查询状态
+    /// </summary>
+    public class Model_ScheduleQueryState
+    {
+        /// <summary>
+        /// 铺码 ID
+        /// </summary>
+        public string pageserial { get; set; }
+        /// <summary>
+        /// 返回铺码进度:0-100
+        /// </summary>
+        public string schedule { get; set; }
+        /// <summary>
+        /// 状态   0：未铺码 1：正在铺码 2：铺码完成，3：未查到。
+        /// </summary>
+        public string state { get; set; }
+    }
+    #endregion
+
+    #region 历史查询
+    /// <summary>
+    /// 历史查询模型
+    /// </summary>
+    public class Model_HistoryQuery
+    {
+        /// <summary>
+        /// 返回标志
+        /// </summary>
+        public string state { get; set; }
+        /// <summary>
+        /// 返回标志说明
+        /// </summary>
+        public string message { get; set; }
+        /// <summary>
+        /// 历史数据列表数组
+        /// </summary>
+        public List<Model_HistoryPageList> pageList { get; set; }
+    }
+    /// <summary>
+    /// 历史数据列表
+    /// </summary>
+    public class Model_HistoryPageList
+    {
+        /// <summary>
+        /// 页码 ID
+        /// </summary>
+        public string pageIndex { get; set; }
+        /// <summary>
+        /// 历史数据 pdf 文档详情数组
+        /// </summary>
+        public List<Model_HistoryListItem> list { get; set; }
+    }
+    /// <summary>
+    /// 历史信息
+    /// </summary>
+    public class Model_HistoryListItem
+    {
+        /// <summary>
+        /// 铺码 ID
+        /// </summary>
+        public string pageserial { get; set; }
+        /// <summary>
+        /// 铺码名称
+        /// </summary>
+        public string fileName { get; set; }
+        /// <summary>
+        /// 铺码使用的 sectionId
+        /// </summary>
+        public string sectionId { get; set; }
+        /// <summary>
+        /// 铺码使用的 ownerId
+        /// </summary>
+        public string ownerId { get; set; }
+        /// <summary>
+        /// 铺码使用的 bookid
+        /// </summary>
+        public string bookId { get; set; }
+        /// <summary>
+        /// 铺码使用的开始 pagid
+        /// </summary>
+        public string beginPagId { get; set; }
+        /// <summary>
+        /// 铺码使用的结束 pagid
+        /// </summary>
+        public string endPagId { get; set; }
+        /// <summary>
+        /// 下载 URL
+        /// </summary>
+        public string url { get; set; }
+    }
+    #endregion
+    public enum Enum_StatetType
+    {
+        //1000 操作成功
+        //1001 打开数据库失败
+        //1002 用户名或密码错误
+        //1003 Key 信息错误（过期或已使用完）
+        //1004 上传 Pdf 文档无法打开
+        //1005 铺码初始化失败
+        //1006 铺码错误
+        //1007 Json 数据错误
+        //1008 接口错误
+        //1009 UserID 错误
+        //1010 未查到该历史数据
+
+    }
+}

XHWK.Model/XHWK.Model.csproj

@@ -60,6 +60,7 @@
     <Compile Include="Model_ResourceAdd.cs" />
     <Compile Include="Model_Screenshot.cs" />
     <Compile Include="Model_Signatures.cs" />
+    <Compile Include="Model_TmatrixCode.cs" />
     <Compile Include="Model_TsubjectbookList.cs" />
     <Compile Include="Model_UserInfo.cs" />
     <Compile Include="Model_Video.cs" />

XHWK.WKTool/App.config

@@ -7,9 +7,9 @@
     <!--0正式 1测试-->
     <add key="IsDebug" value="1" />
     <!--是否输出视频记录日志：0否-->
-    <add key="OutputVideoLog" value="0"/>
+    <add key="OutputVideoLog" value="0" />
     <!--是否输出其他测试日志-->
-    <add key="IsOutputInfoLog" value="1"/>
+    <add key="IsOutputInfoLog" value="1" />
     <!--文件存放路径  路径\账户名\讲解名称_x.MP4-->
     <add key="VideoSavePath" value="D:\星火微课" />
     <!--视频格式 1、MP4 2、FlV 3、AVI-->
@@ -30,6 +30,8 @@
     <add key="SchoolfileRequestAddress" value="http://schoolfile.xhkjedu.com" />
     <!--认证请求地址-->
     <add key="CertapiRequestAddress" value="http://certapi.xhkjedu.com" />
+    <!--TQL铺码API-->
+    <add key="TmatrixCode" value="http://111.231.240.239:8030" />
     <!--摄像头位置 1.右上 2.左上 3.右下 4.左下-->
     <add key="CameraPosition" value="1" />
     <!--上传每片大小 Mb-->
@@ -37,8 +39,8 @@
     <!--是否隐藏录屏工具栏 1 隐藏 0不隐藏-->
     <add key="IsHideSRTool" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="58" />
-    <add key="VersionName" value="2.5.8" />
+    <add key="VersionCode" value="59" />
+    <add key="VersionName" value="2.5.9" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>
@@ -53,4 +55,12 @@
       </providers>
     </roleManager>
   </system.web>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="itextsharp" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.5.13.2" newVersion="5.5.13.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

XHWK.WKTool/App.cs

@@ -15,6 +15,7 @@ using System.Windows.Threading;
 using TStudyDigitalPen.HID;
 
 using XHWK.Model;
+using XHWK.WKTool.DAL;
 using XHWK.WKTool.Helpers;
 
 namespace XHWK.WKTool
@@ -51,6 +52,10 @@ namespace XHWK.WKTool
         /// </summary>
         public static string certapiUrl = isDebug ? "http://certapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("CertapiRequestAddress");
         /// <summary>
+        /// TQL铺码服务地址
+        /// </summary>
+        public static string TmatrixCodeURL= FileToolsCommon.GetConfigValue("TmatrixCode");
+        /// <summary>
         /// 数据存放目录
         /// </summary>
         public static string dataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\XHMicroLesson\\";
@@ -154,6 +159,10 @@ namespace XHWK.WKTool
         #endregion
         #region 腾千里手写笔
         /// <summary>
+        /// 铺码服务请求
+        /// </summary>
+        public static DAL_TmatrixCode dAL_TmatrixCode;
+        /// <summary>
         /// 腾千里手写笔事件
         /// </summary>
         public static PenEvents TQLPenevents;
@@ -161,6 +170,20 @@ namespace XHWK.WKTool
         /// 腾千里手写笔是否已连接
         /// </summary>
         public static bool TQLPenStatus = false;
+
+        #region 打印
+        public static bool gbGenerateBGWithVImage = false;
+        public static bool gbGenerateVImage = false;
+        public static bool gbGenerateBGWithoutVImage = false;
+        public static bool gbGenerateBGWithImage = false;
+        public static bool gbGenPageSet = false;
+        public static int[] gPointType = new int[4];
+        public static int[] gPointDPI = new int[4];
+        public static string gTMXElementFileName;
+        public static string gNewProjectDirectory;
+        public static bool gbElementFileExist { get; set; }
+        #endregion
+
         #endregion
         #region 页面
         /// <summary>

XHWK.WKTool/DAL/DAL_TmatrixCode.cs

@@ -0,0 +1,278 @@
+using Common.system;
+
+using Newtonsoft.Json.Linq;
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+using XHWK.Model;
+
+namespace XHWK.WKTool.DAL
+{
+   /// <summary>
+   /// TQL在线铺码服务-改为SDK  暂无用
+   /// </summary>
+    public class DAL_TmatrixCode
+    {
+        /// <summary>
+        /// TQL铺码地址
+        /// </summary>
+        private string TmatrixCodeURL = APP.TmatrixCodeURL;
+        /// <summary>
+        /// TQL用户名
+        /// </summary>
+        string TQLUserName = "test122";
+        /// <summary>
+        /// TQL密码
+        /// </summary>
+        string TQLPassword = "123456";
+        /// <summary>
+        /// 用户登陆后的用户ID
+        /// </summary>
+        string UserID;
+        /// <summary>
+        /// 分配的铺码 ID
+        /// </summary>
+        string pageserial;
+        //1000 操作成功
+        //1001 打开数据库失败
+        //1002 用户名或密码错误
+        //1003 Key 信息错误（过期或已使用完）
+        //1004 上传 Pdf 文档无法打开
+        //1005 铺码初始化失败
+        //1006 铺码错误
+        //1007 Json 数据错误
+        //1008 接口错误
+        //1009 UserID 错误
+        //1010 未查到该历史数据
+        /// <summary>
+        /// TQL登陆
+        /// </summary>
+        /// <param name="Message"></param>
+        /// <returns></returns>
+        public bool TQLUserLogin( out string Message)
+        {
+            Exception ex = null;
+            Message = "";//请求重试5次 共5秒
+            for (int num = 0; num < 5; num++)
+            {
+                try
+                {
+                    JObject jo = HttpHelper.PostFunction(TmatrixCodeURL + @"/TmatrixCode/User/UserLogin", @"application/x-www-form-urlencoded", @"userName=" + TQLUserName+ "&password=" + TQLPassword, "");
+                    if (jo == null)
+                    {
+                        Message = "无法访问铺码服务器，请检查网络或铺码服务器地址。";
+                        return false;
+                    }
+                    //"state":"1000",
+                    //"message":"File upload was succeed!",
+                    //" userID ":"1"
+                    //1000 操作成功
+                    if (jo["state"].ToString() == "1000")
+                    {
+                        Message = "";
+                        //登陆成功后用户ID
+                        UserID = jo["userID"].ToString();
+                        return true;
+                    }
+                    else
+                    {
+                        Message = jo["message"].ToString();
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Message = "无法访问铺码服务器：" + e.Message;
+                    ex = e;
+                    Thread.Sleep(1000);
+                }
+            }
+            string ErrMessage = "【TQL登陆】(TQLUserLogin):请求失败。" + Message;
+            LogHelper.WriteErrLog(ErrMessage, ex);
+            return false;
+        }
+
+        /// <summary>
+        /// TQL上传文件
+        /// </summary>
+        /// <param name="filePath">文件路径</param>
+        /// <param name="fileName">文件名</param>
+        /// <param name="Message"></param>
+        /// <returns></returns>
+        public bool TQLStartTmatrix(string filePath,string fileName,out string Message)
+        {
+            Exception ex = null;
+            Message = "";//请求重试5次 共5秒
+            if(string.IsNullOrWhiteSpace(UserID))
+            {
+                if(!TQLUserLogin(out Message))
+                {
+                    return false;
+                }
+            }
+            for (int num = 0; num < 5; num++)
+            {
+                try
+                {
+                    //byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(VideoInfo.VideoPath, len, (int)VideoInfo.SliceLen);
+                    //userID Y 字符 登录之后分配的 ID
+                    //callBack Y 回调 API 该 API 由应用方提供，为 post 请求
+                    //createimage Y 字符 是否生成 png 图片（若生 成则会进行文件打包成 zip）0，不生成，1 生 成。
+                    //fileName Y 字符 文件名称数组
+                    //tmatrixType Y 字符 铺码类型（0.600DPI 打 印、1.1200DPI 打印、 2.印刷
+                    //fileData
+                    //参数
+                    NameValueCollection formFields = new NameValueCollection
+                            {
+                                { "userID", UserID },
+                                { "callBack", ""},
+                                { "createimage", "0" },
+                                { "fileName", fileName },
+                                { "tmatrixType", "1" }
+                            };
+                    string[] PathList = new string[] { filePath };
+                    JObject jo = HttpHelper.UploadFilesToRemoteUrl(TmatrixCodeURL + @"/TmatrixCode/User/startTmatrix", PathList, "", formFields);
+                    if (jo == null)
+                    {
+                        Message = "无法访问铺码服务器，请检查网络或铺码服务器地址。";
+                        return false;
+                    }
+                    Model_TmatrixCode resultObj = JsonHelper.JsonToObj<Model_TmatrixCode>(jo.ToString());
+                    
+                    //1000 操作成功
+                    if (resultObj.state == "1000")
+                    {
+                        Message = "";
+                        pageserial = resultObj.pageserial;
+                        return true;
+                    }
+                    else
+                    {
+                        Message = resultObj.message;
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Message = "无法访问铺码服务器：" + e.Message;
+                    ex = e;
+                    Thread.Sleep(1000);
+                }
+            }
+            string ErrMessage = "【TQL上传】(TQLStartTmatrix):请求失败。" + Message;
+            LogHelper.WriteErrLog(ErrMessage, ex);
+            return false;
+        }
+
+        /// <summary>
+        /// 查询进度
+        /// </summary>
+        /// <param name="Message"></param>
+        /// <returns>-1失败 0：未铺码 1：正在铺码 2：铺码完成，3：未查到。</returns>
+        public int TQLSchedulequery(out string Message)
+        {
+            Exception ex = null;
+            Message = "";//请求重试5次 共5秒
+            for (int num = 0; num < 5; num++)
+            {
+                try
+                {
+                    string[] pageserialList = new string[] { pageserial };
+                    JObject jo = HttpHelper.PostFunction(TmatrixCodeURL + @"/TmatrixCode/User/schedulequery", @"application/x-www-form-urlencoded", @"userID=" + UserID + "&pageserialList=" + pageserialList, "");
+                    if (jo == null)
+                    {
+                        Message = "无法访问铺码服务器，请检查网络或铺码服务器地址。";
+                        return -1;
+                    }
+                    Model_ScheduleQuery resultObj = JsonHelper.JsonToObj<Model_ScheduleQuery>(jo.ToString());
+                    
+                    //1000 操作成功
+                    if (resultObj.state == "1000")
+                    {
+                        //state Y 字符 返回标志
+                        //message Y 字符 返回标志说明
+                        //list Y 字符 进度数组
+                        //schedule Y 字符 返回铺码进度:0 - 100
+                        //pageserial 铺码 ID 字符 铺码 ID
+                        //state Y 数字 0：未铺码 1：正在铺码 2：铺码完成，3：未查到。
+                        Message = "";
+                        return int.Parse(resultObj.list.Find(x => x.pageserial == pageserial).state);
+                    }
+                    else
+                    {
+                        Message = resultObj.message;
+                        return -1;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Message = "无法访问铺码服务器：" + e.Message;
+                    ex = e;
+                    Thread.Sleep(1000);
+                }
+            }
+            string ErrMessage = "【TQL查询进度】(TQLSchedulequery):请求失败。" + Message;
+            LogHelper.WriteErrLog(ErrMessage, ex);
+            return -1;
+        }
+
+        /// <summary>
+        /// TQL历史查询
+        /// </summary>
+        /// <param name="Message"></param>
+        /// <returns></returns>
+        public string TQLHistoryQuery(string fileName,string startPage,string maxPage,out string Message)
+        {
+            Exception ex = null;
+            Message = "";//请求重试5次 共5秒
+            for (int num = 0; num < 5; num++)
+            {
+                try
+                {
+                    //userID Y 字符 登录之后分配的 ID
+                    //fileName N 字符 查询文件名称
+                    //pageserial N 字符 铺码 ID（铺码 ID 或文件名必须设置一个）
+                    //startPage Y int 开始查询页码，从 1 开 始
+                    //maxPage Y int 最大页码数
+                    JObject jo = HttpHelper.PostFunction(TmatrixCodeURL + @"/TmatrixCode/User/HistoryQuery", @"application/x-www-form-urlencoded", @"userID=" + UserID + "&fileName=" + fileName + "&pageserial=" + pageserial + "&startPage=" + startPage + "&maxPage=" + maxPage, "");
+                    if (jo == null)
+                    {
+                        Message = "无法访问铺码服务器，请检查网络或铺码服务器地址。";
+                        return "";
+                    }
+
+                    Model_HistoryQuery resultObj = JsonHelper.JsonToObj<Model_HistoryQuery>(jo.ToString());
+                    //1000 操作成功
+                    if (resultObj.state == "1000")
+                    {
+                        Message = "";
+                        Model_HistoryPageList model_HistoryPageList = resultObj.pageList[0];
+                        Model_HistoryListItem model_HistoryListItem = model_HistoryPageList.list.Find(x => x.pageserial == pageserial);
+                        
+                        return model_HistoryListItem.url;
+                    }
+                    else
+                    {
+                        Message = resultObj.message;
+                        return "";
+                    }
+                }
+                catch (Exception e)
+                {
+                    Message = "无法访问铺码服务器：" + e.Message;
+                    ex = e;
+                    Thread.Sleep(1000);
+                }
+            }
+            string ErrMessage = "【TQL查询历史记录】(TQLHistoryQuery):请求失败。" + Message;
+            LogHelper.WriteErrLog(ErrMessage, ex);
+            return "";
+        }
+    }
+}

XHWK.WKTool/LatticeXML/S0_O000_B0000_P000-255.tmx

@@ -0,0 +1 @@
+S0,O000,B0000,P000-255,D2021/6/30;CC8FB26BWW8K0LR0COOSWE4KSOKA4K4VQ

XHWK.WKTool/MessageWindow.xaml.cs

@@ -4,7 +4,7 @@ using System.Windows.Input;
 namespace XHWK.WKTool
 {
     /// <summary>
-    /// MessageWindow.xaml 的交互逻辑
+    /// 消息提示框 .show()
     /// </summary>
     public partial class MessageWindow : Window
     {

XHWK.WKTool/PrintWindow.xaml

@@ -5,10 +5,10 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHWK.WKTool" xmlns:Views="clr-namespace:XHWK.WKTool.Helpers"
         mc:Ignorable="d"
-        Title="PrintWindow" Height="600" Width="900" AllowsTransparency="True"
+        Title="PrintWindow" AllowsTransparency="True"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
-    WindowStyle="None"  BorderThickness="7">
+    WindowStyle="None"  BorderThickness="7" Width="914" Height="614">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
@@ -30,8 +30,9 @@
             </Setter>
         </Style>
     </Window.Resources>
+
     <Viewbox>
-        <Grid x:Name="GridContent" Height="600" Width="900">
+        <Grid x:Name="GridContent" Width="900" Height="600">
             <Grid.RowDefinitions>
                 <RowDefinition Height="120"/>
                 <RowDefinition Height="*"/>
@@ -57,7 +58,7 @@
                                 FontSize="14"
                                 SelectedValuePath="Key"
                                 />
-                    <TextBlock Text="份数：" FontSize="20" Margin="80,0,0,0" Padding="0,5,0,0" HorizontalAlignment="Right"/>
+                    <TextBlock Text="份数：" FontSize="20" Margin="50,0,0,0" Padding="0,5,0,0" HorizontalAlignment="Right"/>
                     <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" FontSize="16" Padding="50,10,0,0" Background="White"/>
                     <Grid>
                         <Grid.RowDefinitions>
@@ -67,10 +68,32 @@
                         <Button Cursor="Hand" Grid.Row="0" x:Name="btnAdd"  Content="+" Click="BtnAdd_Click"/>
                         <Button Cursor="Hand" Grid.Row="1" x:Name="btnLess"  Content="-" Click="BtnLess_Click"/>
                     </Grid>
+
+                    <TextBlock  Text="DPI："  FontSize="20" Padding="50,5,0,0"/>
+                    <ComboBox Cursor="Hand" Width="210"
+                                x:Name="CbxDpi"
+                                Padding="30,0,10,0"
+                                VerticalContentAlignment="Center"
+                                BorderThickness="0"
+                                DisplayMemberPath="Value"
+                                FontSize="14"
+                                SelectedValuePath="Key"
+                                />
                     <!--<TextBlock Text="点型：" FontSize="20"  Margin="120,10,0,0"/>
                 <RadioButton x:Name="rbnSquarePoint" Content="方点" FontSize="16"  Margin="0,15,0,0" IsChecked="True"/>
                 <RadioButton x:Name="rbnDots" Content="圆点" FontSize="16"  Margin="0,15,0,0"/>-->
                 </StackPanel>
+                <TextBlock  Text="类型："  FontSize="20" Padding="50,5,0,0" Margin="523,0,273,10" Visibility="Hidden" />
+                <ComboBox Cursor="Hand"
+                    x:Name="CbxType"
+                    Padding="30,0,10,0"
+                    VerticalContentAlignment="Center"
+                    BorderThickness="0"
+                    DisplayMemberPath="Value"
+                    FontSize="14"
+                    SelectedValuePath="Key"
+                                Margin="626,0,64,10" Visibility="Hidden"
+                                />
             </Grid>
 
             <Views:ZJClippingBorder Grid.Row="0" x:Name="tip_outer" Margin="0" Background="#FFE6EAF0" CornerRadius="4" Visibility="Collapsed">
@@ -100,7 +123,7 @@
 
             <Button
                     x:Name="btnPrint"
-                    Grid.Row="8"
+                    Grid.Row="2"
                     Width="115"
                     Height="46"
                     Click="BtnPrint_Click"

XHWK.WKTool/PrintWindow.xaml.cs

@@ -1,16 +1,23 @@
 using Common.system;
 
+using Spire.Pdf;
+
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.Drawing;
+using System.Drawing.Printing;
 using System.IO;
 using System.Threading;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 
+using TmatrixLibrary;
+
 namespace XHWK.WKTool
 {
     /// <summary>
@@ -55,6 +62,19 @@ namespace XHWK.WKTool
                 cmbClass.ItemsSource = dtComponentsUniqueNo.DefaultView;
                 cmbClass.SelectedIndex = 0;
             }
+
+            Dictionary<int, int> dicItem = new Dictionary<int, int>();
+            dicItem.Add(0, 600);
+            dicItem.Add(1, 1200);
+            CbxDpi.ItemsSource = dicItem;
+            CbxDpi.SelectedIndex = 0;
+
+            Dictionary<int, string> dictypeItem = new Dictionary<int, string>();
+            dictypeItem.Add(0, "2x2");
+            dictypeItem.Add(1, "3x3");
+            dictypeItem.Add(2, "4x4");
+            CbxType.ItemsSource = dictypeItem;
+            CbxType.SelectedIndex = 0;
         }
 
         private double wit = 0;
@@ -73,7 +93,171 @@ namespace XHWK.WKTool
             }
             I = 0;
             tip_outer.Visibility = Visibility.Collapsed;
+            TQLInit();
         }
+
+        #region TQL打印
+        /// <summary>
+        /// 授权文件位置
+        /// </summary>
+        string TQLAuthorizationPath;
+        /// <summary>
+        /// 授权码
+        /// </summary>
+        string gKeyStr;
+        TmatrixClass TMC = new TmatrixClass();
+        public static string gPrintFileName;
+        //string gDirectory = Application.StartupPath;
+        //string gFileName = "";
+        bool gbInitDone = false;
+        //string gUserName = "";
+        //string gPassword = "";
+        private string gEKeyStr;
+
+
+        iTextSharp.text.Document document;
+
+        enum TMATRIX_POINT_TYPE
+        {
+            TmatrixPointType_2x2 = 0,	// 2x2 Point Type
+            TmatrixPointType_3x3 = 1,	// 3x3 Point Type
+        };
+        enum TMATRIX_OBJECT_TYPE
+        {
+            TMATRIX_OT_ElementCode = 0,	// 此类型对象的Index范围是：75497472~83886079(十六进制为：0x04800000~0x04ffffff)
+            TMATRIX_OT_PositionCode,		// 此类型对象没有Index
+        };
+        /// <summary>
+        /// 初始化打印
+        /// </summary>
+        void TQLInit()
+        {
+            ///初始化
+            if (TMC.TmatrixInitialize() == false)
+            {
+                //MessageBox.Show(this, "点阵码初始化失败!", "生成点阵码", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                //Close();
+            }
+            else
+            {
+                gbInitDone = true;
+            }
+            document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0, 0, 0, 0);
+            try
+            {
+                TQLAuthorizationPath = FileToolsCommon.GetFileAbsolutePath("/LatticeXML/S0_O000_B0000_P000-255.tmx");
+
+                StreamReader gsr = new StreamReader(TQLAuthorizationPath);
+                gKeyStr = gsr.ReadLine();
+                gsr.Close();
+                string KeyCheckResult = TMC.TmatrixKeyCheck_OID4(gKeyStr);
+
+                if (KeyCheckResult.Substring(0, 1) == "1")
+                {
+                    MessageWindow.Show("打印服务授权过期，请联系厂家更换授权！");
+                    LogHelper.WriteErrLog("打印服务授权过期：" + KeyCheckResult, null);
+                    gbInitDone = false;
+                }
+                else if (KeyCheckResult.Substring(0, 1) == "0")
+                {
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("打印服务授权失败：" + ex.Message, ex);
+                MessageWindow.Show("打印服务授权失败，请联系厂家！");
+                gbInitDone = false;
+            }
+        }
+
+        /// <summary>
+        /// 铺码
+        /// </summary>
+        private bool GenerateCode(string PDFPath)
+        {
+            try
+            {
+                if (gbInitDone == false)
+                {
+                    MessageWindow.Show("打印功能无法使用，无效授权。");
+                    return false;
+                }
+                try
+                {
+                    string directoryPath = FileToolsCommon.GetDirectoryName(PDFPath);
+                    FileToolsCommon.DeleteDirectory(directoryPath + "Bg with Images/");
+                    FileToolsCommon.DeleteDirectory(directoryPath + "Bg with Vector Images/");
+                    FileToolsCommon.DeleteDirectory(directoryPath + "Bg without Vector Images/");
+                    FileToolsCommon.DeleteDirectory(directoryPath + "Vector Images/");
+                }
+                catch (Exception)
+                {
+                }
+                int i;
+                for (i = 0; i < 4; i++)
+                {
+                    int DPIValue = 0;
+                    int TypeValue = 0;
+                    try
+                    {
+                        DPIValue = CbxDpi.SelectedIndex;
+                        //TypeValue = CbxType.SelectedIndex;
+
+                    }
+                    catch (Exception)
+                    {
+                    }
+                    APP.gPointType[i] = TypeValue;
+                    APP.gPointDPI[i] = DPIValue;
+                }
+
+                APP.gbGenerateBGWithVImage = false;
+                APP.gbGenerateVImage = false;
+                APP.gbGenerateBGWithoutVImage = false;
+                APP.gbGenerateBGWithImage = true;
+
+                //初始页
+                int SPID = 0;
+                //int PointType = (int)(TMATRIX_POINT_TYPE.TmatrixPointType_3x3);
+                //string sGenerateResult = TMC.GenerateTmatrixCode(gKeyStr, PDFFileName, SPID, PointType, GlobalClass.gbGenerateBGWithVImage, GlobalClass.gbGenerateVImage, GlobalClass.gbGenerateBGWithoutVImage, GlobalClass.gbGenerateBGWithImage);
+                bool[] bPublishImageType = new bool[4];
+                bPublishImageType[0] = APP.gbGenerateBGWithVImage;
+                bPublishImageType[1] = APP.gbGenerateVImage;
+                bPublishImageType[2] = APP.gbGenerateBGWithoutVImage;
+                bPublishImageType[3] = APP.gbGenerateBGWithImage;
+                PDFPath = PDFPath.Replace("/", "\\");
+                string sGenerateResult = TMC.GenerateTmatrixCode_OID4(gKeyStr, PDFPath, SPID, APP.gPointType, bPublishImageType, APP.gPointDPI);
+                if (sGenerateResult.Substring(0, 1) == "1")
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        MessageWindow.Show("打印功能无法使用，无效授权。");
+                    });
+
+                    return false;
+                }
+                else if (sGenerateResult.Substring(0, 1) == "0")
+                {
+                    //生成成功
+                    //打印
+                    //Dispatcher.Invoke(() =>
+                    //{
+                    //});
+                }
+                return true;
+
+            }
+            catch (Exception ex)
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    MessageWindow.Show("打印失败：" + ex.Message);
+                });
+                return false;
+            }
+        }
+        #endregion
+
         /// <summary>
         /// 打印
         /// </summary>
@@ -83,23 +267,14 @@ namespace XHWK.WKTool
         {
             if (string.IsNullOrWhiteSpace(cmbClass.Text))
             {
-                //MessageWindow.Show("打印机不能为空！");
                 MessageWindow.Show("请设置打印机！");
                 return;
             }
-            //APP.myloading.Show();
             btnClose.IsEnabled = false;
             btnPrint.IsEnabled = false;
-            //APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeServering, InvokeServerCompate);
             Thread myThread = new Thread(StartPrint);
             List<string> StrList = new List<string>();
 
-            //string imgPath = 
-            //FileToolsCommon.CreateFile(imgPath);
-            //string pdf = imgPath + "\\101.pdf";
-            //PDF位置
-            //string SourcePath = FileToolsCommon.GetFileAbsolutePath("/temp/101.pdf");
-            //StrList.Add(SourcePath);
             int ipdf = 102;
             string imgPath = FileToolsCommon.GetFileAbsolutePath("temp/");
             string tempImgPath = imgPath;
@@ -154,17 +329,40 @@ namespace XHWK.WKTool
         /// </summary>
         private void StartPrint(object obj)
         {
-
             try
             {
-                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0, 0, 0, 0);
+                document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0f, 0f, 0f, 0f);
+
                 //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
                 ////设置纸张横向
                 //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
 
                 List<string> objStr1 = (List<string>)obj;
                 string SourcePath1 = objStr1[0];
-                iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(SourcePath1, FileMode.Create, FileAccess.ReadWrite));
+                try
+                {
+                    SourcePath1 = SourcePath1.Replace("/", "\\");
+                    FileStream fs = new FileStream(SourcePath1, FileMode.Create, FileAccess.ReadWrite);
+                    document.AddAuthor("星火微课");//作者
+                    document.AddCreationDate();//创建时候
+                    document.AddCreator("星火微课");//创建者
+                    document.AddSubject("点阵文件");//主题
+                    document.AddTitle("PrintTmatrixCode");//标题
+                    document.AddKeywords("Print");
+
+                    document.AddHeader("TmatrixCode", "0");
+                    Thread.Sleep(300);
+                    //iTextSharp.text.pdf.PdfDocument pdfDocument = new iTextSharp.text.pdf.PdfDocument();
+                    //document.AddDocListener(pdfDocument);
+                    //iTextSharp.text.pdf.PdfWriter pdfWriter = new iTextSharp.text.pdf.PdfWriter(pdfDocument, fs);
+                    //pdfDocument.AddWriter(pdfWriter);
+
+                    iTextSharp.text.pdf.PdfWriter.GetInstance(document, fs);
+                }
+                catch (Exception)
+                {
+
+                }
                 document.Open();
                 iTextSharp.text.Image image;
                 for (int i = 0; i < APP.PageDrawList.Count; i++)
@@ -196,12 +394,8 @@ namespace XHWK.WKTool
                                 Y = (float)APP.PageDrawList[i].ImageLocation.Y
                             };
                         });
-
-
-
                         string msgs = string.Empty;
 
-
                         bool isImg = MergerImg(APP.PageDrawList[i].PageImagePath, filePathOutPut, rectangleF, out msgs);
                         if (isImg)
                         {
@@ -230,7 +424,7 @@ namespace XHWK.WKTool
                     //p1.Leading = 150;      //行间距
                     //document.Add(p1);
                 }
-                Console.WriteLine("转换成功！");
+                //Console.WriteLine("转换成功！");
                 document.Close();
             }
             catch (Exception ex)
@@ -250,28 +444,38 @@ namespace XHWK.WKTool
 
 
             List<string> objStr = (List<string>)obj;
+            //PDF位置
             string SourcePath = objStr[0];
             int PrinterNum = int.Parse(objStr[1]);
             string PrinterName = objStr[2];
-            //TPF文件位置
-            string TPFPath = FileToolsCommon.GetFileAbsolutePath("temp/");
-            FileToolsCommon.CreateDirectory(TPFPath);
-            TPFPath += "101.TPF";
-            //生成点阵文件
-            LatticeFileHelper.GeneratingPDF(SourcePath, TPFPath, out int pr, out string msg, out string outPut/*, pyte*/);
-            while (!FileToolsCommon.IsExistFile(TPFPath))
-            {
-                Thread.Sleep(100);
-            }
-            while (string.IsNullOrWhiteSpace(pr.ToString()))
-            {
-                Thread.Sleep(100);
-            }
-            Thread.Sleep(1000);
-            //打印
-            LatticeFileHelper.PrinterTPFFile(TPFPath, PrinterNum, PrinterName, out int printResult, out string standardError, out string standardOutput);
-            if (printResult == 0)
+
+            Thread.Sleep(500);
+            //腾千里生成点阵文件
+            if (GenerateCode(SourcePath))
             {
+                //打印机名称
+                string directoryPath = FileToolsCommon.GetDirectoryName(SourcePath) + "Bg with Images/";
+                string[] strs = FileToolsCommon.GetFileNames(directoryPath);
+
+                try
+                {
+                    foreach (string fileName in strs)
+                    {
+                        Print(fileName, PrinterName, (short)PrinterNum);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        MessageWindow.Show("打印失败："+ex.Message);
+                        btnClose.IsEnabled = true;
+                        btnPrint.IsEnabled = true;
+                        times.Stop();
+                        tip_outer.Visibility = Visibility.Collapsed;
+                        return;
+                    });
+                }
                 Dispatcher.Invoke(() =>
                 {
                     btnClose.IsEnabled = true;
@@ -280,8 +484,20 @@ namespace XHWK.WKTool
                     times.Stop();
                     pgbProcess.Value = 100;
                     lbProcess.Content = "100%";
-                    MessageWindow.Show("打印成功！");
                     tip_outer.Visibility = Visibility.Collapsed;
+                    MessageWindow.Show("已加入打印机队列，打印中。");
+
+
+                    ////打印机名称
+                    //string directoryPath = FileToolsCommon.GetDirectoryName(SourcePath) + "Bg with Images/";
+                    //string[] strs = FileToolsCommon.GetFileNames(directoryPath);
+                    //foreach (string fileName in strs)
+                    //{
+                    //    pdfPrint(directoryPath, PrinterName);
+                    //}
+                    //MessageWindow.Show("生成点阵文件成功！");
+                    //string TPFPath = FileToolsCommon.GetFileAbsolutePath("temp/");
+                    //FileToolsCommon.CreateDirectory(TPFPath);
                 });
             }
             else
@@ -292,9 +508,85 @@ namespace XHWK.WKTool
                     btnPrint.IsEnabled = true;
                     times.Stop();
                     tip_outer.Visibility = Visibility.Collapsed;
-                    MessageWindow.Show(standardError);
+                    return;
                 });
             }
+
+            #region 拓思德生成点阵文件
+            ////TPF文件位置
+            //string TPFPath = FileToolsCommon.GetFileAbsolutePath("temp/");
+            //FileToolsCommon.CreateDirectory(TPFPath);
+            //TPFPath += "101.TPF";
+            ////生成点阵文件
+            //LatticeFileHelper.GeneratingPDF(SourcePath, TPFPath, out int pr, out string msg, out string outPut/*, pyte*/);
+            //while (!FileToolsCommon.IsExistFile(TPFPath))
+            //{
+            //    Thread.Sleep(100);
+            //}
+            //while (string.IsNullOrWhiteSpace(pr.ToString()))
+            //{
+            //    Thread.Sleep(100);
+            //}
+            //Thread.Sleep(1000);
+            #endregion
+
+            #region 拓思德打印
+            ////打印
+            //LatticeFileHelper.PrinterTPFFile(TPFPath, PrinterNum, PrinterName, out int printResult, out string standardError, out string standardOutput);
+            //if (printResult == 0)
+            //{
+            //    Dispatcher.Invoke(() =>
+            //    {
+            //        btnClose.IsEnabled = true;
+            //        btnPrint.IsEnabled = true;
+            //        num = 99;
+            //        times.Stop();
+            //        pgbProcess.Value = 100;
+            //        lbProcess.Content = "100%";
+            //        MessageWindow.Show("打印成功！");
+            //        tip_outer.Visibility = Visibility.Collapsed;
+            //    });
+            //}
+            //else
+            //{
+            //    Dispatcher.Invoke(() =>
+            //    {
+            //        btnClose.IsEnabled = true;
+            //        btnPrint.IsEnabled = true;
+            //        times.Stop();
+            //        tip_outer.Visibility = Visibility.Collapsed;
+            //        MessageWindow.Show(standardError);
+            //    });
+            //}
+            #endregion
+        }
+        /// <summary>
+        /// 调用打印机打印
+        /// </summary>
+        /// <param name="PDFPath">PDF文件路径</param>
+        /// <param name="PrinterName">打印机名称</param>
+        void Print(string PDFPath,string PrinterName,short PrinterNum=1)
+        {
+            //加载PDF文档
+            PdfDocument doc = new PdfDocument();
+            doc.LoadFromFile(PDFPath);
+
+            //指定打印机
+            doc.PrintSettings.PrinterName = PrinterName;
+
+            //静默打印PDF文档
+            doc.PrintSettings.PrintController = new StandardPrintController();
+
+            ////设置文档打印页码范围
+            //doc.PrintSettings.SelectPageRange(1, 5);
+
+            //打印不连续的页面
+            //doc.PrintSettings.SelectSomePages(new int[] { 1, 3, 5, 7 });
+
+            //设置打印份数为2份
+            doc.PrintSettings.Copies = PrinterNum;
+            //打印PDF文档
+            doc.Print();
         }
         /// <summary>
         /// 返回一个时间戳到毫秒
@@ -359,128 +651,8 @@ namespace XHWK.WKTool
             }
 
         }
-        /// <summary>
-        /// 打印-开始
-        /// </summary>
-        /// <returns></returns>
-        private object InvokeServering()
-        {
-            Dispatcher.Invoke(() =>
-             {
-                 I = 1;
-                 pgbProcess.Value = I * 100 / 100;
-                 lbProcess.Content = I.ToString() + "%";
-                 tip_outer.Visibility = Visibility.Visible;
-                 //I = 0;
-             });
-            Thread.Sleep(2000);
-
-            string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
-            FileToolsCommon.CreateFile(imgPath);
-            string pdf = imgPath + "\\101.pdf";
-            string tpf = imgPath + "\\102.TPF";
-            string msg = string.Empty;
-            string outPut = string.Empty;
-            //if(rbnSquarePoint.IsChecked==false)
-            //{
-            //    pyte = 1;
-            //}
-            LatticeFileHelper.GeneratingPDF(pdf, tpf, out int pr, out msg, out outPut/*, pyte*/);
-            if (pr == 0)
-            {
-                //outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
-                //APP.OutPut = outPut.Split(',');
-                //string []page= outPut.Split(',');
-                //for(int i=0;i<page.Length;i++) //增加页码编号
-                //{
-                //    APP.PageDrawList[i].PageCode = page[i];
-                //}
-
-                //string defa = string.Empty;
-                //List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
-
-                string standardError = string.Empty;
-                string standardOutput = string.Empty;
-                int frequency = 1;
-                //Dispatcher.Invoke(() =>
-                //{
-                frequency = Convert.ToInt32(txbNumberOfCopies.Text);
-                LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
-                if (printResult == 0)// 0为成功
-                {
-                    new Thread(new ThreadStart(new Action(() =>
-                    {
-                        Dispatcher.Invoke(() =>
-                        {
-                            I = 100;
-                            pgbProcess.Value = I * 100 / 100;
-                            lbProcess.Content = I.ToString() + "%";
-                            APP.myloading.Hide();
-                            I = 0;
-                        });
-                        Thread.Sleep(3000);
-                        Dispatcher.Invoke(() =>
-                        {
-                            tip_outer.Visibility = Visibility.Collapsed;
-                            //tip_outer.Visibility = Visibility.Collapsed;
-                            MessageWindow.Show("打印成功");
-                        });
-                    }))).Start();
-                }
-                else
-                {
-                    Dispatcher.Invoke(() =>
-                    {
-                        APP.myloading.Hide();
-                        MessageWindow.Show(standardError);
-                    });
-                }
-                //});
-
-            }
-            else
-            {
-                APP.myloading.Hide();
-                MessageWindow.Show(msg);
-            }
-            return "";
-        }
-        /// <summary>
-        /// 打印-结束
-        /// </summary>
-        /// <returns></returns>
-        public void InvokeServerCompate(object obj)
-        {
-            try
-            {
-                GC.Collect();
-                APP.myloading.Hide();
-            }
-            catch (Exception)
-            {
-            }
-        }
 
         private int I = 0;
-        private void Times_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
-        {
-            Dispatcher.Invoke(() =>
-            {
-                if (I <= 90)
-                {
-                    try
-                    {
-                        pgbProcess.Value = I * 100 / 100;
-                        lbProcess.Content = I.ToString() + "%";
-                        I++;
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteErrLog("【摄像】(Times_Elapsed)生成图片错误:" + ex.Message, ex);
-                    }
-                }
-            });
-        }
         /// <summary>
         /// 窗口移动
         /// </summary>
@@ -498,6 +670,7 @@ namespace XHWK.WKTool
         private void BtnClose_Click(object sender, RoutedEventArgs e)
         {
             Hide();
+            TMC.TmatrixUninitialize();
         }
         /// <summary>
         /// 减
@@ -528,9 +701,5 @@ namespace XHWK.WKTool
             }
         }
 
-        private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
-        {
-
-        }
     }
 }

XHWK.WKTool/PrintWindowTStudy.xaml

@@ -0,0 +1,128 @@
+<Window x:Class="XHWK.WKTool.PrintWindowTStudy"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:XHWK.WKTool" xmlns:Views="clr-namespace:XHWK.WKTool.Helpers"
+        mc:Ignorable="d"
+        Title="PrintWindowTStudy" Height="600" Width="900" AllowsTransparency="True"
+    ShowInTaskbar="False"
+    WindowStartupLocation="CenterOwner"
+    WindowStyle="None"  BorderThickness="7">
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
+    <Window.Resources>
+        <Style x:Key="NoMouseOverButtonStyle" TargetType="{x:Type Button}">
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Padding" Value="1"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border x:Name="Chrome" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    <Grid x:Name="GridContent" Height="600">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="120"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="80"/>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0" Background="#E6EAF0" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="50"/>
+                <RowDefinition Height="50"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Button Cursor="Hand" Grid.Row="0" x:Name="btnClose" Background="#CC4848" Foreground="#FFFFFF" Content="×" FontSize="20" Width="30" Height="30" HorizontalAlignment="Right" Margin="0,0,10,0" Click="BtnClose_Click" Style="{StaticResource NoMouseOverButtonStyle}">
+
+            </Button>
+            <StackPanel Grid.Row="1" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,2,0,0" Height="40">
+                <TextBlock  Text="打印机："  FontSize="20" Padding="0,5,0,0"/>
+                <ComboBox Cursor="Hand" Width="210"
+                                x:Name="cmbClass"
+                                Padding="30,0,10,0"
+                                VerticalContentAlignment="Center"
+                                BorderThickness="0"
+                                DisplayMemberPath="Value"
+                                FontSize="14"
+                                SelectedValuePath="Key"
+                                />
+                <TextBlock Text="份数：" FontSize="20" Margin="80,0,0,0" Padding="0,5,0,0" HorizontalAlignment="Right"/>
+                <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" FontSize="16" Padding="50,10,0,0" Background="White"/>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <Button Cursor="Hand" Grid.Row="0" x:Name="btnAdd"  Content="+" Click="BtnAdd_Click"/>
+                    <Button Cursor="Hand" Grid.Row="1" x:Name="btnLess"  Content="-" Click="BtnLess_Click"/>
+                </Grid>
+                <!--<TextBlock Text="点型：" FontSize="20"  Margin="120,10,0,0"/>
+                <RadioButton x:Name="rbnSquarePoint" Content="方点" FontSize="16"  Margin="0,15,0,0" IsChecked="True"/>
+                <RadioButton x:Name="rbnDots" Content="圆点" FontSize="16"  Margin="0,15,0,0"/>-->
+            </StackPanel>
+        </Grid>
+
+        <Views:ZJClippingBorder Grid.Row="0" x:Name="tip_outer" Margin="0" Background="#FFE6EAF0" CornerRadius="4" Visibility="Collapsed">
+            <Grid>
+                <Label Content="打印中..." HorizontalAlignment="Center" Margin="0,20,0,0" Height="35" VerticalAlignment="Top" FontSize="20"></Label>
+                <ProgressBar BorderBrush="#4597FF"
+                             Foreground="#4597FF"
+                    Grid.Row="0"
+                    x:Name="pgbProcess"
+                    Height="20"
+                    Margin="50,20,50,0"
+                    Visibility="Visible" />
+                <Label Grid.Row="0"
+                    HorizontalAlignment="Center" Width="60"
+                    x:Name="lbProcess"
+                    Height="30"
+                    Margin="0,20,0,0"
+                       FontSize="16"
+                    Content=""
+                       Foreground="White"
+                    Visibility="Visible" />
+            </Grid>
+        </Views:ZJClippingBorder>
+        <Grid Grid.Row="1">
+            <Image x:Name="imgPri"/>
+        </Grid>
+
+        <Button
+                    x:Name="btnPrint"
+                    Grid.Row="2"
+                    Width="115"
+                    Height="46"
+                    Click="BtnPrint_Click"
+                    Content="打印"
+            Foreground="White"
+                    FontSize="17"
+                    IsDefault="True"
+                    Cursor="Hand"
+                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+            <Button.Template>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border
+                                BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="7">
+                        <Border.Background>#2E8CF0</Border.Background>
+                        <ContentPresenter
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding ContentControl.Content}" />
+                    </Border>
+                </ControlTemplate>
+            </Button.Template>
+        </Button>
+    </Grid>
+</Window>

XHWK.WKTool/PrintWindowTStudy.xaml.cs

@@ -0,0 +1,632 @@
+using Common.system;
+
+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;
+using System.Windows.Media.Imaging;
+using System.Windows.Threading;
+
+using TmatrixLibrary;
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// 打印
+    /// </summary>
+    public partial class PrintWindowTStudy : Window
+    {
+        /// <summary>
+        /// 下拉框数据源
+        /// </summary>
+        public DataTable data = new DataTable();
+        private DataTable dtComponentsUniqueNo;
+
+        private System.Timers.Timer times;
+        public PrintWindowTStudy()
+        {
+            InitializeComponent();
+            double proportion = 1036.0 / 1290.0;
+            double Widths = (PrimaryScreen.ScaleWorkingAreaSize.Height) / proportion - (BorderThickness.Left + BorderThickness.Right);
+            double Heights = PrimaryScreen.ScaleWorkingAreaSize.Height - (BorderThickness.Top + BorderThickness.Bottom);
+            Width = Widths / 1.42;
+            Height = Heights / 1.71;
+            GridContent.Width = Width + 5;
+            GridContent.Height = Height;
+            ResizeMode = ResizeMode.NoResize;
+            string defa = string.Empty;
+            List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
+            if (defaList.Count > 0)
+            {
+                data.Columns.Add("Value");
+                data.Columns.Add("Key");
+                for (int i = 0; i < defaList.Count; i++)
+                {
+                    //创建一行
+                    DataRow row = data.NewRow();
+                    //将此行添加到table中
+                    data.Rows.Add(row);
+                    data.Rows[i]["Value"] = defaList[i];
+                    data.Rows[i]["Key"] = i.ToString();
+                }
+                dtComponentsUniqueNo = data.DefaultView.ToTable();
+                cmbClass.ItemsSource = dtComponentsUniqueNo.DefaultView;
+                cmbClass.SelectedIndex = 0;
+            }
+        }
+
+        private double wit = 0;
+        private 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));
+            }
+            else
+            {
+                imgPri.Source = null;
+            }
+            I = 0;
+            tip_outer.Visibility = Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// 打印
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnPrint_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(cmbClass.Text))
+            {
+                //MessageWindow.Show("打印机不能为空！");
+                MessageWindow.Show("请设置打印机！");
+                return;
+            }
+            //APP.myloading.Show();
+            btnClose.IsEnabled = false;
+            btnPrint.IsEnabled = false;
+            //APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeServering, InvokeServerCompate);
+            Thread myThread = new Thread(StartPrint);
+            List<string> StrList = new List<string>();
+
+            //string imgPath = 
+            //FileToolsCommon.CreateFile(imgPath);
+            //string pdf = imgPath + "\\101.pdf";
+            //PDF位置
+            //string SourcePath = FileToolsCommon.GetFileAbsolutePath("/temp/101.pdf");
+            //StrList.Add(SourcePath);
+            int ipdf = 102;
+            string imgPath = FileToolsCommon.GetFileAbsolutePath("temp/");
+            string tempImgPath = imgPath;
+            imgPath += "101.pdf";
+            while (File.Exists(imgPath))
+            {
+                imgPath = tempImgPath + ipdf.ToString() + ".pdf";
+                ipdf++;
+            }
+            StrList.Add(imgPath);
+            //打印数量
+            int PrinterNum = Convert.ToInt32(txbNumberOfCopies.Text);
+            StrList.Add(PrinterNum.ToString());
+            //打印机名称
+            string PrinterName = cmbClass.Text;
+            StrList.Add(PrinterName);
+
+            num = 0;
+            tip_outer.Visibility = Visibility.Visible;
+            myThread.Start(StrList);
+            times = new System.Timers.Timer(100);
+            times.Elapsed += Times_ElapsedClick;
+            times.Start();
+        }
+
+        private int num = 0;
+        /// <summary>
+        /// 计时器
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Times_ElapsedClick(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                pgbProcess.Value = num;
+                lbProcess.Content = num.ToString() + "%";
+                if (num < 99)
+                {
+                    num++;
+                    times.Interval += (num / 2);
+                }
+                else
+                {
+                    times.Stop();
+                }
+            });
+        }
+
+        /// <summary>
+        /// 开始打印
+        /// </summary>
+        private 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());
+
+                List<string> objStr1 = (List<string>)obj;
+                string SourcePath1 = objStr1[0];
+                iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(SourcePath1, 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]);
+            string PrinterName = objStr[2];
+            //TPF文件位置
+            string TPFPath = FileToolsCommon.GetFileAbsolutePath("temp/");
+            FileToolsCommon.CreateDirectory(TPFPath);
+            TPFPath += "101.TPF";
+
+            #region 腾千里服务打印
+            //if (APP.dAL_TmatrixCode == null)
+            //{
+            //    APP.dAL_TmatrixCode = new DAL.DAL_TmatrixCode();
+            //}
+            //string ErrMessage;
+            //if(APP.dAL_TmatrixCode.TQLUserLogin(out ErrMessage))
+            //{
+            //    if(APP.dAL_TmatrixCode.TQLStartTmatrix(TPFPath, "101.TPF", out ErrMessage))
+            //    {
+            //        while(true)
+            //        {
+            //            //-1失败 0：未铺码 1：正在铺码 2：铺码完成，3：未查到。
+            //            int TmatrixType = APP.dAL_TmatrixCode.TQLSchedulequery(out ErrMessage);
+            //            if(TmatrixType==0)
+            //            {
+            //                //未铺码
+            //                Thread.Sleep(3000);
+            //            }
+            //            else if(TmatrixType==1)
+            //            {
+            //                //正在铺码
+            //                Thread.Sleep(1000);
+            //            }
+            //            else if (TmatrixType == 2)
+            //            {
+            //                //铺码完成
+            //                Dispatcher.Invoke(() =>
+            //                {
+            //                    btnClose.IsEnabled = true;
+            //                    btnPrint.IsEnabled = true;
+            //                    num = 99;
+            //                    times.Stop();
+            //                    pgbProcess.Value = 100;
+            //                    lbProcess.Content = "100%";
+            //                    MessageWindow.Show("打印成功！");
+            //                    tip_outer.Visibility = Visibility.Collapsed;
+            //                });
+
+            //            }
+            //            else if (TmatrixType == 3)
+            //            {
+            //                //未查到
+            //                Dispatcher.Invoke(() =>
+            //                {
+            //                    btnClose.IsEnabled = true;
+            //                    btnPrint.IsEnabled = true;
+            //                    times.Stop();
+            //                    tip_outer.Visibility = Visibility.Collapsed;
+            //                    MessageWindow.Show("文件铺码失败，" + ErrMessage);
+            //                });
+            //                break;
+            //            }
+            //            else //if (TmatrixType == -1)
+            //            {
+            //                Dispatcher.Invoke(() =>
+            //                {
+            //                    btnClose.IsEnabled = true;
+            //                    btnPrint.IsEnabled = true;
+            //                    times.Stop();
+            //                    tip_outer.Visibility = Visibility.Collapsed;
+            //                    MessageWindow.Show("文件铺码失败，" + ErrMessage);
+            //                });
+            //                break;
+            //            }
+            //        }
+            //    }
+            //    else
+            //    {
+            //        Dispatcher.Invoke(() =>
+            //        {
+            //            btnClose.IsEnabled = true;
+            //            btnPrint.IsEnabled = true;
+            //            times.Stop();
+            //            tip_outer.Visibility = Visibility.Collapsed;
+            //            MessageWindow.Show("文件铺码失败，"+ErrMessage);
+            //        });
+            //    }
+            //}
+            //else
+            //{
+            //    Dispatcher.Invoke(() =>
+            //    {
+            //        btnClose.IsEnabled = true;
+            //        btnPrint.IsEnabled = true;
+            //        times.Stop();
+            //        tip_outer.Visibility = Visibility.Collapsed;
+            //        MessageWindow.Show("登录铺码服务器失败，"+ErrMessage);
+            //    });
+            //}
+            #endregion
+
+            #region 拓思德生成点阵文件
+            //生成点阵文件
+            LatticeFileHelper.GeneratingPDF(SourcePath, TPFPath, out int pr, out string msg, out string outPut/*, pyte*/);
+            while (!FileToolsCommon.IsExistFile(TPFPath))
+            {
+                Thread.Sleep(100);
+            }
+            while (string.IsNullOrWhiteSpace(pr.ToString()))
+            {
+                Thread.Sleep(100);
+            }
+            Thread.Sleep(1000);
+            #endregion
+
+            #region 拓思德打印
+            //打印
+            LatticeFileHelper.PrinterTPFFile(TPFPath, PrinterNum, PrinterName, out int printResult, out string standardError, out string standardOutput);
+            if (printResult == 0)
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    btnClose.IsEnabled = true;
+                    btnPrint.IsEnabled = true;
+                    num = 99;
+                    times.Stop();
+                    pgbProcess.Value = 100;
+                    lbProcess.Content = "100%";
+                    MessageWindow.Show("打印成功！");
+                    tip_outer.Visibility = Visibility.Collapsed;
+                });
+            }
+            else
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    btnClose.IsEnabled = true;
+                    btnPrint.IsEnabled = true;
+                    times.Stop();
+                    tip_outer.Visibility = Visibility.Collapsed;
+                    MessageWindow.Show(standardError);
+                });
+            }
+            #endregion
+        }
+        /// <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);
+                }
+                #region 添加箭头
+                string Str = "↑";
+                SolidBrush mybrush = new SolidBrush(Color.Black);  //设置默认画刷颜色
+                Font myfont = new Font("黑体", 14);         //设置默认字体格式
+                g.DrawString(Str, myfont, mybrush, new Rectangle((int)wit - 50, 20, 50, 50));
+
+                #endregion
+                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>
+        /// <returns></returns>
+        private object InvokeServering()
+        {
+            Dispatcher.Invoke(() =>
+             {
+                 I = 1;
+                 pgbProcess.Value = I * 100 / 100;
+                 lbProcess.Content = I.ToString() + "%";
+                 tip_outer.Visibility = Visibility.Visible;
+                 //I = 0;
+             });
+            Thread.Sleep(2000);
+
+            string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
+            FileToolsCommon.CreateFile(imgPath);
+            string pdf = imgPath + "\\101.pdf";
+            string tpf = imgPath + "\\102.TPF";
+            string msg = string.Empty;
+            string outPut = string.Empty;
+            //if(rbnSquarePoint.IsChecked==false)
+            //{
+            //    pyte = 1;
+            //}
+            LatticeFileHelper.GeneratingPDF(pdf, tpf, out int pr, out msg, out outPut/*, pyte*/);
+            if (pr == 0)
+            {
+                //outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
+                //APP.OutPut = outPut.Split(',');
+                //string []page= outPut.Split(',');
+                //for(int i=0;i<page.Length;i++) //增加页码编号
+                //{
+                //    APP.PageDrawList[i].PageCode = page[i];
+                //}
+
+                //string defa = string.Empty;
+                //List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
+
+                string standardError = string.Empty;
+                string standardOutput = string.Empty;
+                int frequency = 1;
+                //Dispatcher.Invoke(() =>
+                //{
+                frequency = Convert.ToInt32(txbNumberOfCopies.Text);
+                LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
+                if (printResult == 0)// 0为成功
+                {
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        Dispatcher.Invoke(() =>
+                        {
+                            I = 100;
+                            pgbProcess.Value = I * 100 / 100;
+                            lbProcess.Content = I.ToString() + "%";
+                            APP.myloading.Hide();
+                            I = 0;
+                        });
+                        Thread.Sleep(3000);
+                        Dispatcher.Invoke(() =>
+                        {
+                            tip_outer.Visibility = Visibility.Collapsed;
+                            //tip_outer.Visibility = Visibility.Collapsed;
+                            MessageWindow.Show("打印成功");
+                        });
+                    }))).Start();
+                }
+                else
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        APP.myloading.Hide();
+                        MessageWindow.Show(standardError);
+                    });
+                }
+                //});
+
+            }
+            else
+            {
+                APP.myloading.Hide();
+                MessageWindow.Show(msg);
+            }
+            return "";
+        }
+        /// <summary>
+        /// 打印-结束
+        /// </summary>
+        /// <returns></returns>
+        public void InvokeServerCompate(object obj)
+        {
+            try
+            {
+                GC.Collect();
+                APP.myloading.Hide();
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        private int I = 0;
+        private void Times_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                if (I <= 90)
+                {
+                    try
+                    {
+                        pgbProcess.Value = I * 100 / 100;
+                        lbProcess.Content = I.ToString() + "%";
+                        I++;
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteErrLog("【摄像】(Times_Elapsed)生成图片错误:" + ex.Message, ex);
+                    }
+                }
+            });
+        }
+        /// <summary>
+        /// 窗口移动
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            DragMove();
+        }
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnClose_Click(object sender, RoutedEventArgs e)
+        {
+            Hide();
+        }
+        /// <summary>
+        /// 减
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnLess_Click(object sender, RoutedEventArgs e)
+        {
+            int num = Convert.ToInt32(txbNumberOfCopies.Text);
+            if (num > 1)
+            {
+                num = num - 1;
+                txbNumberOfCopies.Text = num.ToString();
+            }
+        }
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnAdd_Click(object sender, RoutedEventArgs e)
+        {
+            int num = Convert.ToInt32(txbNumberOfCopies.Text);
+            if (num > 0)
+            {
+                num = num + 1;
+                txbNumberOfCopies.Text = num.ToString();
+            }
+        }
+
+    }
+}

XHWK.WKTool/Properties/AssemblyInfo.cs

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

XHWK.WKTool/TQLPen/PenEvents.cs

@@ -38,6 +38,17 @@ namespace XHWK.WKTool
             //this.form = form;
             Manager = new PenCommManager(this);
             Manager.Init();
+
+            ////获取离线数据量
+            //Manager.GetOfflineDataNo();
+            ////开始下载离线数据
+            //Manager.StartDownloadOfflineData();
+            ////继续
+            //Manager.ContinueDownloadOfflineData();
+            ////暂停下载
+            //Manager.PauseDownloadOfflineData();
+            //删除离线数据
+            Manager.RemoveOfflineData();
         }
 
 
@@ -111,18 +122,19 @@ namespace XHWK.WKTool
         {
             if (bEnd)
             {
-                //if (form.StartDownload) form.StartDownload = false;
-                //form.StartOrStop(form.StartDownload);
-                //form.DrawOffType = -1;
-
-                //form.AddLog("下载离线数据成功！");
-
-                //form.SetProGress(100);
+                ////继续
+                //Manager.ContinueDownloadOfflineData();
+                ////暂停下载
+                //Manager.PauseDownloadOfflineData();
+                //下载离线数据成功！
+                //删除离线数据
+                Manager.RemoveOfflineData();
             }
             else
             {
-                //if (!form.StartDownload) form.StartDownload = true;
-                //form.AddLog("下载离线数据失败！");
+                //下载离线数据失败！
+                //删除离线数据
+                Manager.RemoveOfflineData();
             }
         }
 
@@ -189,7 +201,13 @@ namespace XHWK.WKTool
 
         public void onGetOfflineDataNo(int Data)
         {
-            //ConnectPen = true;
+            ConnectPen = true;
+
+            if (Data > 0)
+            {
+                //开始下载离线数据
+                Manager.StartDownloadOfflineData();
+            }
             //form.AddLog("当前离线数据量:" + Data.ToString() + "!");
             //if (Data == 0 && form.StartDownload == true)
             //{

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -131,6 +131,16 @@ namespace XHWK.WKTool
             new Aspose.Pdf.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
             new Aspose.Slides.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
             InitializeComponent();
+            //string StrMessage = "";
+            //if (AutoStartHelper.OpenAutoStart(FileToolsCommon.GetFileAbsolutePath("/星火微课.exe"), out StrMessage))
+            //{
+            //    MessageWindow.Show("自启成功！");
+            //}
+            //else
+            //{
+
+            //    MessageWindow.Show(StrMessage);
+            //}
 
             float WorkW = PrimaryScreen.ScaleWorkingAreaSize.Width;
             float WorkH = PrimaryScreen.ScaleWorkingAreaSize.Height;

XHWK.WKTool/XHWK.WKTool.csproj

@@ -14,6 +14,21 @@
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -75,8 +90,24 @@
     <Reference Include="Aspose.Words, Version=19.1.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
       <HintPath>..\packages\Aspose.Words.19.1.0\lib\net40\Aspose.Words.dll</HintPath>
     </Reference>
-    <Reference Include="itextsharp, Version=5.5.13.1, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
-      <HintPath>..\packages\iTextSharp.5.5.13.1\lib\itextsharp.dll</HintPath>
+    <Reference Include="AxInterop.AcroPDFLib">
+      <HintPath>..\Common\dlls\TQLFinalDLL\AxInterop.AcroPDFLib.dll</HintPath>
+    </Reference>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
+      <HintPath>..\packages\BouncyCastle.1.8.6.1\lib\BouncyCastle.Crypto.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentTools">
+      <HintPath>..\Common\dlls\TQLFinalDLL\DocumentTools.dll</HintPath>
+    </Reference>
+    <Reference Include="DrawToolsLib">
+      <HintPath>..\Common\dlls\TQLFinalDLL\DrawToolsLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Interop.AcroPDFLib">
+      <HintPath>..\Common\dlls\TQLFinalDLL\Interop.AcroPDFLib.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="itextsharp, Version=5.5.13.2, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\iTextSharp.5.5.13.2\lib\itextsharp.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
       <HintPath>..\Common\dlls\log4net.dll</HintPath>
@@ -89,6 +120,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Common\dlls\RobotpenGateway.dll</HintPath>
     </Reference>
+    <Reference Include="Spire.License, Version=1.3.8.40, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
+      <HintPath>..\packages\FreeSpire.PDF.7.2.0\lib\net40\Spire.License.dll</HintPath>
+    </Reference>
+    <Reference Include="Spire.Pdf, Version=7.2.6.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+      <HintPath>..\packages\FreeSpire.PDF.7.2.0\lib\net40\Spire.Pdf.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
@@ -105,6 +142,9 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="TmatrixLibrary_OID4">
+      <HintPath>..\Common\dlls\TQLFinalDLL\TmatrixLibrary_OID4.dll</HintPath>
+    </Reference>
     <Reference Include="TQLComm, Version=3.0.6.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Common\dlls\TQLComm.dll</HintPath>
@@ -143,6 +183,7 @@
     <Compile Include="CountdownWindow.xaml.cs">
       <DependentUpon>CountdownWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DAL\DAL_TmatrixCode.cs" />
     <Compile Include="DAL\DAL_Upload.cs" />
     <Compile Include="DAL\Interface.cs" />
     <Compile Include="DAL\ResultVo.cs" />
@@ -181,6 +222,9 @@
     <Compile Include="PracticeWindow.xaml.cs">
       <DependentUpon>PracticeWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PrintWindowTStudy.xaml.cs">
+      <DependentUpon>PrintWindowTStudy.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PrintWindow.xaml.cs">
       <DependentUpon>PrintWindow.xaml</DependentUpon>
     </Compile>
@@ -245,6 +289,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="PrintWindowTStudy.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="PrintWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -310,6 +358,9 @@
     <EmbeddedResource Include="ffmpegx64.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="LatticeXML\S0_O000_B0000_P000-255.tmx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
     <None Include="packages.config" />
     <EmbeddedResource Include="PrintTool\data\compress\compress.ps">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -1637,7 +1688,18 @@
     <Resource Include="Images\countdown1_6.png" />
     <Resource Include="Images\countdown1_7.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="SSCR\Setup Screen Capturer Recorder v0.12.10.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

XHWK.WKTool/packages.config

@@ -9,7 +9,9 @@
   <package id="Aspose.PDF" version="19.1.0" targetFramework="net452" />
   <package id="Aspose.Slides.NET" version="19.10.0" targetFramework="net452" />
   <package id="Aspose.Words" version="19.1.0" targetFramework="net452" />
-  <package id="iTextSharp" version="5.5.13.1" targetFramework="net452" />
+  <package id="BouncyCastle" version="1.8.6.1" targetFramework="net452" />
+  <package id="FreeSpire.PDF" version="7.2.0" targetFramework="net452" />
+  <package id="iTextSharp" version="5.5.13.2" targetFramework="net452" />
   <package id="System.Management" version="4.7.0" targetFramework="net452" />
   <package id="WpfAnimatedGif" version="2.0.0" targetFramework="net452" />
 </packages>