zhao：解决冲突

Common/system/ImageHelper.cs

@@ -467,12 +467,25 @@ namespace Common.system
                     break;
             }
 
-            //克隆位图对象的一部分。
-            System.Drawing.Rectangle cloneRect = new System.Drawing.Rectangle(left, top, right - left, bottom - top);
-            Bitmap cloneBitmap = bmp.Clone(cloneRect, bmp.PixelFormat);
-            bmp.Dispose();
-            //cloneBitmap.Save(@"d:\123.png", ImageFormat.Png);
-            return cloneBitmap;
+            if(right - left<=0)//zxyceshi
+            {
+                //克隆位图对象的一部分。
+                System.Drawing.Rectangle cloneRect = new System.Drawing.Rectangle(left, top, 1, bottom - top);
+                Bitmap cloneBitmap = bmp.Clone(cloneRect, bmp.PixelFormat);
+                bmp.Dispose();
+                //cloneBitmap.Save(@"d:\123.png", ImageFormat.Png);
+                return cloneBitmap;
+            }
+            else
+            {
+                //克隆位图对象的一部分。
+                System.Drawing.Rectangle cloneRect = new System.Drawing.Rectangle(left, top, right - left, bottom - top);
+                Bitmap cloneBitmap = bmp.Clone(cloneRect, bmp.PixelFormat);
+                bmp.Dispose();
+                //cloneBitmap.Save(@"d:\123.png", ImageFormat.Png);
+                return cloneBitmap;
+            }
+         
         }
 
         /// <summary>

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -143,6 +143,8 @@ namespace XHWK.WKTool
                     DAL_Upload dAL_Upload = new DAL_Upload();
                     if (dAL_Upload.UploadVideo(pageData.menuList[i].FileGuid, out string ErrMessage))
                     {
+                        pageData.menuList[i].Visi = "Visible";
+                        pageData.menuList[i].Coll = "Collapsed";
                         MessageBox.Show("视频上传成功！");
                     }
                     else

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -163,6 +163,9 @@ namespace XHWK.WKTool
                 times.Enabled = true; //启动计时器
 
                 IsRbnOpen = true;
+
+                string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
+                FileToolsCommon.CreateDirectory(imgPath);
             }
         }
 
@@ -178,8 +181,7 @@ namespace XHWK.WKTool
                         if (I > 10010)
                         {
                             long time = Timestamp();
-                        string imgPath= FileToolsCommon.GetFileAbsolutePath("temp/imgplayer");
-                            FileToolsCommon.CreateFile(imgPath);
+                        string imgPath= FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
                             //string FilePathName = ImgPath + RsImgName.Count + ".png";
                             string path = CameraHelper.CaptureImage(imgPath, time.ToString());
                             if (!string.IsNullOrWhiteSpace(path))
@@ -705,7 +707,7 @@ namespace XHWK.WKTool
                         imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
                         //btnOk.Visibility = Visibility.Visible;
                         //blackboard_canvas.Visibility = Visibility.Collapsed;
-
+                        APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation = false;
                         ImgPrint.Visibility = Visibility.Visible;//截图成功可打印
                         ImgPrintTwo.Visibility = Visibility.Collapsed;
                         btnPrint.IsEnabled = true;
@@ -849,6 +851,7 @@ namespace XHWK.WKTool
                                     APP.PageDrawList[i].PageImagePath = page[i]; //zxycs
                                     APP.PageDrawList[i].PdfImagePath = page[i];
                                     APP.PageDrawList[i].PageNum = i + 1;
+                                    APP.PageDrawList[i].ImgDocumentation = true;
                                 }
                                 else
                                 {
@@ -857,6 +860,7 @@ namespace XHWK.WKTool
                                     model_DrawData.PageImagePath = page[i];
                                     model_DrawData.PdfImagePath = page[i];
                                     model_DrawData.PageNum = i + 1;
+                                    model_DrawData.ImgDocumentation = true;
                                     APP.PageDrawList.Add(model_DrawData);
                                 }
                                 ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
@@ -910,6 +914,7 @@ namespace XHWK.WKTool
                                     APP.PageDrawList[i].PageImagePath = page[i]; //zxycs
                                     APP.PageDrawList[i].PdfImagePath = page[i];
                                     APP.PageDrawList[i].PageNum = i + 1;
+                                    APP.PageDrawList[i].ImgDocumentation = true;
                                 }
                                 else
                                 {
@@ -918,6 +923,7 @@ namespace XHWK.WKTool
                                     model_DrawData.PageImagePath = page[i];
                                     model_DrawData.PdfImagePath = page[i];
                                     model_DrawData.PageNum = i + 1;
+                                    model_DrawData.ImgDocumentation = true;
                                     APP.PageDrawList.Add(model_DrawData);
                                 }
                                 ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
@@ -1476,7 +1482,7 @@ namespace XHWK.WKTool
                 APP.pageData.currpage -= 1;
 
                 myblackboard.changepage(APP.pageData.currpage - 1);
-                if (APP.PageDrawList.Count > 0)
+                if (APP.pageData.currpage <= APP.PageDrawList.Count)
                 {
                     if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
                     {
@@ -1486,27 +1492,38 @@ namespace XHWK.WKTool
                     {
                         //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
 
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                        if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
+                        if (APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
                         {
-                            var group = IMG.FindResource("Imageview") as TransformGroup;
-                            var transform = group.Children[1] as TranslateTransform;
-                            //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
-                            //{
-                            //    var transform1 = group.Children[0] as ScaleTransform;
-                            //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
-                            //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
-                            //}
-                            //var position = e.GetPosition(img);
-                            transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
-                            transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
-                            mouseDown = false;
+                            imgCanvas.Source = null;
+                            imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                        }
+                        else
+                        {
+                            imgDocumentation.Source = null;
+                            imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                      
+                            if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
+                            {
+                                var group = IMG.FindResource("Imageview") as TransformGroup;
+                                var transform = group.Children[1] as TranslateTransform;
+                                //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
+                                //{
+                                //    var transform1 = group.Children[0] as ScaleTransform;
+                                //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
+                                //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
+                                //}
+                                //var position = e.GetPosition(img);
+                                transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
+                                transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
+                                mouseDown = false;
 
+                            }
                         }
                     }
                     else
                     {
                         imgCanvas.Source = null;
+                        imgDocumentation.Source = null;
                     }
                 }
                 //if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
@@ -1543,7 +1560,7 @@ namespace XHWK.WKTool
                 }
                 APP.pageData.currpage += 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
-                if (APP.PageDrawList.Count > 0)
+                if (APP.pageData.currpage <= APP.PageDrawList.Count)
                 {
 
                     if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
@@ -1552,29 +1569,39 @@ namespace XHWK.WKTool
                     }
                     if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
                     {
-                        //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage-1]));
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                        if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
+                        if(APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
                         {
-                            var group = IMG.FindResource("Imageview") as TransformGroup;
-                            //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
-                            //{
-                            //    var transform1 = group.Children[0] as ScaleTransform;
-                            //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
-                            //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
-                            //}
-                            var transform = group.Children[1] as TranslateTransform;
-                            //var position = e.GetPosition(img);
-                            transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
-                            transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
-
-
-                            mouseDown = false;
+                            imgCanvas.Source = null;
+                            imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                        }
+                        else
+                        {
+                            //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage-1]));
+                            imgDocumentation.Source = null;
+                            imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                            if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
+                            {
+                                var group = IMG.FindResource("Imageview") as TransformGroup;
+                                //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
+                                //{
+                                //    var transform1 = group.Children[0] as ScaleTransform;
+                                //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
+                                //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
+                                //}
+                                var transform = group.Children[1] as TranslateTransform;
+                                //var position = e.GetPosition(img);
+                                transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
+                                transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
+
+
+                                mouseDown = false;
+                            }
                         }
                     }
                     else
                     {
                         imgCanvas.Source = null;
+                        imgDocumentation.Source = null;
                     }
                 }
                 //if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))