zhao：优化录制，固定录制视频大小

Common/system/ImageHelper.cs

@@ -404,45 +404,67 @@ namespace Common.system
         {
             try
             {
-                //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);
                 bmp.Render(ui);
                 BitmapEncoder encoder = new PngBitmapEncoder();
                 encoder.Frames.Add(BitmapFrame.Create(bmp));
-                //encoder.Save(fs);
-                //fs.Close();
-                Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
-                try
+                if (ImgWidth > 0)
                 {
-                    MemoryStream memoryStream = new MemoryStream();
-                    encoder.Save(memoryStream);
-                    //System.Drawing.Image img = System.Drawing.Image.FromStream(memoryStream);
-                    Bitmap bit = new Bitmap(memoryStream);
+                    Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
                     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();
+                        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
+                    catch (Exception ex)
                     {
-                        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)
+                else
                 {
+                    System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
+                    encoder.Save(fs);
+                    fs.Close();
+
+                    //MemoryStream memoryStream = new MemoryStream();
+                    //encoder.Save(memoryStream);
+                    //Bitmap bit = new Bitmap(memoryStream);
+                    //bit.Save(filePathName);
+                    //bit.Dispose();
+
+                    //using (FileStream tFileStream = new FileStream(filePathName,FileMode.Create, FileAccess.Write))
+                    //{
+                    //    PngBitmapEncoder tPngBitmapEncoder = new PngBitmapEncoder();
+                    //    tPngBitmapEncoder.Interlace = PngInterlaceOption.On;
+                    //    tPngBitmapEncoder.Frames.Add(BitmapFrame.Create(bmp));
+                    //    tPngBitmapEncoder.Save(tFileStream);
+                    //    tFileStream.Close();
+                    //}
 
                 }
             }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -296,6 +296,7 @@
                 </StackPanel>
             </Grid>
             <!--主内容-->
+            <Border  Grid.Row="1">
             <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
                 <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
                     <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
@@ -355,6 +356,7 @@
                 <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,0"/>
                 <!--<TextBlock x:Name="txbTime" Text="123456" FontSize="20" Foreground="#000000" Margin="0,0,0,10" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>-->
             </Grid>
+            </Border>
             <!--页码-->
             <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
                 <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -2851,8 +2851,10 @@ namespace XHWK.WKTool
                     #region 设置录制大小
                     //gridActWidth = (int)GridMain.ActualWidth==0?1276: (int)GridMain.ActualWidth;
                     //gridActHeight = (int)GridMain.ActualHeight==0?898: (int)GridMain.ActualHeight;
-                    gridActWidth = 1276;
-                    gridActHeight = 898;
+                    gridActWidth = (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f));
+                    gridActHeight = (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f));
+                    gridActWidth = gridActWidth % 2 > 0 ? gridActWidth - 1 : gridActWidth;
+                    gridActHeight = gridActHeight % 2 > 0 ? gridActHeight - 1 : gridActHeight;
                     #endregion
 
                     #region 录像倒计时
@@ -3012,16 +3014,21 @@ namespace XHWK.WKTool
                     {
                         string FilePathName = ImgPath + RsImgName.Count + ".png";
                         RsImgName.Add(FilePathName);
-                        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);
+                        #region 设置大小
+                        //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;
+                        //}
+                        #endregion         
+                        //保存图片
+                        ImageHelper.SaveUIToImage(GridMain, FilePathName, gridActWidth, gridActHeight, 0, 0);
+                        //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f)), 0, 0);
+                        //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)