zhao：1解决最后一个视频无法删除 2限制录制存储图片大小

Common/system/FileToolsCommon.cs

@@ -785,9 +785,16 @@ namespace Common.system
         /// <param name="filePath">文件的绝对路径</param>  
         public static void DeleteFile(string filePath)
         {
-            if (IsExistFile(filePath))
+            try
             {
-                File.Delete(filePath);
+                if (IsExistFile(filePath))
+                {
+                    File.Delete(filePath);
+                }
+            }
+            catch (Exception ex)
+            {
+
             }
         }
         #endregion

Common/system/ImageHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Text;
@@ -98,7 +99,7 @@ namespace Common.system
                     bitmap.EndInit();
                     bitmap.Freeze();
                 }
-                return bitmap; 
+                return bitmap;
             }
             catch (Exception)
             {
@@ -395,27 +396,55 @@ namespace Common.system
         /// </summary>
         /// <param name="ui">需要截图的UI控件</param>
         /// <param name="filePathName">图片保存地址 命名 1.png</param>
-        /// <param name="width">保存宽</param>
-        /// <param name="height">保存高</param>
-        public static void SaveUIToImage(FrameworkElement ui, string filePathName, int width, int height)
+        /// <param name="width">窗口宽</param>
+        /// <param name="height">窗口高</param>
+        /// <param name="ImgWidth">图片高</param>
+        /// <param name="ImgHeight">图片高</param>
+        public static void SaveUIToImage(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
         {
             try
             {
-                System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
+                //System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
                 //在位图中呈现UI元素
-                RenderTargetBitmap bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY,
-                PixelFormats.Pbgra32);
+                RenderTargetBitmap bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
                 bmp.Render(ui);
                 BitmapEncoder encoder = new PngBitmapEncoder();
                 encoder.Frames.Add(BitmapFrame.Create(bmp));
-                encoder.Save(fs);
-                fs.Close();
-                new Thread(new ThreadStart(new Action(() =>
+                //encoder.Save(fs);
+                //fs.Close();
+                Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
+                try
                 {
-                    Bitmap bitmap = CutImageWhitePart(filePathName);
-                    FileToolsCommon.DeleteFile(filePathName);
-                    bitmap.Save(filePathName);
-                }))).Start();
+                    MemoryStream memoryStream = new MemoryStream();
+                    encoder.Save(memoryStream);
+                    //System.Drawing.Image img = System.Drawing.Image.FromStream(memoryStream);
+                    Bitmap bit = new Bitmap(memoryStream);
+                    try
+                    {
+                        Graphics g = Graphics.FromImage(Img);
+                        //g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                        g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, (int)bit.Width, (int)bit.Height), GraphicsUnit.Pixel);
+                        g.Dispose();
+                    }
+                    catch
+                    {
+                        Img = bit;
+                    }
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        //Img.Save(filePathName);
+                        Bitmap bitmap = CutImageWhitePart(Img);
+                        FileToolsCommon.DeleteFile(filePathName);
+                        bitmap.Save(filePathName);
+                        bitmap.Dispose();
+                        Img.Dispose();
+                        bit.Dispose();
+                    }))).Start();
+                }
+                catch (Exception ex)
+                {
+
+                }
             }
             catch (Exception ex)
             {
@@ -430,9 +459,9 @@ namespace Common.system
         /// 裁剪图片（去掉白边）
         /// </summary>
         /// <param name="FilePath"></param>
-        public static Bitmap CutImageWhitePart(string FilePath)
+        public static Bitmap CutImageWhitePart(Bitmap bmp)
         {
-            Bitmap bmp = new Bitmap(FilePath);
+            //Bitmap bmp = new Bitmap(FilePath);
             //上左右下
             int top = 0, left = 0, right = bmp.Width, bottom = bmp.Height;
 

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -241,6 +241,7 @@ namespace XHWK.WKTool.UControl
                             ImgVideo.Source = null;
                             GC.Collect();
                             FileToolsCommon.DeleteFile(ThumbnailPath);
+                            this.Visibility = Visibility.Hidden;
                             return;
                         }
                         catch (Exception ex)

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -619,7 +619,7 @@
             </Grid>
 
 
-            <Grid x:Name="GridMyVideo" Grid.Row="1" Margin="0" Background="White" Visibility="Collapsed">
+            <Grid x:Name="GridMyVideo" Grid.Row="1" Margin="0" Background="White" Visibility="Hidden">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="50"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -2353,6 +2353,17 @@ namespace XHWK.WKTool
                 BtnVideoUpPage.Visibility = Visibility.Hidden;
                 lblVideoPageNum.Visibility = Visibility.Hidden;
                 BtnVideoDownPage.Visibility = Visibility.Hidden;
+                //隐藏显示的控件
+                if (VideoControlList.Count > 0)
+                {
+                    foreach (Uc_VideoItem item in VideoControlList)
+                    {
+                        if (item.Visibility != Visibility.Hidden)
+                        {
+                            item.Visibility = Visibility.Hidden;
+                        }
+                    }
+                }
             }
             APP.myloading.Hide();
         }
@@ -2975,7 +2986,17 @@ namespace XHWK.WKTool
                     {
                         string FilePathName = ImgPath + RsImgName.Count + ".png";
                         RsImgName.Add(FilePathName);
-                        ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)));
+                        double RsW = (int)(ActualWidth * (PrimaryScreen.DpiX / 96f));
+                        double RsH = (int)(ActualHeight * (PrimaryScreen.DpiY / 96f));
+                        if (RsW > 1281)
+                        {
+                            //double Proportion = RsH / RsW;
+                            RsW = 1281;
+                            //RsH = RsW * Proportion;
+                            RsH = 1026;
+                        }
+                        ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)), (int)RsW,(int)RsH);
+                        //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)), 1281, 1026);
                         SRTime = SRTime.AddMilliseconds(200);
                         if (txbTime.Visibility == Visibility.Hidden)
                         {