1.4.6 导入图片

XHWK.WKTool/App.config

@@ -32,8 +32,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="46" />
-    <add key="VersionName" value="1.4.5" />
+    <add key="VersionCode" value="47" />
+    <add key="VersionName" value="1.4.6" />
     <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.4.5.0")]
-[assembly: AssemblyFileVersion("1.4.5.0")]
+[assembly: AssemblyVersion("1.4.6.0")]
+[assembly: AssemblyFileVersion("1.4.6.0")]

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1061,7 +1061,8 @@ namespace XHWK.WKTool
                 ofd = new System.Windows.Forms.OpenFileDialog
                 {
                     //Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
-                    Filter = "文档|*.docx;*.doc;*.ppt;*.pptx;*.pdf",
+                    //增加导入图片
+                    Filter = "文档|*.docx;*.doc;*.ppt;*.pptx;*.pdf|图片|*.jpg;*.jpeg;*.png;*.bmp",
                     InitialDirectory = desktopPath,
                     Multiselect = false,
                     AddExtension = true,
@@ -1107,12 +1108,14 @@ namespace XHWK.WKTool
             {
                 if (ofd.FileName != "")
                 {
+                    List<string> imagelist = new List<string>() { "jpg", "jpeg", "png", "bmp" };
                     Dispatcher.Invoke(new Action(() =>
                     {
                         APP.myloading.Show();
                         myblackboard.changepage(APP.pageData.pagenum);
                     }));
                     string filepath = ofd.FileName;
+                    string filesuff = filepath.Substring(filepath.LastIndexOf(".") + 1).ToLower();
                     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
@@ -1374,6 +1377,100 @@ namespace XHWK.WKTool
                         }
 
                     }
+                    else if(imagelist.Contains(filesuff))///导入图片
+                    {
+                        string imagepath = AppDomain.CurrentDomain.BaseDirectory + "temp";
+
+                        if (!Directory.Exists(imagepath))
+                        {
+                            Directory.CreateDirectory(imagepath);
+                        }
+                        TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+                        string timestr = Convert.ToInt64(ts.TotalMilliseconds).ToString();
+                        string filepathCopy = Path.Combine(imagepath, timestr + ofd.SafeFileName);
+                       
+                        System.IO.File.Copy(filepath, filepathCopy);
+                        filepath = filepathCopy;
+
+                        APP.ImgPath = filepath;
+                        Dispatcher.Invoke(new Action(() =>
+                        {
+                        if (APP.pageData.currpage == 0)
+                        {
+                            APP.pageData.pagenum += 1;
+                            APP.pageData.currpage = APP.pageData.pagenum;
+                            myblackboard.changepage(APP.pageData.currpage - 1);
+                         
+
+                           
+                                gridPage.Visibility = Visibility.Visible;//页码大于0 显示
+                                #region 插入页码
+                                PageData = new List<PageData>();
+                                for (int i = 1; i <= APP.pageData.pagenum; i++)
+                                {
+                                    PageData pd = new PageData();
+                                    pd.PageName = i.ToString();// + "页";
+                                    pd.PageCode = i;
+                                    PageData.Add(pd);
+                                }
+                                CbxPageList.ItemsSource = PageData;
+                                CbxPageList.SelectedIndex = APP.pageData.currpage - 1;
+                                #endregion
+                         
+
+
+                          
+                        }
+                        if (APP.PageDrawList.Count >= APP.pageData.currpage)
+                        {
+                            APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath = APP.ImgPath;//zxycs
+                            APP.PageDrawList[APP.pageData.currpage - 1].PdfImagePath = APP.ImgPath;
+                        }
+                        else
+                        {
+                            Model_DrawData model_DrawData = new Model_DrawData
+                            {
+                                PageImagePath = APP.ImgPath,
+                                PdfImagePath = APP.ImgPath
+                            };
+                            APP.PageDrawList.Add(model_DrawData);
+                        }
+                        if (APP.PageDrawList.Count >= APP.pageData.currpage && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
+                        {
+
+                            imgDocumentation.Source = null;
+                            BitmapImage bitImg = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                            mouseDown = false;
+                            APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation = new TranslateTransform
+                            {
+                                X = 0.1,
+                                Y = 0.1
+                            };
+                            APP.PageDrawList[APP.pageData.currpage - 1].Type = "截图";
+
+                            APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
+                            imgCanvas.Source = bitImg;
+                            imgCanvas.Width = bitImg.Width;
+                            imgCanvas.Height = bitImg.Height;
+                            scroMain.ScrollToVerticalOffset(0);
+                            APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform
+                            {
+                                CenterX = imgCanvas.Width,
+                                CenterY = imgCanvas.Height
+                            };
+
+                     
+                                ImgPrint.Visibility = Visibility.Visible;//截图成功可打印
+                                ImgPrintTwo.Visibility = Visibility.Collapsed;
+                                btnPrint.IsEnabled = true;
+                         
+
+                      
+
+
+                        }
+                               }));
+                    }
                     else//word
                     {
                         try