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

Common/system/ImageHelper.cs

@@ -392,6 +392,94 @@ namespace Common.system
         #endregion 图片压缩
 
         #region 截屏指定UI控件
+        /// <summary>
+        /// 保存图片
+        /// </summary>
+        /// <param name="ui">需要截图的UI控件</param>
+        /// <param name="filePathName">图片保存地址 命名 1.png</param>
+        /// <param name="width">图片宽</param>
+        /// <param name="height">图片高</param>
+        /// <param name="ImgWidth">转换后高</param>
+        /// <param name="ImgHeight">转换后高</param>
+        public static void SaveUI(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
+        {
+            try
+            {
+                //在位图中呈现UI元素
+                RenderTargetBitmap bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
+                bmp.Render(ui);
+
+                //定义切割矩形
+                var cut = new Int32Rect(0, 0, width, height);
+                //计算Stride
+                var stride = bmp.Format.BitsPerPixel * cut.Width / 8;
+                //声明字节数组
+                byte[] data = new byte[cut.Height * stride];
+
+                //调用CopyPixels
+                bmp.CopyPixels(cut, data, stride, 0);
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    BitmapSource bitmapSource = BitmapSource.Create(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Bgr32, null, data, stride);
+
+                    BitmapEncoder encoder = new PngBitmapEncoder();
+                    encoder.Frames.Add(BitmapFrame.Create(bitmapSource));
+                    if (ImgWidth > 0)
+                    {
+                        Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
+                        try
+                        {
+                            //MemoryStream memoryStream = new MemoryStream(data);
+                            //Bitmap bit = (Bitmap)Image.FromStream(memoryStream);
+
+                            MemoryStream memoryStream = new MemoryStream();
+                            encoder.Save(memoryStream);
+                            Bitmap bit = new Bitmap(memoryStream,true);
+                            if (ImgWidth - 2 < bit.Width)
+                                {
+                                    try
+                                    {
+                                        Graphics g = Graphics.FromImage(Img);
+                                    g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, bit.Width, bit.Height), GraphicsUnit.Pixel);
+                                        g.Dispose();
+                                    }
+                                    catch
+                                    {
+                                        Img = bit;
+                                    }
+                                }
+                                else
+                                {
+                                    Img = bit;
+                            }
+                            Img.Save(filePathName);
+                            memoryStream.Dispose();
+                            Img.Dispose();
+                            bit.Dispose();
+                        }
+                        catch (Exception ex)
+                        {
+                            using (var stream = new FileStream(filePathName, FileMode.Create))
+                            {
+                                encoder.Save(stream);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        using (var stream = new FileStream(filePathName, FileMode.Create))
+                        {
+                            encoder.Save(stream);
+                        }
+                    }
+                }))).Start();
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+
         /// <summary>
         /// 保存图片
         /// </summary>
@@ -403,8 +491,6 @@ namespace Common.system
         /// <param name="ImgHeight">图片高</param>
         public static void SaveUIToImage(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
         {
-            //SaveUI(ui, filePathName, width, height, ImgWidth, ImgHeight);
-            //return;
             try
             {
                 //在位图中呈现UI元素
@@ -483,7 +569,7 @@ namespace Common.system
                 //Console.WriteLine(ex.Message);
             }
         }
-        public static void SaveUI(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
+        public static void SaveUI1(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
         {
             try
             {
@@ -491,37 +577,48 @@ namespace Common.system
                 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));
+                //BitmapEncoder encoder = new PngBitmapEncoder();
+                //encoder.Frames.Add(BitmapFrame.Create(bmp));
+
+                //BitmapSource bitmapSource= bmp.Clone();
+
+
 
-                SaveModel saveModel = new SaveModel();
-                saveModel.ImgWidth = ImgWidth;
-                saveModel.ImgHeight = ImgHeight;
-                saveModel.filePathName = filePathName;
-                saveModel.bmp = bmp;
                 //定义切割矩形
                 var cut = new Int32Rect(0, 0, width, height);
-
                 //计算Stride
-
                 var stride = bmp.Format.BitsPerPixel * cut.Width / 8;
-
                 //声明字节数组
-
                 byte[] data = new byte[cut.Height * stride];
 
                 //调用CopyPixels
-
                 bmp.CopyPixels(cut, data, stride, 0);
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    BitmapSource bitmapSource = BitmapSource.Create(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Bgr32, null, data, stride);
 
+                    BitmapEncoder encoder = new PngBitmapEncoder();
+                    encoder.Frames.Add(BitmapFrame.Create(bitmapSource));
+
+                    using (var stream = new FileStream(filePathName, FileMode.Create))
+                    {
+                        encoder.Save(stream);
+                    }
+                }))).Start();
+                //SaveModel saveModel = new SaveModel();
+                //saveModel.ImgWidth = ImgWidth;
+                //saveModel.ImgHeight = ImgHeight;
+                //saveModel.filePathName = filePathName;
+                //saveModel.bmp = bmp;
                 //saveModel.encoder =new PngBitmapEncoder();
                 //foreach (BitmapFrame eitem in encoder.Frames)
                 //{
                 //    saveModel.encoder = new PngBitmapEncoder();
                 //    saveModel.encoder.Frames.Add( eitem );
                 //}
-                Thread myThread = new Thread(SaveImage);
-                myThread.Start(saveModel);
+
+                //Thread myThread = new Thread(SaveImage);
+                //myThread.Start(saveModel);
             }
             catch (Exception ex)
             {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -122,9 +122,21 @@ namespace XHWK.WKTool
             new Aspose.Pdf.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
             new Aspose.Slides.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
             InitializeComponent();
+
+            float WorkW = PrimaryScreen.ScaleWorkingAreaSize.Width;
+            float WorkH = PrimaryScreen.ScaleWorkingAreaSize.Height;
             double proportion = 1036.0 / 1290.0;
-            Width = (PrimaryScreen.ScaleWorkingAreaSize.Height) / proportion - (BorderThickness.Left + BorderThickness.Right);
-            Height = PrimaryScreen.ScaleWorkingAreaSize.Height - (BorderThickness.Top + BorderThickness.Bottom);
+            //限制大小 确保大屏幕下录制不会卡死  暂时
+            if (WorkW > 1920.0)
+            {
+                Width = 1920;
+                Height = 1036;
+            }
+            else
+            {
+                Width = (PrimaryScreen.ScaleWorkingAreaSize.Height) / proportion - (BorderThickness.Left + BorderThickness.Right);
+                Height = PrimaryScreen.ScaleWorkingAreaSize.Height - (BorderThickness.Top + BorderThickness.Bottom);
+            }
             GridContent.Width = Width - 14;
             GridContent.Height = Height;
 
@@ -3141,7 +3153,8 @@ namespace XHWK.WKTool
                     Dispatcher.Invoke(() =>
                     {
                         //保存图片
-                        ImageHelper.SaveUIToImage(GridMain, FilePathName, gridActWidth, gridActHeight, (int)RsW, (int)RsH);
+                        ImageHelper.SaveUI(GridMain, FilePathName, gridActWidth, gridActHeight, (int)RsW, (int)RsH);
+                        //ImageHelper.SaveUIToImage(GridMain, FilePathName, gridActWidth, gridActHeight, (int)RsW, (int)RsH);
                         //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);
@@ -4982,7 +4995,11 @@ namespace XHWK.WKTool
                 HideAngleBorder();
             }
         }
-
+        /// <summary>
+        /// 加载完成后调整录制区域大小
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             //调整录制区域宽高