激活码、验证记录

Common/Common.csproj

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

Common/system/DataProvider.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Common.system
+{
+    public class DataProvider
+    {
+        ///3DES解密   
+        public static string TripleDESDecrypt(string pToDecrypt, string sKey)
+        {
+            sKey = sKey.Substring(0, 24);
+            TripleDESCryptoServiceProvider des = new TripleDESCryptoServiceProvider
+            {
+                Mode = CipherMode.ECB,
+                Padding = PaddingMode.Zeros
+            };
+            byte[] inputByteArray = new byte[pToDecrypt.Length / 2];
+            for (int x = 0; x < pToDecrypt.Length / 2; x++)
+            {
+                int i = (Convert.ToInt32(pToDecrypt.Substring(x * 2, 2), 16));
+                inputByteArray[x] = (byte)i;
+            }
+
+            des.Key = ASCIIEncoding.ASCII.GetBytes(sKey);
+            des.IV = new byte[] { 0, 00, 00, 00, 00, 00, 00, 00, };
+            MemoryStream ms = new MemoryStream();
+            CryptoStream cs = new CryptoStream(ms, des.CreateDecryptor(), CryptoStreamMode.Write);
+            cs.Write(inputByteArray, 0, inputByteArray.Length);
+            cs.FlushFinalBlock();
+
+            StringBuilder ret = new StringBuilder();
+
+            return System.Text.Encoding.Default.GetString(ms.ToArray()).Replace("\0", "");
+        }
+        /// <summary>
+        /// 返回一个时间戳到秒
+        /// </summary>
+        /// <returns></returns>
+        public static long TimestampTotalSeconds()
+        {
+            TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            long timestr = Convert.ToInt64(ts.TotalSeconds);
+            return timestr;
+        }
+    }
+}

XHWK.Model/Model_Signatures.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    public class Model_Signatures
+    {
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public long begintime { get; set; }
+        /// <summary>
+        /// 激活码
+        /// </summary>
+        public string code { get; set; }
+        /// <summary>
+        /// 设备   
+        /// </summary>
+        public string device { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public long endtime { get; set; }
+        /// <summary>
+        /// 物理地址   
+        /// </summary>
+        public string mac { get; set; }
+    }
+}

XHWK.Model/XHWK.Model.csproj

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

XHWK.WKTool/App.cs

@@ -5,6 +5,7 @@ using Common.system;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Reflection;
 using System.Security.Principal;
 using System.Threading;
@@ -14,6 +15,7 @@ using System.Windows.Threading;
 using TStudyDigitalPen.HID;
 
 using XHWK.Model;
+using XHWK.WKTool.Helpers;
 
 namespace XHWK.WKTool
 {
@@ -44,7 +46,15 @@ namespace XHWK.WKTool
         /// 数据存放目录
         /// </summary>
         public static string dataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\XHMicroLesson\\";
-
+        /// <summary>
+        /// 后台线程帮助类
+        /// </summary>
+        public static BackgroundWorkerHelper BackgroundWorkerHelper => BackgroundWorkerHelper.GetInstance();
+        /// <summary>
+        /// 签名
+        /// </summary>
+        public static string Signature = "";
+        public static string secretKey = "nanhuakaizhangjianwangni";
         /// <summary>
         /// 用户信息
         /// </summary>
@@ -194,40 +204,113 @@ namespace XHWK.WKTool
                 WindowsIdentity identity = WindowsIdentity.GetCurrent();
                 WindowsPrincipal principal = new WindowsPrincipal(identity);
                 //判断当前登录用户是否为管理员
-                if (principal.IsInRole(WindowsBuiltInRole.Administrator))
+                //if (principal.IsInRole(WindowsBuiltInRole.Administrator))
+                //{
+                //    //如果是管理员，则直接运行
+                //    W_CreateAMicroLessonWindow = new CreateAMicroLessonWindow();
+                //    // 定义Application对象作为整个应用程序入口
+                //    Application app = new Application();
+                //    app.Run(W_CreateAMicroLessonWindow);
+                //    //Application.Run(W_CreateAMicroLessonWindow);
+                //}
+                //else
+                //{
+                //    //创建启动对象
+                //    System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo
+                //    {
+                //        UseShellExecute = true,
+                //        WorkingDirectory = Environment.CurrentDirectory,
+                //        FileName = Assembly.GetExecutingAssembly().Location,
+                //        //设置启动动作,确保以管理员身份运行
+                //        Verb = "runas"
+                //    };
+                //    try
+                //    {
+                //        System.Diagnostics.Process.Start(startInfo);
+                //    }
+                //    catch
+                //    {
+                //        return;
+                //    }
+                //    //退出
+                //    //Current.Shutdown();
+                //    Environment.Exit(0);
+
+                //}
+                #endregion
+
+
+
+                //如果本地文件为空，弹出弹窗 输密匙
+                //本地文件不为空， 解析
+                if (!File.Exists(APP.dataPath + "signature.txt"))//上次登陆时间为空 或者签名为空 或者上次登陆时间不是今天   都需要输入密匙验证 ，否则只验证本地的签名
                 {
-                    //如果是管理员，则直接运行
-                    W_CreateAMicroLessonWindow = new CreateAMicroLessonWindow();
-                    // 定义Application对象作为整个应用程序入口
-                    Application app = new Application();
-                    app.Run(W_CreateAMicroLessonWindow);
-                    //Application.Run(W_CreateAMicroLessonWindow);
+                    if (principal.IsInRole(WindowsBuiltInRole.Administrator))
+                    {
+                        //如果是管理员，则直接运行
+                        KeyVerification wins = new KeyVerification();
+                        // 定义Application对象作为整个应用程序入口
+                        Application app = new Application();
+                        app.Run(wins);
+                    }
+                    else
+                    {
+                        //创建启动对象
+                        System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo
+                        {
+                            UseShellExecute = true,
+                            WorkingDirectory = Environment.CurrentDirectory,
+                            FileName = Assembly.GetExecutingAssembly().Location,
+                            //设置启动动作,确保以管理员身份运行
+                            Verb = "runas"
+                        };
+                        try
+                        {
+                            System.Diagnostics.Process.Start(startInfo);
+                        }
+                        catch
+                        {
+                            return;
+                        }
+                        //退出
+                        //Current.Shutdown();
+                        Environment.Exit(0);
+
+                    }
                 }
                 else
                 {
-                    //创建启动对象
-                    System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo
+                    if (principal.IsInRole(WindowsBuiltInRole.Administrator))
                     {
-                        UseShellExecute = true,
-                        WorkingDirectory = Environment.CurrentDirectory,
-                        FileName = Assembly.GetExecutingAssembly().Location,
-                        //设置启动动作,确保以管理员身份运行
-                        Verb = "runas"
-                    };
-                    try
-                    {
-                        System.Diagnostics.Process.Start(startInfo);
+                        ProductVerification wins = new ProductVerification();
+                        Application app = new Application();
+                        app.Run(wins);
                     }
-                    catch
+                    else
                     {
-                        return;
-                    }
-                    //退出
-                    //Current.Shutdown();
-                    Environment.Exit(0);
+                        //创建启动对象
+                        System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo
+                        {
+                            UseShellExecute = true,
+                            WorkingDirectory = Environment.CurrentDirectory,
+                            FileName = Assembly.GetExecutingAssembly().Location,
+                            //设置启动动作,确保以管理员身份运行
+                            Verb = "runas"
+                        };
+                        try
+                        {
+                            System.Diagnostics.Process.Start(startInfo);
+                        }
+                        catch
+                        {
+                            return;
+                        }
+                        //退出
+                        //Current.Shutdown();
+                        Environment.Exit(0);
 
+                    }
                 }
-                #endregion
             }
             catch (Exception ex)
             {

XHWK.WKTool/DAL/Interface.cs

@@ -4,7 +4,8 @@ using Newtonsoft.Json.Linq;
 
 using System;
 using System.Collections.Generic;
-
+using System.IO;
+using System.Text;
 using XHWK.Model;
 
 namespace XHWK.WKTool.DAL
@@ -15,6 +16,109 @@ namespace XHWK.WKTool.DAL
         //private string FileRequestAddress = FileToolsCommon.GetConfigValue("FileRequestAddress");
         //private string schoolfileRequestAddress = FileToolsCommon.GetConfigValue("schoolfileRequestAddress");
         /// <summary>
+        /// 激活信息--添加
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public int ActivationAdd(string mac, string device, string projectcode)
+        {
+            try
+            {
+                string url = APP.certapiUrl + "/activation/add";//地址
+                Dictionary<string, object> dic = new Dictionary<string, object>
+                {
+                    { "mac", mac },
+                    { "device", device },
+                    { "projectcode", projectcode }
+                };
+                string body = JsonHelper.ToJson(dic);
+
+                string xmlDoc = HttpHelper.HttpPost(body, url);
+
+                if (string.IsNullOrEmpty(xmlDoc))
+                {
+                    APP.ServerMsg = "网络异常！";
+                    return 1;
+                }
+                else
+                {
+                    JObject obj = JObject.Parse(xmlDoc);
+                    if (obj != null)
+                    {
+                        if (obj["code"].ToString().Equals("0"))
+                        {
+                            APP.Signature = obj["obj"].ToString();
+                            if (!Directory.Exists(APP.dataPath))
+                            {
+                                Directory.CreateDirectory(APP.dataPath);
+                            }
+                            string ApplicationData = APP.dataPath + "signature.txt";
+
+                            System.IO.File.WriteAllText(ApplicationData, APP.Signature, Encoding.Default);//存放签名
+                            return 0;
+                        }
+                        else
+                        {
+                            APP.ServerMsg = obj["msg"].ToString();
+                            return Convert.ToInt32(obj["code"].ToString());
+                        }
+                    }
+                    else
+                    {
+                        return 1;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                APP.ServerMsg = "网络异常！";
+                LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
+                return 1;
+            }
+        }
+        /// <summary>
+        /// 激活信息--添加激活历史
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public int ActivationAddHistory()
+        {
+            try
+            {
+                string url = APP.certapiUrl + "/activation/add_history";
+                Dictionary<string, object> dic = new Dictionary<string, object>
+                {
+                    { "sign", APP.Signature }
+                };
+                string body = JsonHelper.ToJson(dic);
+                string xmlDoc = HttpHelper.HttpPost(body, url);
+
+                if (string.IsNullOrEmpty(xmlDoc))
+                {
+                    return 1;
+                    //returnObj.message = "账号密码不正确";
+                }
+                else
+                {
+                    JObject obj = JObject.Parse(xmlDoc);
+                    if (obj != null)
+                    {
+                        APP.ServerMsg = obj["msg"].ToString();
+                        return Convert.ToInt32(obj["code"].ToString());
+                    }
+                    else
+                    {
+                        return 1;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
+                return 1;
+            }
+        }
+        /// <summary>
         /// 登陆
         /// </summary>
         /// <param name="request"></param>

XHWK.WKTool/Helpers/BackgroundWorkerHelper.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace XHWK.WKTool.Helpers
+{
+    /// <summary>
+    /// 后台线程帮助类
+    /// </summary>
+    public class BackgroundWorkerHelper : IDisposable
+    {
+        private static BackgroundWorkerHelper backgroundWorkerHelper = null;
+
+        public static BackgroundWorkerHelper GetInstance()
+        {
+            if (backgroundWorkerHelper == null)
+            {
+                backgroundWorkerHelper = new BackgroundWorkerHelper();
+            }
+            return backgroundWorkerHelper;
+        }
+
+        private BackgroundWorker backWorker = null;
+        private Func<object> func = null;
+        private Action<object> actionComplate = null;
+
+        public BackgroundWorkerHelper()
+        {
+            backWorker = new BackgroundWorker();
+            backWorker.DoWork += new DoWorkEventHandler(backWorker_DoWork);
+            backWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(backWorker_RunWorkerCompleted);
+        }
+
+        private void backWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+        {
+            currentThread = null;
+
+            if (e.Error != null)
+            {
+                throw e.Error;
+            }
+            if (actionComplate != null)
+            {
+                actionComplate(e.Result);
+            }
+        }
+
+        private void backWorker_DoWork(object sender, DoWorkEventArgs e)
+        {
+            currentThread = Thread.CurrentThread;
+
+            if (func != null)
+            {
+                if (func != null)
+                {
+                    e.Result = func();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 启动异步线程
+        /// </summary>
+        /// <param name="func">在异步执行的方法</param>
+        /// <param name="action">方法完成后</param>
+        public void RunWorkerAsync(Func<object> func, Action<object> action)
+        {
+            if (!backWorker.IsBusy)
+            {
+                this.func = func;
+                actionComplate = action;
+                backWorker.RunWorkerAsync();
+            }
+        }
+
+        private Thread currentThread = null;
+
+        /// <summary>
+        /// 强制中断
+        /// </summary>
+        public void Abort()
+        {
+            if (currentThread != null && backWorker.IsBusy)
+            {
+                currentThread.Abort();
+                currentThread = null;
+
+                backWorker.DoWork -= backWorker_DoWork;
+                backWorker.RunWorkerCompleted -= backWorker_RunWorkerCompleted;
+                backWorker.Dispose();
+
+                backWorker = new BackgroundWorker();
+                backWorker.DoWork += backWorker_DoWork;
+                backWorker.RunWorkerCompleted += backWorker_RunWorkerCompleted;
+                func = null;
+                actionComplate = null;
+            }
+        }
+
+        #region IDisposable 成员
+
+        /// <summary>
+        /// 释放资源
+        /// </summary>
+        public void Dispose()
+        {
+            actionComplate = null;
+            func = null;
+            backWorker.Dispose();
+        }
+
+        #endregion IDisposable 成员
+    }
+}

XHWK.WKTool/KeyVerification.xaml

@@ -5,7 +5,6 @@
         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="KeyVerification"    Width="300"
     Height="230"
     AllowsTransparency="True"
@@ -99,7 +98,7 @@
                         Height="40"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Source="../Images/RollCall/rollCall_1.png"
+                        Source="./Images/rollCall_1.png"
                         Stretch="Fill" />
                 </Button>
             </Grid>

XHWK.WKTool/KeyVerification.xaml.cs

@@ -1,14 +1,11 @@
-using SchoolClient.Commons;
-using SchoolClient.Config;
-using SchoolClient.Method;
-
-using System;
+using System;
 using System.IO;
 using System.Management;
 using System.Text;
 using System.Threading;
 using System.Windows;
 using System.Windows.Forms;
+using XHWK.WKTool.DAL;
 
 namespace XHWK.WKTool
 {
@@ -20,12 +17,13 @@ namespace XHWK.WKTool
          */
     public partial class KeyVerification : Window
     {
-        private readonly RegisterController registerController = new RegisterController();
+        private readonly Interface registerController = new Interface();
         private int serverReturnCode = 0;
 
         public KeyVerification()
         {
             InitializeComponent();
+            this.Topmost = true;
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
         }
 
@@ -38,7 +36,7 @@ namespace XHWK.WKTool
                 return;
             }
             projectcode = txbKey.Text;
-            Shared.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddServering, InvokeActivationAddServerCompate);
+            APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddServering, InvokeActivationAddServerCompate);
         }
 
         private string projectcode = string.Empty;
@@ -48,10 +46,10 @@ namespace XHWK.WKTool
         /// <returns></returns>
         private object InvokeActivationAddServering()
         {
-            string device = "pc";
+            string device = "pcwk";
             string mac = GetMacAddress();
             serverReturnCode = registerController.ActivationAdd(mac, device, projectcode);
-            return Shared.ServerMsg;
+            return APP.ServerMsg;
         }
 
         /// <summary>
@@ -60,13 +58,13 @@ namespace XHWK.WKTool
         /// <returns></returns>
         public void InvokeActivationAddServerCompate(object obj)
         {
-            if (serverReturnCode == Shared.ServerScuessCode)
+            if (serverReturnCode == 0)
             {
                 MessageWindow.Show("产品激活成功");
-                Shared.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering, InvokeActivationAddHistoryServerCompate);
+                APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering, InvokeActivationAddHistoryServerCompate);
                 Dispatcher.Invoke(new Action(() =>
                 {
-                    LoginWindow win = new LoginWindow();
+                    CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
                     //win.Topmost = true;
                     win.Show();
 
@@ -77,7 +75,7 @@ namespace XHWK.WKTool
             }
             else
             {
-                System.Windows.Forms.MessageBox.Show(Shared.ServerMsg, "激活结果：", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, System.Windows.Forms.MessageBoxOptions.DefaultDesktopOnly);
+                MessageWindow.Show(APP.ServerMsg);
             }
         }
         /// <summary>
@@ -86,8 +84,8 @@ namespace XHWK.WKTool
         /// <returns></returns>
         private object InvokeActivationAddHistoryServering()
         {
-            serverReturnCode = registerController.ActivationAddHistory(ref Shared.TeachingData);
-            return Shared.ServerMsg;
+            serverReturnCode = registerController.ActivationAddHistory();
+            return APP.ServerMsg;
         }
 
         /// <summary>
@@ -103,8 +101,6 @@ namespace XHWK.WKTool
             string ApplicationData = APP.dataPath + "signatureTime.txt";
             string currentTime = DateTime.Now.ToLongDateString().ToString();//当前时间
             System.IO.File.WriteAllText(ApplicationData, currentTime, Encoding.Default);//存放签名验证日期
-
-
         }
         /// <summary>  
         /// 获取本机MAC地址  

XHWK.WKTool/LoadDialog.xaml

@@ -4,8 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHWK.WKTool"
-        mc:Ignorable="d"
-        Title="LoadDialog"  Width="100"
+      
+         Width="100"
     Height="100"
     AllowsTransparency="True"
     Background="Transparent"

XHWK.WKTool/PrintWindow.xaml

@@ -3,7 +3,7 @@
         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:local="clr-namespace:XHWK.WKTool" xmlns:Views="clr-namespace:XHWK.WKTool.Helpers"
         mc:Ignorable="d"
         Title="PrintWindow" Height="600" Width="900" AllowsTransparency="True"
     ShowInTaskbar="False"
@@ -102,5 +102,35 @@
                 </ControlTemplate>
             </Button.Template>
         </Button>
+        <Views:ZJClippingBorder
+            x:Name="tip_outer"
+            Width="760"
+            Height="44"
+            Margin="0,30,0,0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Background="#FAFAFA"
+            CornerRadius="4"
+            Visibility="Visible">
+            <Grid>
+
+                <ProgressBar BorderBrush="#4597FF"
+                             Foreground="#4597FF"
+                    Grid.Row="0"
+                    x:Name="pgbProcess"
+                    Height="20"
+                    Margin="0,0,0,0"
+                    Visibility="Visible" />
+                <Label Grid.Row="0"
+                    HorizontalAlignment="Center" Width="100"
+                    x:Name="lbProcess"
+                    Height="30"
+                    Margin="0,0,0,0"
+                       FontSize="16"
+                    Content=""
+                       Foreground="White"
+                    Visibility="Visible" />
+            </Grid>
+        </Views:ZJClippingBorder>
     </Grid>
 </Window>

XHWK.WKTool/PrintWindow.xaml.cs

@@ -3,9 +3,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Threading;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
+using System.Windows.Threading;
 
 namespace XHWK.WKTool
 {
@@ -19,6 +21,24 @@ namespace XHWK.WKTool
         /// </summary>
         public DataTable data = new DataTable();
         private DataTable dtComponentsUniqueNo;
+        /// <summary>
+        /// 计时器状态
+        /// </summary>
+        private enum State
+        {
+            Start,
+            Pause,
+            End
+        }
+        private DispatcherTimer t = null;
+        /// <summary>
+        /// 状态
+        /// </summary>
+        private State _state = State.End;
+        /// <summary>
+        /// 计时用
+        /// </summary>
+        private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
         public PrintWindow()
         {
             InitializeComponent();
@@ -48,7 +68,19 @@ namespace XHWK.WKTool
             {
                 imgPri.Source = new BitmapImage(new Uri(_imgPath));
             }
+            I = 0;
+            if (t == null)
+            {
+                t = new DispatcherTimer();
+                t.Tick += OnTimer;
+                t.Interval = new TimeSpan(0, 0, 0, 1);
+                t.IsEnabled = true;
+                t.Start();
+            }
+            t.Interval = new TimeSpan(0, 0, 0, 1);
+            tip_outer.Visibility = Visibility.Collapsed;
         }
+        private System.Timers.Timer times;
         /// <summary>
         /// 打印
         /// </summary>
@@ -59,9 +91,29 @@ namespace XHWK.WKTool
             if (string.IsNullOrWhiteSpace(cmbClass.Text))
             {
                 //MessageWindow.Show("打印机不能为空！");
-                MessageWindow.Show("打印机不能为空！", "", MessageBoxButton.OKCancel);
+                MessageWindow.Show("打印机不能为空！");
                 return;
             }
+            I = 1;
+            APP.myloading.Show();
+            tip_outer.Visibility = Visibility.Visible;
+            Thread.Sleep(2000);
+            //Times();
+            //Dispatcher.Invoke(() =>
+            //{
+            //    times = new System.Timers.Timer(100)//初始值为300
+            //    {
+            //        AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
+            //    };//设置执行一次（false）还是一直执行(true)
+            //    I = 0;
+            //    tip_outer.Visibility = Visibility.Visible;
+            //    times.Elapsed += new System.Timers.ElapsedEventHandler(Times_Elapsed);
+            //    times.Enabled = true; //启动计时器
+            //                          //APP.myloading.Show();
+            //});
+
+
+
             string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
             FileToolsCommon.CreateFile(imgPath);
             string pdf = imgPath + "\\101.pdf";
@@ -95,19 +147,115 @@ namespace XHWK.WKTool
                 //}
                 if (printResult == 0)// 0为成功
                 {
-                    MessageWindow.Show("打印成功");
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        Dispatcher.Invoke(() =>
+                        {
+                            I = 100;
+                            pgbProcess.Value = I * 100 / 100;
+                            lbProcess.Content = string.Format("{0}/{1}", I, 100);
+                            APP.myloading.Hide();
+                            I = 0;
+                        });
+                        Thread.Sleep(2000);
+                        Dispatcher.Invoke(() =>
+                        {
+                            //tip_outer.Visibility = Visibility.Collapsed;
+                            MessageWindow.Show("打印成功");
+                        });
+                    }))).Start();
+
+
+                   
+                    
+                  
                 }
                 else
                 {
+                    APP.myloading.Hide();
                     MessageWindow.Show(standardError);
                 }
             }
             else
             {
+                APP.myloading.Hide();
                 MessageWindow.Show(msg);
             }
         }
         /// <summary>
+        /// 时钟回调
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnTimer(object sender, EventArgs e)
+        {
+            switch (_state)
+            {
+                case State.Start:
+                    {
+                        _timeSpan += new TimeSpan(0, 0, 0, 1);
+                    }
+                    break;
+
+                case State.Pause:
+                    {
+                    }
+                    break;
+
+                case State.End:
+                    {
+                        _timeSpan = new TimeSpan();
+                        //_timeSpan = new TimeSpan(0, 23, 12, 45, 54);
+                    }
+                    break;
+            }
+
+            string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
+            if(I <= 90 && I != 0)
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    pgbProcess.Value = I * 100 / 100;
+            lbProcess.Content = string.Format("{0}/{1}", I, 100);
+            I++;
+                });
+            }
+        }
+        private void Times()
+        {
+            Dispatcher.Invoke(() =>
+            {
+                while (I <= 90&&I!=0)
+            {
+                pgbProcess.Value = I * 100 / 100;
+                lbProcess.Content = string.Format("{0}/{1}", I, 100);
+                Thread.Sleep(100);
+                I++;
+            }
+            });
+        }
+
+        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 = string.Format("{0}/{1}", I, 100);
+                        I++;
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteErrLog("【摄像】(Times_Elapsed)生成图片错误:" + ex.Message, ex);
+                }
+            }
+            });
+        }
+        /// <summary>
         /// 窗口移动
         /// </summary>
         /// <param name="sender"></param>

XHWK.WKTool/ProductVerification.xaml

@@ -0,0 +1,111 @@
+<Window x:Class="XHWK.WKTool.ProductVerification"
+        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"
+        Title="ProductVerification"   Width="300"
+    Height="230"
+    AllowsTransparency="True"
+    Background="Transparent"
+    ShowInTaskbar="False"
+    WindowStartupLocation="CenterOwner"
+    WindowStyle="None"
+    mc:Ignorable="d" BorderThickness="7">
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
+    <Window.Resources>
+        <Style x:Key="oiliu" TargetType="ListBoxItem">
+            <!--  设置控件模板  -->
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListBoxItem">
+                        <Border
+                            Margin="4,0,0,0"
+                            Padding="0"
+                            Background="{TemplateBinding Background}">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                TextBlock.Foreground="{TemplateBinding Foreground}" />
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <DataTemplate x:Key="UserTpl">
+            <StackPanel
+                Width="70.5"
+                Height="auto"
+                Background="Transparent">
+                <TextBlock
+                        Padding="0,12,0,0"
+                        HorizontalAlignment="Left"
+                        FontSize="20"
+                        Foreground="#3C525B"
+                        Text="{Binding username}" />
+            </StackPanel>
+        </DataTemplate>
+    </Window.Resources>
+    <Views:ZJClippingBorder Background="White" CornerRadius="10,10,10,10">
+        <Grid Margin="0,0,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="50" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="75" />
+            </Grid.RowDefinitions>
+            <!--  头部  -->
+            <Grid
+                Grid.Row="0"
+                Height="50"
+                Background="#4597FF">
+                <TextBlock
+                    x:Name="title_tb"
+                    Grid.Row="0"
+                    Margin="15,0,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontSize="22"
+                    Foreground="White"
+                    Text="产品验证" />
+                <Button Cursor="Hand"
+                    Grid.Column="0"
+                    Width="46"
+                    Height="46"
+                    Margin="0,0,10,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    Background="White"
+                    Click="close_click"
+                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                    <Button.Template>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border
+                                BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                BorderThickness="0"
+                                CornerRadius="20">
+                                <ContentPresenter
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding ContentControl.Content}" />
+                            </Border>
+                        </ControlTemplate>
+                    </Button.Template>
+                    <Image
+                        Width="40"
+                        Height="40"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Source="../Images/RollCall/rollCall_1.png"
+                        Stretch="Fill" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1" Margin="10,20,0,0">
+                <StackPanel Orientation="Horizontal" Height="30">
+                    <TextBlock Text="产品验证中。。。。" FontSize="20"/>
+                </StackPanel>
+            </Grid>
+        </Grid>
+    </Views:ZJClippingBorder>
+</Window>

XHWK.WKTool/ProductVerification.xaml.cs

@@ -0,0 +1,183 @@
+using Common.system;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using XHWK.Model;
+using XHWK.WKTool.DAL;
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// ProductVerification.xaml 的交互逻辑
+    /// </summary>
+    /*
+     本地解密  解密成功 日期在有效期内 ，判断当天是否调用添加历史接口，没有则调用
+     解密失败 或解密获取的时间 过期 ， 跳到输入code 激活界面
+         */
+    public partial class ProductVerification : Window
+    {
+        private readonly Interface registerController = new Interface();
+        private int serverReturnCode = 0;
+
+        public ProductVerification()
+        {
+            InitializeComponent();
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            this.Topmost = true;
+            APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationDecryptServering, InvokeActivationDecryptServerCompate);
+        }
+        /// <summary>
+        /// 激活信息--验证签名是否过期-调用
+        /// </summary>
+        /// <returns></returns>
+        private object InvokeActivationDecryptServering()
+        {
+            return APP.ServerMsg;
+        }
+
+        /// <summary>
+        /// 激活信息--验证签名是否过期-返回结果
+        /// </summary>
+        /// <returns></returns>
+        public void InvokeActivationDecryptServerCompate(object obj)
+        {
+            //解析
+            try
+            {
+                APP.Signature = System.IO.File.ReadAllText(APP.dataPath + "signature.txt", Encoding.Default);
+                string decrypt = DataProvider.TripleDESDecrypt(APP.Signature, APP.secretKey);
+                decrypt = decrypt.Replace("\u0001", "").Replace("\u0007","").Trim();
+                Model_Signatures msgBean = JsonHelper.JsonToObj<Model_Signatures>(decrypt);
+                long currentTimeTimestamp = DataProvider.TimestampTotalSeconds(); //当前时间 时间戳
+                if (msgBean.endtime > currentTimeTimestamp)//条件成立  解析成功 code 在有效期内
+                {
+                    if (File.Exists(APP.dataPath + "signatureTime.txt"))
+                    {
+                        string signatureTime = System.IO.File.ReadAllText(APP.dataPath + "signatureTime.txt", Encoding.Default);
+                        string currentTime = DateTime.Now.ToLongDateString().ToString();//当前时间  
+                        if (signatureTime != currentTime)
+                        {
+                            APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering, InvokeActivationAddHistoryServerCompate);
+                        }
+                    }
+                    Dispatcher.Invoke(new Action(() =>
+                    {
+                        CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
+                        win.Show();
+                        Close();
+                    }));
+                }
+                else//时间失效
+                {
+                    Dispatcher.Invoke(new Action(() =>
+                    {
+                        KeyVerification wins = new KeyVerification
+                        {
+                            Topmost = true
+                        };
+                        wins.ShowDialog();
+                        Close();
+                    }));
+                }
+            }
+            catch (Exception ex) //解析失败 输code  
+            {
+                LogHelper.WriteErrLog("ProductVerification(解析失败)" + ex.Message, ex);
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    KeyVerification wins = new KeyVerification
+                    {
+                        Topmost = true
+                    };
+                    wins.ShowDialog();
+                    Close();
+                }));
+            }
+
+        }
+        /// <summary>
+        /// 激活信息--添加激活历史-调用
+        /// </summary>
+        /// <returns></returns>
+        private object InvokeActivationAddHistoryServering()
+        {
+            serverReturnCode = registerController.ActivationAddHistory();
+            return APP.ServerMsg;
+        }
+
+        /// <summary>
+        /// 激活信息--添加激活历史-返回结果
+        /// </summary>
+        /// <returns></returns>
+        public void InvokeActivationAddHistoryServerCompate(object obj)
+        {
+            if (!Directory.Exists(APP.dataPath))
+            {
+                Directory.CreateDirectory(APP.dataPath);
+            }
+            string ApplicationData = APP.dataPath + "signatureTime.txt";
+            string currentTime = DateTime.Now.ToLongDateString().ToString();//当前时间
+            System.IO.File.WriteAllText(ApplicationData, currentTime, Encoding.Default);//存放签名验证日期
+        }
+
+        /// <summary>
+        /// 关闭弹窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void close_click(object sender, RoutedEventArgs e)
+        {
+            closeAction();
+        }
+        /// <summary>
+        /// 退出程序
+        /// </summary>
+        private void closeAction()
+        {
+            Dispatcher.Invoke(new Action(() =>
+            {
+                System.Environment.Exit(0);
+            }));
+        }
+
+        ~ProductVerification()
+        {
+            Console.WriteLine("{0}被销毁", this);
+            Dispose(false);
+        }
+        public void Dispose()
+        {
+            Console.WriteLine("{0}被手动销毁", this);
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private bool disposed;
+        protected void Dispose(bool disposing)
+        {
+            Console.WriteLine("{0}被自动销毁", this);
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    //托管资源释放
+
+                }
+                //非托管资源释放
+                // ...
+            }
+            disposed = true;
+        }
+    }
+}

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -81,17 +81,25 @@
                 <!--<Button x:Name="BtnRecordingScreen"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnRecordingScreen_Click">
                     <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar25.png"/>
                 </Button>-->
-                <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnStopRecordingScreen_Click" ToolTip="停止">
-                    <Image x:Name="ImgEndRecordingScreen" Source="./Images/Toobar15.png"/>
+                <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnStopRecordingScreen_Click" ToolTip="停止">
+                    <Border Background="#2d8cf0" CornerRadius="22">
+                        <Image x:Name="ImgEndRecordingScreen" Source="./Images/Toobar15.png" Margin="5,5,5,5"/>
+                    </Border>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnBlackPenOne" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBrush_Click" ToolTip="批注">
-                    <Image x:Name="imgBlackPenOne" Source="./Images/31.png"/>
+                <Button  Cursor="Hand" x:Name="btnBlackPenOne" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnBrush_Click" ToolTip="批注">
+                    <Border x:Name="borOne" Background="#2d8cf0" CornerRadius="22">
+                        <Image x:Name="imgBlackPenOne" Source="./Images/31.png" Margin="5,5,5,5"/>
+                    </Border>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnBlackPenTwo" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPenTwo_Click" ToolTip="批注">
-                    <Image x:Name="imgBlackPenTwo" Source="./Images/31.png"/>
+                <Button  Cursor="Hand" x:Name="btnBlackPenTwo" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnBlackPenTwo_Click" ToolTip="批注">
+                    <Border x:Name="borTwo" Background="#2d8cf0" CornerRadius="22">
+                        <Image x:Name="imgBlackPenTwo" Source="./Images/31.png" Margin="5,5,5,5"/>
+                    </Border>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnReturn" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnReturn_Click" ToolTip="返回">
-                    <Image x:Name="imgReturn" Source="./Images/Toobar29.png"/>
+                <Button  Cursor="Hand" x:Name="btnReturn" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnReturn_Click" ToolTip="返回">
+                    <Border Background="#2d8cf0" CornerRadius="22">
+                        <Image x:Name="imgReturn" Source="./Images/Toobar29.png" Margin="5,5,5,5"/>
+                    </Border>
                 </Button>
             </StackPanel>
         </Grid>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -6,6 +6,7 @@ using System.Threading;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Ink;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 
@@ -85,6 +86,11 @@ namespace XHWK.WKTool
             //timer.Elapsed += new System.Timers.ElapsedEventHandler(TimerDealy);
             //timer.Enabled = true; //启动计时器
 
+                borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+
+
+
             k_hook = new KeyboardHookCommon();
             k_hook.KeyDownEvent += K_hook_KeyDownEvent;
 
@@ -99,7 +105,8 @@ namespace XHWK.WKTool
             gridToolbar.Visibility = Visibility.Hidden;
             gridColour.Visibility = Visibility.Hidden;
             gridThickness.Visibility = Visibility.Hidden;
-
+            imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
+            btnReturn.IsEnabled = true;//返回主界面可点击
             ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
             ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
             BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
@@ -344,6 +351,10 @@ namespace XHWK.WKTool
                 txbTime.Visibility = Visibility.Visible;//时间显示
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
                 btnReturn.IsEnabled = false;//返回主界面可点击
+
+
+
+                //borOne.Background = new SolidColorBrush(Colors.LightBlue);
                 try
                 {
                     new Thread(new ThreadStart(new Action(() =>
@@ -524,16 +535,35 @@ namespace XHWK.WKTool
             {
                 if (flg == 11)
                 {
+                    Dispatcher.Invoke(() =>
+                    {
+                        borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                        borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    });
                     flg = 1;
                     APP.W_PracticeWindow.Hide();
                 }
                 else if (flg == 10)
                 {
+                    Dispatcher.Invoke(() =>
+                    {
+                        borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
+                        borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    });
                     APP.W_PracticeWindow.Blue();
                     flg = 11;
                 }
                 else
                 {
+                    //new Thread(new ThreadStart(new Action(() =>
+                    //{
+                        Dispatcher.Invoke(() =>
+                        {
+                            borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
+                            borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                        });
+
+                    //}))).Start();
                     if (APP.W_PracticeWindow == null)
                     {
                         APP.W_PracticeWindow = new PracticeWindow
@@ -786,16 +816,31 @@ namespace XHWK.WKTool
             {
                 if (flg == 10)
                 {
+                    Dispatcher.Invoke(() =>
+                    {
+                        borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                        borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    });
                     flg = 0;
                     APP.W_PracticeWindow.Hide();
                 }
                 else if (flg == 11)
                 {
+                    Dispatcher.Invoke(() =>
+                    {
+                        borTwo.Background = new SolidColorBrush(Colors.LightSkyBlue);
+                        borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    });
                     flg = 10;
                     APP.W_PracticeWindow.Red();
                 }
                 else
                 {
+                    Dispatcher.Invoke(() =>
+                    {
+                        borTwo.Background = new SolidColorBrush(Colors.LightSkyBlue);
+                        borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    });
                     if (APP.W_PracticeWindow == null)
                     {
                         APP.W_PracticeWindow = new PracticeWindow

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -178,7 +178,8 @@
                 <Button Cursor="Hand" x:Name="btnLoginType" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnLoginType_Click">
                     <StackPanel Orientation="Horizontal">
                         <Image Source="./Images/microLessonSystem_9.png"/>
-                        <TextBlock x:Name="txbLoginType" Text="未登录" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"/>
+                        <TextBlock x:Name="txbLoginType" Text="未登录" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"
+                                   />
                     </StackPanel>
                 </Button>
                 <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnShrink_Click" Margin="8,0,8,0">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -981,19 +981,25 @@ namespace XHWK.WKTool
                     DereferenceLinks = true
                 };
 
-                new Thread(
-                    o =>
-                    {
-                        Thread.Sleep(400);
-                        Dispatcher.Invoke(new Action(() =>
-                        {
-                            OpenDialog();
-                        }
-                            ));
-                    })
-                {
-                    IsBackground = true
-                }.Start();
+
+                APP.myloading.Show();
+                APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeServering, InvokeServerCompate);
+
+
+                //new Thread(
+                //    o =>
+                //    {
+                //        Thread.Sleep(400);
+
+                //        Dispatcher.Invoke(new Action(() =>
+                //        {
+                //            OpenDialog();
+                //        }
+                //            ));
+                //    })
+                //{
+                //    IsBackground = true
+                //}.Start();
             }
             catch (Exception ex)
             {
@@ -1001,35 +1007,137 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
-        /// 导入文档
+        /// 导入-开始
         /// </summary>
-        private void OpenDialog()
+        /// <returns></returns>
+        private object InvokeServering()
         {
-            result = ofd.ShowDialog();
-            if (result == System.Windows.Forms.DialogResult.OK)
+            Dispatcher.Invoke(new Action(() =>
             {
-                if (ofd.FileName != "")
+                result = ofd.ShowDialog();
+                if (result == System.Windows.Forms.DialogResult.OK)
                 {
-                    APP.myloading.Show();
-
-                    myblackboard.changepage(APP.pageData.pagenum);
-                    #region PPT转PDF
-                    string filepath = ofd.FileName;
-                    string path = ofd.SafeFileName.Replace(".ppt", "").Replace(".pptx", "").Trim();
-                    string type = ofd.SafeFileName.Replace(".ppt", "typezsygppt").Replace(".pptx", "typezsygppt").Replace(".pdf", "typepdf").Trim();
-                    if (type.Contains("typezsygppt"))//ppt
+                    if (ofd.FileName != "")
                     {
-                        try
+                        APP.myloading.Show();
+
+                        myblackboard.changepage(APP.pageData.pagenum);
+                        #region PPT转PDF
+                        string filepath = ofd.FileName;
+                        string path = ofd.SafeFileName.Replace(".ppt", "").Replace(".pptx", "").Trim();
+                        string type = ofd.SafeFileName.Replace(".ppt", "typezsygppt").Replace(".pptx", "typezsygppt").Replace(".pdf", "typepdf").Trim();
+                        if (type.Contains("typezsygppt"))//ppt
                         {
-                            string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
-                            path = pathTemp + path + ".pdf";
-                            FileToolsCommon.CreateDirectory(pathTemp);
-
-                            //PPT转PDF
-                            Presentation ppt = new Presentation(filepath);
-                            ppt.Save(path, Aspose.Slides.Export.SaveFormat.Pdf);
-                            #endregion
+                            try
+                            {
+                                string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                                path = pathTemp + path + ".pdf";
+                                FileToolsCommon.CreateDirectory(pathTemp);
+
+                                //PPT转PDF
+                                Presentation ppt = new Presentation(filepath);
+                                ppt.Save(path, Aspose.Slides.Export.SaveFormat.Pdf);
+                                #endregion
+
+                                #region PDF转图片
+                                // 图片绝对路径集合
+                                List<string> images = new List<string>();
+                                string directoryPath = pathTemp;
+                                //aspose许可证
+                                //Aspose.Pdf.License l = new Aspose.Pdf.License();
+                                //string licenseName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Aspose.Total.Product.Family.lic");
+                                //l.SetLicense(licenseName);
+                                //定义Jpeg转换设备
+                                Aspose.Pdf.Document document = new Aspose.Pdf.Document(path);
+                                Aspose.Pdf.Devices.JpegDevice device = new Aspose.Pdf.Devices.JpegDevice();
+                                //int quality = int.Parse(this.comboBox1.SelectedItem.ToString());
+                                //directoryPath += quality;
+                                Directory.CreateDirectory(directoryPath);
+                                //默认质量为100，设置质量的好坏与处理速度不成正比，甚至是设置的质量越低反而花的时间越长，怀疑处理过程是先生成高质量的再压缩
+                                device = new Aspose.Pdf.Devices.JpegDevice(100);
+                                //遍历每一页转为jpg
+                                for (int i = 1; i <= document.Pages.Count; i++)
+                                {
+                                    long ii = Timestamp();
+                                    string filePathOutPut = Path.Combine(directoryPath, string.Format("{0}{1}.jpg", ii, i));
+                                    images.Add(filePathOutPut);
+                                    FileStream fs = new FileStream(filePathOutPut, FileMode.OpenOrCreate);
+                                    try
+                                    {
+                                        device.Process(document.Pages[i], fs);
+                                        fs.Close();
+                                    }
+                                    catch (Exception)
+                                    {
+                                        fs.Close();
+                                        File.Delete(filePathOutPut);
+                                    }
+                                }
+                                #endregion
+                                string[] page = images.ToArray();
+                                int num = 0;
+                                for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
+                                {
+                                    if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
+                                    {
+                                        APP.PageDrawList[i].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
+                                        APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
+                                        APP.PageDrawList[i].PageNum = i + 1;
+                                        APP.PageDrawList[i].ImgDocumentation = true;
+                                    }
+                                    else
+                                    {
 
+                                        Model_DrawData model_DrawData = new Model_DrawData
+                                        {
+                                            PageImagePath = page[i - APP.pageData.pagenum],
+                                            PdfImagePath = page[i - APP.pageData.pagenum],
+                                            PageNum = i + 1,
+                                            ImgDocumentation = true
+                                        };
+                                        APP.PageDrawList.Add(model_DrawData);
+                                    }
+                                    ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
+                                    ImgPrintTwo.Visibility = Visibility.Collapsed;
+                                    btnPrint.IsEnabled = true;
+                                    APP.SaveDraw();
+                                    num++;
+                                }
+                                if (num > 0)
+                                {
+                                    APP.pageData.currpage = APP.pageData.pagenum + 1;
+                                    APP.pageData.pagenum += num;
+                                    gridPage.Visibility = Visibility.Visible;//页码大于0 显示
+                                }
+                                if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
+                                {
+                                    imgCanvas.Source = null;
+                                    ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                    ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                    btnScreenshot.IsEnabled = false;
+                                    imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                }
+                                else
+                                {
+                                    imgDocumentation.Source = null;
+                                    imgCanvas.Source = null;
+                                    ///截图可用
+                                    ImgScreenshot.Visibility = Visibility.Visible;
+                                    ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                                    btnScreenshot.IsEnabled = true;
+                                }
+                                APP.myloading.Hide();
+                            }
+                            catch (Exception ex)
+                            {
+                                APP.myloading.Hide();
+                                MessageWindow.Show("文件无效或者文件被加密！");
+                                LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
+                            }
+                        }
+                        else if (type.Contains("typepdf"))
+                        {
+                            string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
                             #region PDF转图片
                             // 图片绝对路径集合
                             List<string> images = new List<string>();
@@ -1039,7 +1147,7 @@ namespace XHWK.WKTool
                             //string licenseName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Aspose.Total.Product.Family.lic");
                             //l.SetLicense(licenseName);
                             //定义Jpeg转换设备
-                            Aspose.Pdf.Document document = new Aspose.Pdf.Document(path);
+                            Aspose.Pdf.Document document = new Aspose.Pdf.Document(filepath);
                             Aspose.Pdf.Devices.JpegDevice device = new Aspose.Pdf.Devices.JpegDevice();
                             //int quality = int.Parse(this.comboBox1.SelectedItem.ToString());
                             //directoryPath += quality;
@@ -1119,174 +1227,405 @@ namespace XHWK.WKTool
                             }
                             APP.myloading.Hide();
                         }
-                        catch (Exception ex)
-                        {
-                            APP.myloading.Hide();
-                            MessageWindow.Show("文件无效或者文件被加密！");
-                            LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
-                        }
-                    }
-                    else if(type.Contains("typepdf"))
-                    {
-                        string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
-                        #region PDF转图片
-                        // 图片绝对路径集合
-                        List<string> images = new List<string>();
-                        string directoryPath = pathTemp;
-                        //aspose许可证
-                        //Aspose.Pdf.License l = new Aspose.Pdf.License();
-                        //string licenseName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Aspose.Total.Product.Family.lic");
-                        //l.SetLicense(licenseName);
-                        //定义Jpeg转换设备
-                        Aspose.Pdf.Document document = new Aspose.Pdf.Document(filepath);
-                        Aspose.Pdf.Devices.JpegDevice device = new Aspose.Pdf.Devices.JpegDevice();
-                        //int quality = int.Parse(this.comboBox1.SelectedItem.ToString());
-                        //directoryPath += quality;
-                        Directory.CreateDirectory(directoryPath);
-                        //默认质量为100，设置质量的好坏与处理速度不成正比，甚至是设置的质量越低反而花的时间越长，怀疑处理过程是先生成高质量的再压缩
-                        device = new Aspose.Pdf.Devices.JpegDevice(100);
-                        //遍历每一页转为jpg
-                        for (int i = 1; i <= document.Pages.Count; i++)
+                        else//word
                         {
-                            long ii = Timestamp();
-                            string filePathOutPut = Path.Combine(directoryPath, string.Format("{0}{1}.jpg", ii, i));
-                            images.Add(filePathOutPut);
-                            FileStream fs = new FileStream(filePathOutPut, FileMode.OpenOrCreate);
                             try
                             {
-                                device.Process(document.Pages[i], fs);
-                                fs.Close();
-                            }
-                            catch (Exception)
-                            {
-                                fs.Close();
-                                File.Delete(filePathOutPut);
-                            }
-                        }
-                        #endregion
-                        string[] page = images.ToArray();
-                        int num = 0;
-                        for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
-                        {
-                            if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
-                            {
-                                APP.PageDrawList[i].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
-                                APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
-                                APP.PageDrawList[i].PageNum = i + 1;
-                                APP.PageDrawList[i].ImgDocumentation = true;
-                            }
-                            else
-                            {
+                                string paths = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                                string[] page = ConvertWordToImage(filepath, paths, "", 0, 0, null, 0).ToArray();
+                                int num = 0;
+                                for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
+                                {
+                                    if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
+                                    {
+                                        APP.PageDrawList[i].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
+                                        APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
+                                        APP.PageDrawList[i].PageNum = i + 1;
+                                        APP.PageDrawList[i].ImgDocumentation = true;
+                                    }
+                                    else
+                                    {
 
-                                Model_DrawData model_DrawData = new Model_DrawData
+                                        Model_DrawData model_DrawData = new Model_DrawData
+                                        {
+                                            PageImagePath = page[i - APP.pageData.pagenum],
+                                            PdfImagePath = page[i - APP.pageData.pagenum],
+                                            PageNum = i + 1,
+                                            ImgDocumentation = true
+                                        };
+                                        APP.PageDrawList.Add(model_DrawData);
+                                    }
+                                    ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
+                                    ImgPrintTwo.Visibility = Visibility.Collapsed;
+                                    btnPrint.IsEnabled = true;
+                                    APP.SaveDraw();
+                                    num++;
+                                }
+                                if (num > 0)
                                 {
-                                    PageImagePath = page[i - APP.pageData.pagenum],
-                                    PdfImagePath = page[i - APP.pageData.pagenum],
-                                    PageNum = i + 1,
-                                    ImgDocumentation = true
-                                };
-                                APP.PageDrawList.Add(model_DrawData);
-                            }
-                            ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
-                            ImgPrintTwo.Visibility = Visibility.Collapsed;
-                            btnPrint.IsEnabled = true;
-                            APP.SaveDraw();
-                            num++;
-                        }
-                        if (num > 0)
-                        {
-                            APP.pageData.currpage = APP.pageData.pagenum + 1;
-                            APP.pageData.pagenum += num;
-                            gridPage.Visibility = Visibility.Visible;//页码大于0 显示
-                        }
-                        if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
-                        {
-                            imgCanvas.Source = null;
-                            ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
-                            ImgScreenshotTwo.Visibility = Visibility.Visible;
-                            btnScreenshot.IsEnabled = false;
-                            imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
-                        }
-                        else
-                        {
-                            imgDocumentation.Source = null;
-                            imgCanvas.Source = null;
-                            ///截图可用
-                            ImgScreenshot.Visibility = Visibility.Visible;
-                            ImgScreenshotTwo.Visibility = Visibility.Collapsed;
-                            btnScreenshot.IsEnabled = true;
-                        }
-                        APP.myloading.Hide();
-                    }
-                    else//word
-                    {
-                        try
-                        {
-                            string paths = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
-                            string[] page = ConvertWordToImage(filepath, paths, "", 0, 0, null, 0).ToArray();
-                            int num = 0;
-                            for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
-                            {
-                                if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
+                                    APP.pageData.currpage = APP.pageData.pagenum + 1;
+                                    APP.pageData.pagenum += num;
+                                    gridPage.Visibility = Visibility.Visible;//页码大于0 显示
+                                }
+                                if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
                                 {
-                                    APP.PageDrawList[i].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
-                                    APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
-                                    APP.PageDrawList[i].PageNum = i + 1;
-                                    APP.PageDrawList[i].ImgDocumentation = true;
+
+                                    imgCanvas.Source = null;
+                                    ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                    ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                    btnScreenshot.IsEnabled = false;
+                                    imgDocumentation.Visibility = Visibility.Visible;
+                                    imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                                 }
                                 else
                                 {
-
-                                    Model_DrawData model_DrawData = new Model_DrawData
-                                    {
-                                        PageImagePath = page[i - APP.pageData.pagenum],
-                                        PdfImagePath = page[i - APP.pageData.pagenum],
-                                        PageNum = i + 1,
-                                        ImgDocumentation = true
-                                    };
-                                    APP.PageDrawList.Add(model_DrawData);
+                                    imgDocumentation.Source = null;
+                                    imgCanvas.Source = null;
+                                    ///截图可用
+                                    ImgScreenshot.Visibility = Visibility.Visible;
+                                    ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                                    btnScreenshot.IsEnabled = true;
                                 }
-                                ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
-                                ImgPrintTwo.Visibility = Visibility.Collapsed;
-                                btnPrint.IsEnabled = true;
-                                APP.SaveDraw();
-                                num++;
+                                APP.myloading.Hide();
                             }
-                            if (num > 0)
+                            catch (Exception ex)
                             {
-                                APP.pageData.currpage = APP.pageData.pagenum + 1;
-                                APP.pageData.pagenum += num;
-                                gridPage.Visibility = Visibility.Visible;//页码大于0 显示
-                            }
-                            if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
-                            {
-
-                                imgCanvas.Source = null;
-                                ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
-                                ImgScreenshotTwo.Visibility = Visibility.Visible;
-                                btnScreenshot.IsEnabled = false;
-                                imgDocumentation.Visibility = Visibility.Visible;
-                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
-                            }
-                            else
-                            {
-                                imgDocumentation.Source = null;
-                                imgCanvas.Source = null;
-                                ///截图可用
-                                ImgScreenshot.Visibility = Visibility.Visible;
-                                ImgScreenshotTwo.Visibility = Visibility.Collapsed;
-                                btnScreenshot.IsEnabled = true;
+                                APP.myloading.Hide();
+                                LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
                             }
-                            APP.myloading.Hide();
-                        }
-                        catch (Exception ex)
-                        {
-                            APP.myloading.Hide();
-                            LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
                         }
                     }
                 }
             }
+                   ));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            //OpenDialog();
+            return "";
+        }
+        /// <summary>
+        /// 导入-结束
+        /// </summary>
+        /// <returns></returns>
+        public void InvokeServerCompate(object obj)
+        {
+            //APP.myloading.Hide();
+           
+        }
+        /// <summary>
+        /// 导入文档
+        /// </summary>
+        private void OpenDialog()
+        {
+
+            Dispatcher.Invoke(new Action(() =>
+                  {
+                      result = ofd.ShowDialog();
+                      if (result == System.Windows.Forms.DialogResult.OK)
+                      {
+                          if (ofd.FileName != "")
+                          {
+                              APP.myloading.Show();
+
+                              myblackboard.changepage(APP.pageData.pagenum);
+                              #region PPT转PDF
+                              string filepath = ofd.FileName;
+                              string path = ofd.SafeFileName.Replace(".ppt", "").Replace(".pptx", "").Trim();
+                              string type = ofd.SafeFileName.Replace(".ppt", "typezsygppt").Replace(".pptx", "typezsygppt").Replace(".pdf", "typepdf").Trim();
+                              if (type.Contains("typezsygppt"))//ppt
+                              {
+                                  try
+                                  {
+                                      string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                                      path = pathTemp + path + ".pdf";
+                                      FileToolsCommon.CreateDirectory(pathTemp);
+
+                                      //PPT转PDF
+                                      Presentation ppt = new Presentation(filepath);
+                                      ppt.Save(path, Aspose.Slides.Export.SaveFormat.Pdf);
+                                      #endregion
+
+                                      #region PDF转图片
+                                      // 图片绝对路径集合
+                                      List<string> images = new List<string>();
+                                      string directoryPath = pathTemp;
+                                      //aspose许可证
+                                      //Aspose.Pdf.License l = new Aspose.Pdf.License();
+                                      //string licenseName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Aspose.Total.Product.Family.lic");
+                                      //l.SetLicense(licenseName);
+                                      //定义Jpeg转换设备
+                                      Aspose.Pdf.Document document = new Aspose.Pdf.Document(path);
+                                      Aspose.Pdf.Devices.JpegDevice device = new Aspose.Pdf.Devices.JpegDevice();
+                                      //int quality = int.Parse(this.comboBox1.SelectedItem.ToString());
+                                      //directoryPath += quality;
+                                      Directory.CreateDirectory(directoryPath);
+                                      //默认质量为100，设置质量的好坏与处理速度不成正比，甚至是设置的质量越低反而花的时间越长，怀疑处理过程是先生成高质量的再压缩
+                                      device = new Aspose.Pdf.Devices.JpegDevice(100);
+                                      //遍历每一页转为jpg
+                                      for (int i = 1; i <= document.Pages.Count; i++)
+                                      {
+                                          long ii = Timestamp();
+                                          string filePathOutPut = Path.Combine(directoryPath, string.Format("{0}{1}.jpg", ii, i));
+                                          images.Add(filePathOutPut);
+                                          FileStream fs = new FileStream(filePathOutPut, FileMode.OpenOrCreate);
+                                          try
+                                          {
+                                              device.Process(document.Pages[i], fs);
+                                              fs.Close();
+                                          }
+                                          catch (Exception)
+                                          {
+                                              fs.Close();
+                                              File.Delete(filePathOutPut);
+                                          }
+                                      }
+                                      #endregion
+                                      string[] page = images.ToArray();
+                                      int num = 0;
+                                      for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
+                                      {
+                                          if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
+                                          {
+                                              APP.PageDrawList[i].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
+                                              APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
+                                              APP.PageDrawList[i].PageNum = i + 1;
+                                              APP.PageDrawList[i].ImgDocumentation = true;
+                                          }
+                                          else
+                                          {
+
+                                              Model_DrawData model_DrawData = new Model_DrawData
+                                              {
+                                                  PageImagePath = page[i - APP.pageData.pagenum],
+                                                  PdfImagePath = page[i - APP.pageData.pagenum],
+                                                  PageNum = i + 1,
+                                                  ImgDocumentation = true
+                                              };
+                                              APP.PageDrawList.Add(model_DrawData);
+                                          }
+                                          ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
+                                          ImgPrintTwo.Visibility = Visibility.Collapsed;
+                                          btnPrint.IsEnabled = true;
+                                          APP.SaveDraw();
+                                          num++;
+                                      }
+                                      if (num > 0)
+                                      {
+                                          APP.pageData.currpage = APP.pageData.pagenum + 1;
+                                          APP.pageData.pagenum += num;
+                                          gridPage.Visibility = Visibility.Visible;//页码大于0 显示
+                                      }
+                                      if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
+                                      {
+                                          imgCanvas.Source = null;
+                                          ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                          ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                          btnScreenshot.IsEnabled = false;
+                                          imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                      }
+                                      else
+                                      {
+                                          imgDocumentation.Source = null;
+                                          imgCanvas.Source = null;
+                                          ///截图可用
+                                          ImgScreenshot.Visibility = Visibility.Visible;
+                                          ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                                          btnScreenshot.IsEnabled = true;
+                                      }
+                                      APP.myloading.Hide();
+                                  }
+                                  catch (Exception ex)
+                                  {
+                                      APP.myloading.Hide();
+                                      MessageWindow.Show("文件无效或者文件被加密！");
+                                      LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
+                                  }
+                              }
+                              else if (type.Contains("typepdf"))
+                              {
+                                  string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                                  #region PDF转图片
+                                  // 图片绝对路径集合
+                                  List<string> images = new List<string>();
+                                  string directoryPath = pathTemp;
+                                  //aspose许可证
+                                  //Aspose.Pdf.License l = new Aspose.Pdf.License();
+                                  //string licenseName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Aspose.Total.Product.Family.lic");
+                                  //l.SetLicense(licenseName);
+                                  //定义Jpeg转换设备
+                                  Aspose.Pdf.Document document = new Aspose.Pdf.Document(filepath);
+                                  Aspose.Pdf.Devices.JpegDevice device = new Aspose.Pdf.Devices.JpegDevice();
+                                  //int quality = int.Parse(this.comboBox1.SelectedItem.ToString());
+                                  //directoryPath += quality;
+                                  Directory.CreateDirectory(directoryPath);
+                                  //默认质量为100，设置质量的好坏与处理速度不成正比，甚至是设置的质量越低反而花的时间越长，怀疑处理过程是先生成高质量的再压缩
+                                  device = new Aspose.Pdf.Devices.JpegDevice(100);
+                                  //遍历每一页转为jpg
+                                  for (int i = 1; i <= document.Pages.Count; i++)
+                                  {
+                                      long ii = Timestamp();
+                                      string filePathOutPut = Path.Combine(directoryPath, string.Format("{0}{1}.jpg", ii, i));
+                                      images.Add(filePathOutPut);
+                                      FileStream fs = new FileStream(filePathOutPut, FileMode.OpenOrCreate);
+                                      try
+                                      {
+                                          device.Process(document.Pages[i], fs);
+                                          fs.Close();
+                                      }
+                                      catch (Exception)
+                                      {
+                                          fs.Close();
+                                          File.Delete(filePathOutPut);
+                                      }
+                                  }
+                                  #endregion
+                                  string[] page = images.ToArray();
+                                  int num = 0;
+                                  for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
+                                  {
+                                      if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
+                                      {
+                                          APP.PageDrawList[i].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
+                                          APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
+                                          APP.PageDrawList[i].PageNum = i + 1;
+                                          APP.PageDrawList[i].ImgDocumentation = true;
+                                      }
+                                      else
+                                      {
+
+                                          Model_DrawData model_DrawData = new Model_DrawData
+                                          {
+                                              PageImagePath = page[i - APP.pageData.pagenum],
+                                              PdfImagePath = page[i - APP.pageData.pagenum],
+                                              PageNum = i + 1,
+                                              ImgDocumentation = true
+                                          };
+                                          APP.PageDrawList.Add(model_DrawData);
+                                      }
+                                      ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
+                                      ImgPrintTwo.Visibility = Visibility.Collapsed;
+                                      btnPrint.IsEnabled = true;
+                                      APP.SaveDraw();
+                                      num++;
+                                  }
+                                  if (num > 0)
+                                  {
+                                      APP.pageData.currpage = APP.pageData.pagenum + 1;
+                                      APP.pageData.pagenum += num;
+                                      gridPage.Visibility = Visibility.Visible;//页码大于0 显示
+                                  }
+                                  if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
+                                  {
+                                      imgCanvas.Source = null;
+                                      ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                      ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                      btnScreenshot.IsEnabled = false;
+                                      imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                  }
+                                  else
+                                  {
+                                      imgDocumentation.Source = null;
+                                      imgCanvas.Source = null;
+                                      ///截图可用
+                                      ImgScreenshot.Visibility = Visibility.Visible;
+                                      ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                                      btnScreenshot.IsEnabled = true;
+                                  }
+                                  APP.myloading.Hide();
+                              }
+                              else//word
+                              {
+                                  try
+                                  {
+                                      string paths = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                                      string[] page = ConvertWordToImage(filepath, paths, "", 0, 0, null, 0).ToArray();
+                                      int num = 0;
+                                      for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
+                                      {
+                                          if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
+                                          {
+                                              APP.PageDrawList[i].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
+                                              APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
+                                              APP.PageDrawList[i].PageNum = i + 1;
+                                              APP.PageDrawList[i].ImgDocumentation = true;
+                                          }
+                                          else
+                                          {
+
+                                              Model_DrawData model_DrawData = new Model_DrawData
+                                              {
+                                                  PageImagePath = page[i - APP.pageData.pagenum],
+                                                  PdfImagePath = page[i - APP.pageData.pagenum],
+                                                  PageNum = i + 1,
+                                                  ImgDocumentation = true
+                                              };
+                                              APP.PageDrawList.Add(model_DrawData);
+                                          }
+                                          ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
+                                          ImgPrintTwo.Visibility = Visibility.Collapsed;
+                                          btnPrint.IsEnabled = true;
+                                          APP.SaveDraw();
+                                          num++;
+                                      }
+                                      if (num > 0)
+                                      {
+                                          APP.pageData.currpage = APP.pageData.pagenum + 1;
+                                          APP.pageData.pagenum += num;
+                                          gridPage.Visibility = Visibility.Visible;//页码大于0 显示
+                                      }
+                                      if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
+                                      {
+
+                                          imgCanvas.Source = null;
+                                          ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                          ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                          btnScreenshot.IsEnabled = false;
+                                          imgDocumentation.Visibility = Visibility.Visible;
+                                          imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                      }
+                                      else
+                                      {
+                                          imgDocumentation.Source = null;
+                                          imgCanvas.Source = null;
+                                          ///截图可用
+                                          ImgScreenshot.Visibility = Visibility.Visible;
+                                          ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                                          btnScreenshot.IsEnabled = true;
+                                      }
+                                      APP.myloading.Hide();
+                                  }
+                                  catch (Exception ex)
+                                  {
+                                      APP.myloading.Hide();
+                                      LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
+                                  }
+                              }
+                          }
+                      }
+                  }
+                      ));
+            
         }
         #endregion
 

XHWK.WKTool/XHWK.WKTool.csproj

@@ -140,6 +140,7 @@
     <Compile Include="FileDirectoryWindow.xaml.cs">
       <DependentUpon>FileDirectoryWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Helpers\BackgroundWorkerHelper.cs" />
     <Compile Include="Helpers\ScreenHelper.cs" />
     <Compile Include="Helpers\WpfHelper.cs" />
     <Compile Include="Helpers\ZJClippingBorder.cs" />
@@ -171,6 +172,9 @@
     <Compile Include="PrintWindow.xaml.cs">
       <DependentUpon>PrintWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ProductVerification.xaml.cs">
+      <DependentUpon>ProductVerification.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PromptWindow.xaml.cs">
       <DependentUpon>PromptWindow.xaml</DependentUpon>
     </Compile>
@@ -206,7 +210,7 @@
     </Page>
     <Page Include="KeyVerification.xaml">
       <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
     <Page Include="LoadDialog.xaml">
       <SubType>Designer</SubType>
@@ -224,6 +228,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ProductVerification.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="PromptWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1581,5 +1589,11 @@
     <Resource Include="Images\Toobar29.png" />
     <Resource Include="Images\Toobar30.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Toobar27_1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\rollCall_1.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>