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

XHWK.Model/Model_DrawData.cs

@@ -19,6 +19,7 @@ namespace XHWK.Model
         //private List<PointF> _Handwriting;
         private string _pdfImagePath;
         private bool _imgDocumentation;
+        private string _type;
         /// <summary>
         /// 页码
         /// </summary>
@@ -52,6 +53,10 @@ namespace XHWK.Model
         /// </summary>
         public bool ImgDocumentation { get => _imgDocumentation; set => _imgDocumentation = value; }
         public ScaleTransform ImageSizes { get => _ImageSizes; set => _ImageSizes = value; }
+        /// <summary>
+        /// ppt word
+        /// </summary>
+        public string Type { get => _type; set => _type = value; }
         ///// <summary>
         ///// 笔颜色 十六进制
         ///// </summary>

XHWK.WKTool/App.config

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

XHWK.WKTool/PrintWindow.xaml

@@ -84,7 +84,7 @@
                     Margin="50,20,50,0"
                     Visibility="Visible" />
                     <Label Grid.Row="0"
-                    HorizontalAlignment="Center" Width="120"
+                    HorizontalAlignment="Center" Width="60"
                     x:Name="lbProcess"
                     Height="30"
                     Margin="0,20,0,0"

XHWK.WKTool/PrintWindow.xaml.cs

@@ -118,7 +118,7 @@ namespace XHWK.WKTool
             Dispatcher.Invoke(() =>
             {
                 pgbProcess.Value = num;
-                lbProcess.Content = string.Format("{0}% / {1}%", num, 100);
+                lbProcess.Content = num.ToString()+"%";
                 if (num < 99)
                 {
                     num++;
@@ -166,7 +166,7 @@ namespace XHWK.WKTool
                     num = 99;
                     times.Stop();
                     pgbProcess.Value = 100;
-                    lbProcess.Content = string.Format("{0}% / {1}%", 100, 100);
+                    lbProcess.Content = "100%";
                     MessageWindow.Show("打印成功！");
                     tip_outer.Visibility = Visibility.Collapsed;
                 });
@@ -194,7 +194,7 @@ namespace XHWK.WKTool
              {
                  I = 1;
                  pgbProcess.Value = I * 100 / 100;
-                 lbProcess.Content = string.Format("{0}% / {1}%", I, 100);
+                 lbProcess.Content = I.ToString() + "%";
                  tip_outer.Visibility = Visibility.Visible;
                  //I = 0;
              });
@@ -239,7 +239,7 @@ namespace XHWK.WKTool
                             {
                                 I = 100;
                                 pgbProcess.Value = I * 100 / 100;
-                                lbProcess.Content = string.Format("{0}% / {1}%", I, 100);
+                                lbProcess.Content = I.ToString() + "%";
                                 APP.myloading.Hide();
                                 I = 0;
                             });
@@ -296,7 +296,7 @@ namespace XHWK.WKTool
                 try
                 {
                         pgbProcess.Value = I * 100 / 100;
-                        lbProcess.Content = string.Format("{0}% / {1}%", I, 100);
+                        lbProcess.Content = I.ToString() + "%";
                         I++;
                 }
                 catch (Exception ex)

XHWK.WKTool/Properties/AssemblyInfo.cs

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

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -330,7 +330,8 @@
                                 </Grid>
                             </Border>
                         </Grid>
-                        <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top"/>
+                        <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top" Stretch="Fill"/>
+                        <Image x:Name="imgPPT" Visibility="Visible" VerticalAlignment="Top"/>
                         <!--导入图片-->
                         <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
                         <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -933,7 +933,7 @@ namespace XHWK.WKTool
                             X = 0.1,
                             Y = 0.1
                         };
-                     
+                        APP.PageDrawList[APP.pageData.currpage - 1].Type = "截图";
 
                         APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
                         imgCanvas.Source = bitImg;
@@ -1098,6 +1098,9 @@ namespace XHWK.WKTool
                             {
                             string[] page = images.ToArray();
                                 int num = 0;
+
+                                int iStart = APP.pageData.pagenum;//导入文档的开始下标
+                                int iEnd= page.Length + APP.pageData.pagenum;//导入文档的结束下标
                                 for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
                                 {
                                     if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
@@ -1106,16 +1109,17 @@ namespace XHWK.WKTool
                                         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
+                                            ImgDocumentation = true,
+                                            Type = "ppt"
                                         };
                                         APP.PageDrawList.Add(model_DrawData);
                                     }
@@ -1132,18 +1136,36 @@ namespace XHWK.WKTool
                                     APP.pageData.pagenum += num;
                                     gridPage.Visibility = Visibility.Visible;//页码大于0 显示
                                 }
-                                if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
+                                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));//给当前页面展示图片
+                                    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;
@@ -1270,6 +1292,7 @@ namespace XHWK.WKTool
                                         APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
                                         APP.PageDrawList[i].PageNum = i + 1;
                                         APP.PageDrawList[i].ImgDocumentation = true;
+                                        APP.PageDrawList[i].Type = "word";
                                     }
                                     else
                                     {
@@ -1279,7 +1302,8 @@ namespace XHWK.WKTool
                                             PageImagePath = page[i - APP.pageData.pagenum],
                                             PdfImagePath = page[i - APP.pageData.pagenum],
                                             PageNum = i + 1,
-                                            ImgDocumentation = true
+                                            ImgDocumentation = true,
+                                            Type = "word"
                                         };
                                         APP.PageDrawList.Add(model_DrawData);
                                     }
@@ -1295,10 +1319,11 @@ namespace XHWK.WKTool
                                     APP.pageData.pagenum += num;
                                     gridPage.Visibility = Visibility.Visible;//页码大于0 显示
                                 }
-                                if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
+                                if (APP.pageData.currpage > 0 && APP.pageData.currpage <= APP.PageDrawList.Count)
                                 {
 
                                     imgCanvas.Source = null;
+                                    imgPPT.Source = null;
                                     ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
                                     ImgScreenshotTwo.Visibility = Visibility.Visible;
                                     btnScreenshot.IsEnabled = false;
@@ -1309,6 +1334,7 @@ namespace XHWK.WKTool
                                 {
                                     imgDocumentation.Source = null;
                                     imgCanvas.Source = null;
+                                    imgPPT.Source = null;
                                     ///截图可用
                                     ImgScreenshot.Visibility = Visibility.Visible;
                                     ImgScreenshotTwo.Visibility = Visibility.Collapsed;
@@ -3104,6 +3130,7 @@ namespace XHWK.WKTool
                     APP.PageDrawList.Clear();
                     imgCanvas.Source = null;
                     imgDocumentation.Source = null;
+                    imgPPT.Source = null;
                     gridPage.Visibility = Visibility.Collapsed;
                     #endregion
 
@@ -3357,7 +3384,7 @@ namespace XHWK.WKTool
                 }
 
 
-                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
+                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0, 0, 0, 0);
                 //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
                 ////设置纸张横向
                 //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
@@ -3380,7 +3407,7 @@ namespace XHWK.WKTool
                     {
 
                     }
-                    else if (APP.PageDrawList[i].ImgDocumentation == true)
+                    else if (APP.PageDrawList[i].ImgDocumentation == true&& !APP.PageDrawList[i].Type.Equals("ppt"))
                     {
                         image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
                     }
@@ -3410,13 +3437,13 @@ namespace XHWK.WKTool
 
 
 
-                    if (image.Height > iTextSharp.text.PageSize.A4.Height - 25)
+                    if (image.Height > iTextSharp.text.PageSize.A4.Height)
                     {
-                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width - 25, iTextSharp.text.PageSize.A4.Height - 25);
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
                     }
-                    else if (image.Width > iTextSharp.text.PageSize.A4.Width - 25)
+                    else if (image.Width > iTextSharp.text.PageSize.A4.Width)
                     {
-                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width - 25, iTextSharp.text.PageSize.A4.Height - 25);
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
                     }
                     image.Alignment = iTextSharp.text.Image.ALIGN_MIDDLE;
                     document.NewPage();
@@ -3505,14 +3532,28 @@ namespace XHWK.WKTool
 
                         if (APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
                         {
-                            imgCanvas.Source = null;
-                            imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                            ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
-                            ImgScreenshotTwo.Visibility = Visibility.Visible;
-                            btnScreenshot.IsEnabled = false;
+                            if("ppt".Equals(APP.PageDrawList[APP.pageData.currpage - 1].Type))
+                            {
+                                imgCanvas.Source = null;
+                                imgDocumentation.Source = null;
+                                imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                                ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                btnScreenshot.IsEnabled = false;
+                            }
+                            else
+                            {
+                                imgPPT.Source = null;
+                                imgCanvas.Source = null;
+                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                                ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                btnScreenshot.IsEnabled = false;
+                            }
                         }
                         else
                         {
+                            imgPPT.Source = null;
                             imgDocumentation.Source = null;
                             imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
                             APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
@@ -3526,6 +3567,7 @@ namespace XHWK.WKTool
                     }
                     else
                     {
+                        imgPPT.Source = null;
                         imgCanvas.Source = null;
                         imgDocumentation.Source = null;
                     }
@@ -3589,14 +3631,33 @@ namespace XHWK.WKTool
                     {
                         if (APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
                         {
-                            imgCanvas.Source = null;
-                            imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                            ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
-                            ImgScreenshotTwo.Visibility = Visibility.Visible;
-                            btnScreenshot.IsEnabled = false;
+                            if ("ppt".Equals(APP.PageDrawList[APP.pageData.currpage - 1].Type))
+                            {
+                                imgCanvas.Source = null;
+                                imgDocumentation.Source = null;
+                                imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                                ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                btnScreenshot.IsEnabled = false;
+                            }
+                            else
+                            {
+                                imgPPT.Source = null;
+                                imgCanvas.Source = null;
+                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                                ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                btnScreenshot.IsEnabled = false;
+                            }
+                            //imgCanvas.Source = null;
+                            //imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                            //ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                            //ImgScreenshotTwo.Visibility = Visibility.Visible;
+                            //btnScreenshot.IsEnabled = false;
                         }
                         else
                         {
+                            imgPPT.Source = null;
                             imgDocumentation.Source = null;
                             imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
                             APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
@@ -3626,6 +3687,7 @@ namespace XHWK.WKTool
                     }
                     else
                     {
+                        imgPPT.Source = null;
                         imgCanvas.Source = null;
                         imgDocumentation.Source = null;
                     }