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

XHWK.WKTool/App.config

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

XHWK.WKTool/Properties/AssemblyInfo.cs

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

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -177,8 +177,7 @@ namespace XHWK.WKTool
             txbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoSavePath");
             Initialize();
             InitPen();
-            k_hook = new KeyboardHookCommon();
-            k_hook.KeyDownEvent += K_hook_KeyDownEvent;
+
         }
         /// <summary>
         /// 初始化
@@ -1043,8 +1042,8 @@ namespace XHWK.WKTool
                 string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
                 ofd = new System.Windows.Forms.OpenFileDialog
                 {
-                    //Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
                     Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
+                    //Filter = "文档|*.docx;*.doc;*.ppt;*.pptx;*.pdf",
                     InitialDirectory = desktopPath,
                     Multiselect = false,
                     AddExtension = true,
@@ -1240,94 +1239,132 @@ namespace XHWK.WKTool
                     }
                     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++)//给画板模型加图片路径
+                        try
                         {
-                            if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
+                            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++)
                             {
-                                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;
+                                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);
+                                }
                             }
-                            else
+                            #endregion
+                            string[] page = images.ToArray();
+                            int num = 0;
+                            int iStart = APP.pageData.pagenum;//导入文档的开始下标
+                            int iEnd = page.Length + APP.pageData.pagenum;//导入文档的结束下标
+                            Dispatcher.Invoke(new Action(() =>
                             {
+                                for (int i = 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;
+                                        APP.PageDrawList[i].Type = "ppt";
+                                    }
+                                    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,
+                                            Type = "ppt"
+                                        };
+                                        APP.PageDrawList.Add(model_DrawData);
+                                    }
 
-                                Model_DrawData model_DrawData = new 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));//给当前页面展示图片
+                                    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 = null;
+                                    imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                    for (int i = iStart; i < iEnd; i++)
+                                    {
+                                        APP.PageDrawList[i].ImageLocation = new TranslateTransform
+                                        {
+                                            X = 0.1,
+                                            Y = 0.1
+                                        };
+                                        APP.PageDrawList[i].IsImageLocation = true;
+                                        APP.PageDrawList[i].ImageSizes = new ScaleTransform
+                                        {
+                                            CenterX = imgCanvas.Width,
+                                            CenterY = imgCanvas.Height
+                                        };
+                                    }
+                                }
+                                else
+                                {
+                                    imgDocumentation.Source = null;
+                                    imgCanvas.Source = null;
+                                    imgPPT.Source = null;
+                                    ///截图可用
+                                    ImgScreenshot.Visibility = Visibility.Visible;
+                                    ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                                    btnScreenshot.IsEnabled = true;
+                                }
+                            }));
                         }
-                        else
+                        catch (Exception ex)
                         {
-                            imgDocumentation.Source = null;
-                            imgCanvas.Source = null;
-                            ///截图可用
-                            ImgScreenshot.Visibility = Visibility.Visible;
-                            ImgScreenshotTwo.Visibility = Visibility.Collapsed;
-                            btnScreenshot.IsEnabled = true;
+                            Dispatcher.Invoke(new Action(() =>
+                            {
+                                MessageWindow.Show(ex.Message);
+                            }));
+
+                            LogHelper.WriteErrLog("【打开pdf】(OpenDialog pdf)" + ex.Message, ex);
                         }
+                      
                     }
                     else//word
                     {
@@ -3464,6 +3501,7 @@ namespace XHWK.WKTool
             ///清空页面图片UI
             imgCanvas.Source = null;
             imgDocumentation.Source = null;
+            imgPPT.Source = null;
             ///画板模型增加一页
             Model_DrawData model_DrawData = new Model_DrawData
             {
@@ -3494,7 +3532,7 @@ namespace XHWK.WKTool
                 //3种情况  1.文档图片 2.截图图片 3.没有图片
                 if (APP.PageDrawList.Count == 0)
                 {
-                    MessageWindow.Show("没有可打印的页，您可以新增、截图或导入来增加页！");
+                    MessageWindow.Show("没有可打印的页，您可以通过加页、截图或导入来增加页！");
                     return;
                 }