zhao:优化

Common/system/ImageHelper.cs

@@ -434,23 +434,23 @@ namespace Common.system
 
                             MemoryStream memoryStream = new MemoryStream();
                             encoder.Save(memoryStream);
-                            Bitmap bit = new Bitmap(memoryStream,true);
+                            Bitmap bit = new Bitmap(memoryStream, true);
                             if (ImgWidth - 2 < bit.Width)
+                            {
+                                try
                                 {
-                                    try
-                                    {
-                                        Graphics g = Graphics.FromImage(Img);
+                                    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;
-                                    }
+                                    g.Dispose();
                                 }
-                                else
+                                catch
                                 {
                                     Img = bit;
+                                }
+                            }
+                            else
+                            {
+                                Img = bit;
                             }
                             Img.Save(filePathName);
                             memoryStream.Dispose();
@@ -638,71 +638,71 @@ namespace Common.system
                 BitmapEncoder encoder = new PngBitmapEncoder();
                 encoder.Frames.Add(BitmapFrame.Create(bmp));
                 string filePathName = saveModel.filePathName;
-            if (ImgWidth > 0)
-            {
-                Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
-                try
+                if (ImgWidth > 0)
                 {
-                    MemoryStream memoryStream = new MemoryStream();
-                    encoder.Save(memoryStream);
-                    new Thread(new ThreadStart(new Action(() =>
+                    Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
+                    try
                     {
+                        MemoryStream memoryStream = new MemoryStream();
+                        encoder.Save(memoryStream);
+                        new Thread(new ThreadStart(new Action(() =>
+                        {
                         //System.Drawing.Image img = System.Drawing.Image.FromStream(memoryStream);
                         Bitmap bit = new Bitmap(memoryStream);
-                        if (ImgWidth - 2 < bit.Width)
-                        {
-                            try
+                            if (ImgWidth - 2 < bit.Width)
                             {
-                                Graphics g = Graphics.FromImage(Img);
+                                try
+                                {
+                                    Graphics g = Graphics.FromImage(Img);
                                 //g.InterpolationMode = InterpolationMode.HighQualityBicubic;
                                 g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, bit.Width, bit.Height), GraphicsUnit.Pixel);
-                                g.Dispose();
+                                    g.Dispose();
+                                }
+                                catch
+                                {
+                                    Img = bit;
+                                }
                             }
-                            catch
+                            else
                             {
                                 Img = bit;
                             }
-                        }
-                        else
-                        {
-                            Img = bit;
-                        }
-                        Img.Save(filePathName);
+                            Img.Save(filePathName);
                         //Bitmap bitmap = CutImageWhitePart(Img);
                         //FileToolsCommon.DeleteFile(filePathName);
                         //bitmap.Save(filePathName);
                         //bitmap.Dispose();
                         memoryStream.Dispose();
-                        Img.Dispose();
-                        bit.Dispose();
-                    }))).Start();
+                            Img.Dispose();
+                            bit.Dispose();
+                        }))).Start();
+                    }
+                    catch (Exception ex)
+                    {
+
+                    }
                 }
-                catch (Exception ex)
+                else
                 {
+                    //SaveImageModel sim = new SaveImageModel();
+                    //sim.encoder = new PngBitmapEncoder();
+                    //sim.encoder = new PngBitmapEncoder();
+                    //BitmapFrame test= encoder.Frames[0];
+                    //sim.encoder.Frames.Add(BitmapFrame.Create(test));
+                    ////sim.encoder.Frames[0].CopyTo(encoder.Frames[0]);
+                    ////sim.encoder.CopyTo(encoder);
+                    ////encoder.CopyTo(sim.encoder);
+                    //sim.FilePath = filePathName;
+                    ////sim.bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
+                    ////bmp.CopyTo(sim.bmp);
+                    //Thread t1 = new Thread(SaveImage);
+                    //t1.Start(sim);
 
+                    System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
+                    encoder.Save(fs);
+                    fs.Close();
                 }
             }
-            else
-            {
-                //SaveImageModel sim = new SaveImageModel();
-                //sim.encoder = new PngBitmapEncoder();
-                //sim.encoder = new PngBitmapEncoder();
-                //BitmapFrame test= encoder.Frames[0];
-                //sim.encoder.Frames.Add(BitmapFrame.Create(test));
-                ////sim.encoder.Frames[0].CopyTo(encoder.Frames[0]);
-                ////sim.encoder.CopyTo(encoder);
-                ////encoder.CopyTo(sim.encoder);
-                //sim.FilePath = filePathName;
-                ////sim.bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
-                ////bmp.CopyTo(sim.bmp);
-                //Thread t1 = new Thread(SaveImage);
-                //t1.Start(sim);
-
-                System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
-                encoder.Save(fs);
-                fs.Close();
-            }
-            }
             catch (Exception ex)
             {
 

XHWK.WKTool/PrintWindow.xaml.cs

@@ -334,10 +334,10 @@ namespace XHWK.WKTool
                 }
                 #region 添加箭头
                 string Str = "↑";
-                SolidBrush mybrush= new SolidBrush(Color.Black);  //设置默认画刷颜色
-                Font myfont= new Font("黑体", 14);         //设置默认字体格式
-                g.DrawString(Str, myfont, mybrush,new Rectangle((int)wit - 50, 20,50,50));
-                
+                SolidBrush mybrush = new SolidBrush(Color.Black);  //设置默认画刷颜色
+                Font myfont = new Font("黑体", 14);         //设置默认字体格式
+                g.DrawString(Str, myfont, mybrush, new Rectangle((int)wit - 50, 20, 50, 50));
+
                 #endregion
                 backgroudImg.Save(_saveimg);
 

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -56,7 +56,7 @@ namespace XHWK.WKTool
         /// 状态
         /// </summary>
         private State _state = State.End;
-        
+
         private KeyboardHookCommon k_hook;
         /// <summary>
         /// 🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
@@ -142,11 +142,11 @@ namespace XHWK.WKTool
             {
                 t = new DispatcherTimer();
                 t.Tick += OnTimer;
-                t.Interval = new TimeSpan(0, 0, 0,0, 300);
+                t.Interval = new TimeSpan(0, 0, 0, 0, 300);
                 t.IsEnabled = true;
                 t.Start();
             }
-            t.Interval = new TimeSpan(0, 0, 0, 0,300);
+            t.Interval = new TimeSpan(0, 0, 0, 0, 300);
             //Stack();
             //ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
             //BtnRecordingScreen_Click(null, null);

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -4972,7 +4972,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void txbCurrpage_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            if(e.ClickCount==2)
+            if (e.ClickCount == 2)
             {
                 try
                 {
@@ -5008,7 +5008,7 @@ namespace XHWK.WKTool
                 MessageWindow.Show("操作有误！请输入有效的页码!");
                 return;
             }
-            if(JumpPage<1)
+            if (JumpPage < 1)
             {
                 JumpPage = 1;
             }