代码优化

XHWK.WKTool/App.xaml.cs

@@ -537,7 +537,7 @@ namespace XHWK.WKTool
                 if (FileToolsCommon.IsExistFile(saveName))
                 {
                     string wkDateXmlStr = FileToolsCommon.FileToString(saveName);
-                    WKDataList = XmlUtilHelper.DESerializer<List<ModelWkData>>(wkDateXmlStr);
+                    WKDataList = XmlUtilHelper.DeSerializer<List<ModelWkData>>(wkDateXmlStr);
                     foreach (ModelWkData wklist in WKDataList)
                     {
                         //移除找不到视频的微课数据
@@ -597,7 +597,7 @@ namespace XHWK.WKTool
                 if (FileToolsCommon.IsExistFile(savePath))
                 {
                     string pageDataXmlStr = FileToolsCommon.FileToString(savePath);
-                    PageDrawList = XmlUtilHelper.DESerializer<List<ModelDrawData>>(pageDataXmlStr);
+                    PageDrawList = XmlUtilHelper.DeSerializer<List<ModelDrawData>>(pageDataXmlStr);
                 }
                 else
                 {
@@ -654,7 +654,7 @@ namespace XHWK.WKTool
                 if (FileToolsCommon.IsExistFile(saveName))
                 {
                     string dateXmlStr = FileToolsCommon.FileToString(saveName);
-                    ServiceAddress = XmlUtilHelper.DESerializer<ModelServiceAddress>(dateXmlStr);
+                    ServiceAddress = XmlUtilHelper.DeSerializer<ModelServiceAddress>(dateXmlStr);
                     SwitchAddress();
                 }
             }

XHWK.WKTool/AppUpdateWin.xaml

@@ -18,7 +18,7 @@
     mc:Ignorable="d">
 
     <Grid>
-        <views:ZJClippingBorder
+        <views:ZClippingBorder
             Margin="0"
             Background="#fafafa"
             BorderBrush="#3f6fff"
@@ -131,7 +131,7 @@
                             LineHeight="30"
                             Text="正在更新，已下载0%" />
 
-                        <views:ZJClippingBorder
+                        <views:ZClippingBorder
                             Height="12"
                             Margin="20,20,20,20"
                             CornerRadius="6"
@@ -143,10 +143,10 @@
                                 Foreground="#3f6fff"
                                 Maximum="100"
                                 Minimum="0" />
-                        </views:ZJClippingBorder>
+                        </views:ZClippingBorder>
                     </StackPanel>
                 </Grid>
             </Grid>
-        </views:ZJClippingBorder>
+        </views:ZClippingBorder>
     </Grid>
 </Window>

XHWK.WKTool/Controls/MainImage.cs

@@ -696,7 +696,7 @@ namespace ComeCapture.Controls
         private void OnMove(object sender, MouseEventArgs e)
         {
             Point point = PointToScreen(e.GetPosition(this));
-            AppModel.Current.ShowRGB = ImageHelper.GetRGB((int)point.X, (int)point.Y);
+            AppModel.Current.ShowRGB = ImageHelper.GetRgb((int)point.X, (int)point.Y);
         }
 
         #endregion 刷新RGB

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -466,7 +466,7 @@ namespace ComeCapture
             System.Windows.Point screenP = PointToScreen(point);
             try
             {
-                AppModel.Current.ShowRGB = ImageHelper.GetRGB((int)screenP.X, (int)screenP.Y);
+                AppModel.Current.ShowRGB = ImageHelper.GetRgb((int)screenP.X, (int)screenP.Y);
             }
             catch (Exception ex)
             {

XHWK.WKTool/MainWindow.xaml.cs

@@ -283,8 +283,8 @@ namespace XHWK.WKTool
 
         private async Task CheckDevice()
         {
-            Task<bool> checkMicrophone = Task.Run(() => ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.microphone));
-            Task<bool> checkLoudspeaker = Task.Run(() => ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.loudspeaker));
+            Task<bool> checkMicrophone = Task.Run(() => ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.Microphone));
+            Task<bool> checkLoudspeaker = Task.Run(() => ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.Loudspeaker));
             await Task.WhenAll(checkMicrophone, checkLoudspeaker);
             _microphoneGood = checkMicrophone.Result;
             _loudspeakerGood = checkMicrophone.Result;
@@ -688,7 +688,7 @@ namespace XHWK.WKTool
             HideAngleBorder();
             GridPage.Visibility = Visibility.Visible; //页码大于0 显示
             App.PageContextData.currpage = App.PageContextData.pagenum;
-            myblackboard.changepage(App.PageContextData.currpage - 1);
+            myblackboard.Changepage(App.PageContextData.currpage - 1);
             ScroMain.ScrollToVerticalOffset(0);
             //清空页面图片UI
             ImgCanvas.Source = null;
@@ -1186,7 +1186,7 @@ namespace XHWK.WKTool
         private void imgCanvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             _mouseDown = true;
-            _imageOperationUtil.setMouseDown(_mouseDown);
+            _imageOperationUtil.SetMouseDown(_mouseDown);
         }
 
         /// <summary>
@@ -1425,7 +1425,7 @@ namespace XHWK.WKTool
                     {
                         App.PageContextData.pagenum += 1;
                         App.PageContextData.currpage = App.PageContextData.pagenum;
-                        myblackboard.changepage(App.PageContextData.currpage - 1);
+                        myblackboard.Changepage(App.PageContextData.currpage - 1);
                         GridPage.Visibility = Visibility.Visible; //页码大于0 显示
 
                         #region 插入页码
@@ -1447,7 +1447,7 @@ namespace XHWK.WKTool
                         ImgDocumentation.Source = null;
                         BitmapImage bitImg = new BitmapImage(new Uri(App.PageDrawList[App.PageContextData.currpage - 1].PageImagePath));
                         _mouseDown = false;
-                        _imageOperationUtil.setMouseDown(_mouseDown);
+                        _imageOperationUtil.SetMouseDown(_mouseDown);
                         App.PageDrawList[App.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
                         {
                             X = 0.1,
@@ -1507,7 +1507,7 @@ namespace XHWK.WKTool
                         () =>
                         {
                             App.myloading.Show();
-                            myblackboard.changepage(App.PageContextData.pagenum);
+                            myblackboard.Changepage(App.PageContextData.pagenum);
                         }
                     );
                     string filepath = _ofd.FileName;
@@ -1817,7 +1817,7 @@ namespace XHWK.WKTool
                                     {
                                         App.PageContextData.pagenum += 1;
                                         App.PageContextData.currpage = App.PageContextData.pagenum;
-                                        myblackboard.changepage(App.PageContextData.currpage - 1);
+                                        myblackboard.Changepage(App.PageContextData.currpage - 1);
                                         GridPage.Visibility = Visibility.Visible; //页码大于0 显示
 
                                         #region 插入页码
@@ -1828,7 +1828,7 @@ namespace XHWK.WKTool
                                     {
                                         App.PageContextData.pagenum += 1;
                                         App.PageContextData.currpage = App.PageContextData.pagenum;
-                                        myblackboard.changepage(App.PageContextData.currpage - 1);
+                                        myblackboard.Changepage(App.PageContextData.currpage - 1);
                                     }
                                     if (App.PageDrawList.Count >= App.PageContextData.currpage)
                                     {
@@ -1845,7 +1845,7 @@ namespace XHWK.WKTool
                                         ImgDocumentation.Source = null;
                                         BitmapImage bitImg = new BitmapImage(new Uri(App.PageDrawList[App.PageContextData.currpage - 1].PageImagePath));
                                         _mouseDown = false;
-                                        _imageOperationUtil.setMouseDown(_mouseDown);
+                                        _imageOperationUtil.SetMouseDown(_mouseDown);
                                         App.PageDrawList[App.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
                                         {
                                             X = 0.1,
@@ -2694,7 +2694,7 @@ namespace XHWK.WKTool
 
             App.PageContextData.currpage = 0;
             App.PageContextData.pagenum = 0;
-            myblackboard.clear();
+            myblackboard.Clear();
             App.PageDrawList.Clear();
             ImgCanvas.Source = null;
             ImgDocumentation.Source = null;
@@ -2816,12 +2816,7 @@ namespace XHWK.WKTool
                     (
                         () =>
                         {
-                            Bitmap bm = ImageHelper.SaveUI2Bitmap
-                            (
-                                GridMain,
-                                _gridActWidth,
-                                _gridActHeight
-                            );
+                            Bitmap bm = ImageHelper.SaveUi2Bitmap(GridMain, _gridActWidth, _gridActHeight);
                             _videoWriter.WriteVideoFrame(bm);
                             bm.Dispose();
                         }
@@ -2838,7 +2833,6 @@ namespace XHWK.WKTool
             }
         }
 
-        //new WaveInEvent();
         /// <summary>
         /// 开始录制和暂停录制
         /// </summary>
@@ -2853,13 +2847,13 @@ namespace XHWK.WKTool
                     _videoInfo = new ModelVideo { VideoType = (EnumVideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType")), WkType = EnumWkVidetype.RecordingLessons };
                     FileToolsCommon.DeleteDirectory(App.WKData.WkPath + "temp/");
                     FileToolsCommon.CreateDirectory(App.WKData.WkPath);
-                    _videoSavePathName = App.WKData.WkPath + App.WKData.WkName + "_录制." + _videoInfo.VideoType.ToString();
-                    _tempVideoPathName = App.WKData.WkPath + App.WKData.WkName + "_录制Syn.avi";
+                    _videoSavePathName = App.WKData.WkPath + App.WKData.WkName + "." + _videoInfo.VideoType;
+                    _tempVideoPathName = App.WKData.WkPath + App.WKData.WkName + "_temp.avi";
                     int num = 1;
                     while (FileToolsCommon.IsExistFile(_videoSavePathName))
                     {
-                        _videoSavePathName = App.WKData.WkPath + App.WKData.WkName + "_录制_" + num + "." + _videoInfo.VideoType.ToString();
-                        _tempVideoPathName = App.WKData.WkPath + App.WKData.WkName + "_录制Syn_" + num + ".avi";
+                        _videoSavePathName = App.WKData.WkPath + App.WKData.WkName + "_" + num + "." + _videoInfo.VideoType;
+                        _tempVideoPathName = App.WKData.WkPath + App.WKData.WkName + "_temp_" + num + ".avi";
                         num++;
                     }
                     _tempAudioPathName = _tempVideoPathName.Replace(".avi", ".mp3");
@@ -2867,6 +2861,7 @@ namespace XHWK.WKTool
                     _gridActHeight = (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f) / 2) * 2;
                     lock (this)
                     {
+                        Console.WriteLine(@"临时视频存储路径：" + _tempVideoPathName);
                         _videoWriter.Open
                         (
                             _tempVideoPathName,
@@ -2972,7 +2967,7 @@ namespace XHWK.WKTool
         /// </summary>
         private void JumpPageClick()
         {
-            myblackboard.changepage(App.PageContextData.currpage - 1);
+            myblackboard.Changepage(App.PageContextData.currpage - 1);
             ScroMain.ScrollToVerticalOffset(0);
             if (BtnImport.IsEnabled)
             {
@@ -3013,7 +3008,7 @@ namespace XHWK.WKTool
                         if (App.PageDrawList[App.PageContextData.currpage - 1].ImageLocation != null && App.PageDrawList[App.PageContextData.currpage - 1].ImageLocation.X > 0)
                         {
                             _mouseDown = false;
-                            _imageOperationUtil.setMouseDown(_mouseDown);
+                            _imageOperationUtil.SetMouseDown(_mouseDown);
                             ImgXy();
                         }
                     }
@@ -3033,7 +3028,7 @@ namespace XHWK.WKTool
             if (App.PageContextData.currpage > 1)
             {
                 _mouseDown = false;
-                _imageOperationUtil.setMouseDown(_mouseDown);
+                _imageOperationUtil.SetMouseDown(_mouseDown);
                 HideAngleBorder();
                 App.PageContextData.currpage -= 1;
                 JumpPageClick();
@@ -3052,7 +3047,7 @@ namespace XHWK.WKTool
             if (App.PageContextData.currpage < App.PageContextData.pagenum)
             {
                 _mouseDown = false;
-                _imageOperationUtil.setMouseDown(_mouseDown);
+                _imageOperationUtil.SetMouseDown(_mouseDown);
                 HideAngleBorder();
                 App.PageContextData.currpage += 1;
                 JumpPageClick();
@@ -3178,8 +3173,7 @@ namespace XHWK.WKTool
                 (
                     () =>
                     {
-                        myblackboard.changepages
-                        (
+                        myblackboard.Changepages(
                             0,
                             0,
                             true,
@@ -3227,8 +3221,7 @@ namespace XHWK.WKTool
                     {
                         //0~1023,亦即有 1024 阶供应用软件后续应用之用，如笔锋笔触，暂无用
                         float pressure = 1.0f * force / 1023f;
-                        myblackboard.changepages
-                        (
+                        myblackboard.Changepages(
                             tempX,
                             tempY,
                             false,
@@ -3302,8 +3295,7 @@ namespace XHWK.WKTool
                 (
                     () =>
                     {
-                        myblackboard.changepages
-                        (
+                        myblackboard.Changepages(
                             0,
                             0,
                             true,
@@ -3988,8 +3980,7 @@ namespace XHWK.WKTool
                     (
                         () =>
                         {
-                            myblackboard.changepages
-                            (
+                            myblackboard.Changepages(
                                 0,
                                 0,
                                 true,
@@ -4017,8 +4008,7 @@ namespace XHWK.WKTool
                         float pressure = bPress / 100f;
                         if (bPress > 0)
                         {
-                            myblackboard.changepages
-                            (
+                            myblackboard.Changepages(
                                 tempX,
                                 tempY,
                                 false,

XHWK.WKTool/ProductVerification.xaml.cs

@@ -49,7 +49,7 @@ namespace XHWK.WKTool
             try
             {
                 App.Signature = System.IO.File.ReadAllText(App.DataPath + "signature.txt", Encoding.Default);
-                string decrypt = DataProvider.TripleDESDecrypt(App.Signature, App.secretKey);
+                string decrypt = DataProvider.TripleDesDecrypt(App.Signature, App.secretKey);
                 decrypt = decrypt.Replace("\u0001", "").Replace("\u0007", "").Trim();
                 ModelSignatures msgBean = JsonHelper.JsonToObj<ModelSignatures>(decrypt);
                 long currentTimeTimestamp = DataProvider.TimestampTotalSeconds(); //当前时间 时间戳

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -325,9 +325,9 @@ namespace XHWK.WKTool
                     );
 
                     // 麦克风
-                    _helper1 = new ZAudioRecordHelper(_tempAudioPathName1, ZAudioRecordHelper.RecordType.microphone);
+                    _helper1 = new ZAudioRecordHelper(_tempAudioPathName1, ZAudioRecordHelper.RecordType.Microphone);
                     // 扬声器
-                    _helper2 = new ZAudioRecordHelper(_tempAudioPathName2, ZAudioRecordHelper.RecordType.loudspeaker);
+                    _helper2 = new ZAudioRecordHelper(_tempAudioPathName2, ZAudioRecordHelper.RecordType.Loudspeaker);
                     await Task.Delay(3000);
                     // App.W_CountdownWindow.Hide();
                     await Task.Delay(100);

XHWK.WKTool/system/BlackboardNew.cs → XHWK.WKTool/Utils/BlackboardNew.cs

@@ -14,103 +14,113 @@ namespace Common.system
         Pen = 1,
         Erase = 2
     };
+
     /// <summary>
     /// 画板线模型
     /// </summary>
-    internal class ZBBPage
+    internal class ZbbPage
     {
         /// <summary>
         /// 线
         /// </summary>
-        public List<ZBBPageStep> lines { get; set; }
+        public List<ZbbPageStep> lines { get; set; }
+
         /// <summary>
         /// 历史记录
         /// </summary>
-        public List<ZBBPageStep> lines_histoty { get; set; }
+        public List<ZbbPageStep> lines_histoty { get; set; }
+
         /// <summary>
         /// 画板模型
         /// </summary>
-        public ZBBPage()
+        public ZbbPage()
         {
-            lines = new List<ZBBPageStep>();
-            lines_histoty = new List<ZBBPageStep>();
+            lines = new List<ZbbPageStep>();
+            lines_histoty = new List<ZbbPageStep>();
         }
     }
 
-    internal class ZBBPageStep
+    internal class ZbbPageStep
     {
         public StrokeCollection lines_curr { get; set; }
         public StrokeCollection lines_add { get; set; }
         public StrokeCollection lines_remove { get; set; }
 
-        public ZBBPageStep()
+        public ZbbPageStep()
         {
             lines_curr = new StrokeCollection();
             lines_add = new StrokeCollection();
             lines_remove = new StrokeCollection();
         }
     }
+
     public class BlackboardNew
     {
-        private InkCanvas m_canvas;
+        private InkCanvas _mCanvas;
 
         //private ZPenType type = ZPenType.Pen;
         /// <summary>
         /// 当前页索引
         /// </summary>
-        private int pagenum = 0;
+        private int _pagenum;
+
         /// <summary>
         /// 橡皮大小
         /// </summary>
-        private readonly int erasesize = 64;
+        private readonly int _erasesize = 64;
+
         /// <summary>
         /// 笔粗细
         /// </summary>
-        private readonly int pensize = 3;
+        private readonly int _pensize = 3;
+
         /// <summary>
         /// 是否在进行撤销恢复操作
         /// </summary>
-        private int undoOrRedo = 0;
+        private int _undoOrRedo;
+
         /// <summary>
         /// 笔颜色
         /// </summary>
-        private Color pencolor;
+        private Color _pencolor;
+
         /// <summary>
         /// 所有画板线
         /// </summary>
-        private readonly List<ZBBPage> strokes_page_all = new List<ZBBPage>();
+        private readonly List<ZbbPage> _strokesPageAll = new List<ZbbPage>();
 
         // 添加这个变量是因为在用橡皮擦时 一次操作会触发多次StrokesChanged回掉 这里是把多次回掉合并在一起
-        private ZBBPageStep step = null;
+        private ZbbPageStep _step;
 
         public BlackboardNew(InkCanvas canvas)
         {
-            init(canvas, Colors.White);
+            Init(canvas, Colors.White);
         }
 
-        public BlackboardNew(InkCanvas canvas, Color _pencolor)
+        public BlackboardNew(InkCanvas canvas, Color pencolor)
         {
-            init(canvas, _pencolor);
+            Init(canvas, pencolor);
         }
 
-        private DrawingAttributes drawingAttributes;
-        private void init(InkCanvas canvas, Color _pencolor)
+        private DrawingAttributes _drawingAttributes;
+
+        private void Init(InkCanvas canvas, Color mpencolor)
         {
-            m_canvas = canvas;
-            pencolor = _pencolor;
-            ZBBPage page = new ZBBPage();
-            page.lines.Add(new ZBBPageStep());
-            strokes_page_all.Add(page);
+            _mCanvas = canvas;
+            this._pencolor = mpencolor;
+            ZbbPage page = new ZbbPage();
+            page.lines.Add(new ZbbPageStep());
+            _strokesPageAll.Add(page);
             if (canvas != null)
             {
                 canvas.EditingMode = InkCanvasEditingMode.Ink;
-                drawingAttributes = new DrawingAttributes();
-                canvas.DefaultDrawingAttributes = drawingAttributes;
-                drawingAttributes.Width = pensize;
-                drawingAttributes.Height = pensize;
-                drawingAttributes.Color = pencolor;
-                drawingAttributes.FitToCurve = true;
-                drawingAttributes.IgnorePressure = false;
+                _drawingAttributes = new DrawingAttributes();
+                canvas.DefaultDrawingAttributes = _drawingAttributes;
+                _drawingAttributes.Width = _pensize;
+                _drawingAttributes.Height = _pensize;
+                _drawingAttributes.Color = this._pencolor;
+                _drawingAttributes.FitToCurve = true;
+                _drawingAttributes.IgnorePressure = false;
                 canvas.Strokes.StrokesChanged += Strokes_StrokesChanged;
                 canvas.StrokeCollected += Canvas_StrokeCollected;
                 canvas.StrokeErasing += Canvas_StrokeErasing;
@@ -121,47 +131,42 @@ namespace Common.system
 
         private void Canvas_StrokeErasing(object sender, InkCanvasStrokeErasingEventArgs e)
         {
-            undoOrRedo = 0;
+            _undoOrRedo = 0;
         }
 
-        private void Canvas_StrokeErased(object sender, RoutedEventArgs e)
-        {
-        }
+        private void Canvas_StrokeErased(object sender, RoutedEventArgs e) { }
 
-        private void Canvas_StrokeCollected(object sender, InkCanvasStrokeCollectedEventArgs e)
-        {
-        }
+        private void Canvas_StrokeCollected(object sender, InkCanvasStrokeCollectedEventArgs e) { }
 
         private void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            if (step != null)
+            if (_step != null)
             {
-                if (pagenum + 1 > strokes_page_all.Count)
+                if (_pagenum + 1 > _strokesPageAll.Count)
                 {
-                    ZBBPage pagetemp = new ZBBPage();
-                    pagetemp.lines.Add(new ZBBPageStep());
-                    strokes_page_all.Add(pagetemp);
+                    ZbbPage pagetemp = new ZbbPage();
+                    pagetemp.lines.Add(new ZbbPageStep());
+                    _strokesPageAll.Add(pagetemp);
                 }
-
                 try
                 {
-                    ZBBPage page = strokes_page_all[pagenum];
+                    ZbbPage page = _strokesPageAll[_pagenum];
                     if (page != null)
                     {
-                        step.lines_curr.Add(m_canvas.Strokes);
-                        page.lines.Add(step);
-                        step = null;
+                        _step.lines_curr.Add(_mCanvas.Strokes);
+                        page.lines.Add(_step);
+                        _step = null;
                     }
                 }
                 catch (Exception ex)
                 {
-                    if (strokes_page_all != null)
+                    if (_strokesPageAll != null)
                     {
-                        if (strokes_page_all.Count == 0)
+                        if (_strokesPageAll.Count == 0)
                         {
-                            ZBBPage pagetemp = new ZBBPage();
-                            pagetemp.lines.Add(new ZBBPageStep());
-                            strokes_page_all.Add(pagetemp);
+                            ZbbPage pagetemp = new ZbbPage();
+                            pagetemp.lines.Add(new ZbbPageStep());
+                            _strokesPageAll.Add(pagetemp);
                         }
                     }
                     LogHelper.Logerror.Error("【画板】（Canvas_MouseUp）添加失败，strokes_page_all为0，" + ex.Message, ex);
@@ -171,122 +176,116 @@ namespace Common.system
 
         private void Strokes_StrokesChanged(object sender, StrokeCollectionChangedEventArgs e)
         {
-            if (undoOrRedo > 0)
+            if (_undoOrRedo > 0)
             {
-                undoOrRedo -= 1;
+                _undoOrRedo -= 1;
                 return;
             }
-
-            if (step == null)
+            if (_step == null)
             {
-                step = new ZBBPageStep();
+                _step = new ZbbPageStep();
             }
 
             // 笔模式
             if (e.Added.Count > 0 && e.Removed.Count == 0)
             {
-                step.lines_add.Add(e.Added);
+                _step.lines_add.Add(e.Added);
             }
             // 橡皮模式 会多次进入回掉
             else if (e.Removed.Count > 0)
             {
-                step.lines_add.Add(e.Added);
+                _step.lines_add.Add(e.Added);
                 for (int i = 0; i < e.Removed.Count; i++)
                 {
                     Stroke removeItem = e.Removed[i];
-                    if (step.lines_add.Contains(removeItem))
+                    if (_step.lines_add.Contains(removeItem))
                     {
-                        step.lines_add.Remove(removeItem);
+                        _step.lines_add.Remove(removeItem);
                     }
                     else
                     {
-                        step.lines_remove.Add(removeItem);
+                        _step.lines_remove.Add(removeItem);
                     }
                 }
             }
         }
 
         // public方法 笔
-        public void change_pen(Color _color)
+        public void change_pen(Color color)
         {
             //this.type = ZPenType.Pen;
             DrawingAttributes drawingAttributes = new DrawingAttributes();
-            m_canvas.DefaultDrawingAttributes = drawingAttributes;
-            drawingAttributes.Color = _color;
-            drawingAttributes.Width = pensize;
-            drawingAttributes.Height = pensize;
+            _mCanvas.DefaultDrawingAttributes = drawingAttributes;
+            drawingAttributes.Color = color;
+            drawingAttributes.Width = _pensize;
+            drawingAttributes.Height = _pensize;
             drawingAttributes.FitToCurve = true;
             drawingAttributes.IgnorePressure = false;
-            m_canvas.EditingMode = InkCanvasEditingMode.Ink;
+            _mCanvas.EditingMode = InkCanvasEditingMode.Ink;
         }
 
         // 橡皮
         public void change_erase()
         {
             //this.type = ZPenType.Erase;
-            m_canvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
-            m_canvas.EraserShape = new EllipseStylusShape(erasesize, erasesize, 0);
+            _mCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
+            _mCanvas.EraserShape = new EllipseStylusShape(_erasesize, _erasesize, 0);
         }
 
         // 撤销
-        public void undo()
+        public void Undo()
         {
-            ZBBPage page = strokes_page_all[pagenum];
-
-            if (page != null && m_canvas.Strokes.Count > 0 && page.lines.Count > 1)
+            ZbbPage page = _strokesPageAll[_pagenum];
+            if (page != null && _mCanvas.Strokes.Count > 0 && page.lines.Count > 1)
             {
-                ZBBPageStep last = page.lines.Last();
+                ZbbPageStep last = page.lines.Last();
                 page.lines.Remove(last);
                 page.lines_histoty.Add(last);
                 if (page.lines.Last().lines_curr.Count > 0)
                 {
-                    undoOrRedo = 2;
+                    _undoOrRedo = 2;
                 }
                 else
                 {
-                    undoOrRedo = 1;
+                    _undoOrRedo = 1;
                 }
-
-                m_canvas.Strokes.Clear();
-                m_canvas.Strokes.Add(page.lines.Last().lines_curr);
+                _mCanvas.Strokes.Clear();
+                _mCanvas.Strokes.Add(page.lines.Last().lines_curr);
             }
         }
 
         // 恢复
-        public void redo()
+        public void Redo()
         {
-            ZBBPage page = strokes_page_all[pagenum];
+            ZbbPage page = _strokesPageAll[_pagenum];
             if (page != null && page.lines_histoty.Count > 0)
             {
-                ZBBPageStep line = page.lines_histoty[page.lines_histoty.Count - 1];
-
+                ZbbPageStep line = page.lines_histoty[page.lines_histoty.Count - 1];
                 page.lines.Add(line);
                 page.lines_histoty.Remove(line);
                 if (page.lines.Last().lines_curr.Count > 0)
                 {
-                    undoOrRedo = 2;
+                    _undoOrRedo = 2;
                 }
                 else
                 {
-                    undoOrRedo = 1;
+                    _undoOrRedo = 1;
                 }
-                m_canvas.Strokes.Clear();
-                m_canvas.Strokes.Add(page.lines.Last().lines_curr);
+                _mCanvas.Strokes.Clear();
+                _mCanvas.Strokes.Add(page.lines.Last().lines_curr);
             }
         }
 
         // 清空
-        public void clear()
+        public void Clear()
         {
-
             //ZBBPage page = new ZBBPage();
             //page.lines.Add(new ZBBPageStep());
             //page.lines = new List<ZBBPageStep>();
             //page.lines_histoty = new List<ZBBPageStep>();
             //strokes_page_all.Add(page);
-
-            strokes_page_all.Clear();
-            m_canvas.Strokes.Clear();
+            _strokesPageAll.Clear();
+            _mCanvas.Strokes.Clear();
             //for (int i=0;i< strokes_page_all.Count;i++)
             //{
             //    ZBBPage page = strokes_page_all[pagenum];
@@ -298,171 +297,159 @@ namespace Common.system
             //        page.lines.Add(new ZBBPageStep());
             //    }
             //}
-
-
         }
+
         /// <summary>
         /// 翻页
         /// </summary>
         /// <param name="mpagenum"></param>
-        public void changepage(int mpagenum)
+        public void Changepage(int mpagenum)
         {
-            if (pagenum != mpagenum)
+            if (_pagenum != mpagenum)
             {
-                pagenum = mpagenum;
+                _pagenum = mpagenum;
                 //新增页
-                if (pagenum >= strokes_page_all.Count)
+                if (_pagenum >= _strokesPageAll.Count)
                 {
-                    int numadd = pagenum - strokes_page_all.Count + 1;
+                    int numadd = _pagenum - _strokesPageAll.Count + 1;
                     for (int i = 0; i < numadd; i++)
                     {
-                        ZBBPage pagetemp = new ZBBPage();
-                        pagetemp.lines.Add(new ZBBPageStep());
-                        strokes_page_all.Add(pagetemp);
+                        ZbbPage pagetemp = new ZbbPage();
+                        pagetemp.lines.Add(new ZbbPageStep());
+                        _strokesPageAll.Add(pagetemp);
                     }
                 }
-
-                ZBBPage page = strokes_page_all[pagenum];
+                ZbbPage page = _strokesPageAll[_pagenum];
                 if (page != null && page.lines.Count > 0)
                 {
                     if (page.lines.Last().lines_curr.Count > 0)
                     {
-                        undoOrRedo += 1;
+                        _undoOrRedo += 1;
                     }
-                    if (m_canvas.Strokes.Count > 0)
+                    if (_mCanvas.Strokes.Count > 0)
                     {
-                        undoOrRedo += 1;
-                        m_canvas.Strokes.Clear();
+                        _undoOrRedo += 1;
+                        _mCanvas.Strokes.Clear();
                     }
                     //StrokeCollection strokes = new StrokeCollection();
-                    StylusPointCollection stylusPoints = new StylusPointCollection();
+                    StylusPointCollection mstylusPoints = new StylusPointCollection();
                     //System.Windows.Input.StylusPointDescription stylusPointDescription = new StylusPointDescription();
-                    StylusPoint stylusPoint = new StylusPoint
-                    {
-                        X = 580,
-                        Y = 212
-                    };
-                    stylusPoints.Add(stylusPoint);
-                    Stroke stroke = new Stroke(stylusPoints);
-
-                    stylusPoint.X = 581;
-                    stylusPoint.Y = 213;
-                    stylusPoints.Add(stylusPoint);
-                    stroke = new Stroke(stylusPoints);
+                    StylusPoint mstylusPoint = new StylusPoint { X = 580, Y = 212 };
+                    mstylusPoints.Add(mstylusPoint);
+                    Stroke stroke;
+                    mstylusPoint.X = 581;
+                    mstylusPoint.Y = 213;
+                    mstylusPoints.Add(mstylusPoint);
+                    stroke = new Stroke(mstylusPoints);
                     page.lines.Last().lines_curr.Add(stroke);
-                    m_canvas.Strokes.Add(page.lines.Last().lines_curr);
+                    _mCanvas.Strokes.Add(page.lines.Last().lines_curr);
                 }
             }
         }
 
-        private StylusPointCollection stylusPoints = new StylusPointCollection();
-        private StylusPoint stylusPoint = new StylusPoint();
-        private Stroke stroke;
-        private bool isFirst = true;
-        public void changepages(double _x, double _y, bool _new, Color _color, int _size, int i, float Pressure)
+        private StylusPointCollection _stylusPoints = new StylusPointCollection();
+        private StylusPoint _stylusPoint;
+        private Stroke _stroke;
+        private bool _isFirst = true;
+
+        public void Changepages
+        (
+            double x,
+            double y,
+            bool mnew,
+            Color color,
+            int size,
+            int i,
+            float pressure
+        )
         {
-            if (_new)
+            if (mnew)
             {
-                if (stroke != null && stroke.StylusPoints.Count > 1)
+                if (_stroke != null && _stroke.StylusPoints.Count > 1)
                 {
-                    isFirst = true;
+                    _isFirst = true;
                     try
                     {
-                        if (strokes_page_all.Count <= i)
+                        if (_strokesPageAll.Count <= i)
                         {
-                            ZBBPage pagetemp = new ZBBPage();
-                            pagetemp.lines.Add(new ZBBPageStep());
-                            strokes_page_all.Add(pagetemp);
+                            ZbbPage pagetemp = new ZbbPage();
+                            pagetemp.lines.Add(new ZbbPageStep());
+                            _strokesPageAll.Add(pagetemp);
                         }
-                        strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
+                        _strokesPageAll[i].lines.Last().lines_curr.Add(_stroke);
                     }
                     catch (Exception ex)
                     {
-                        if (strokes_page_all != null)
+                        if (_strokesPageAll != null)
                         {
-                            if (strokes_page_all.Count == 0)
+                            if (_strokesPageAll.Count == 0)
                             {
-                                ZBBPage pagetemp = new ZBBPage();
-                                pagetemp.lines.Add(new ZBBPageStep());
-                                strokes_page_all.Add(pagetemp);
+                                ZbbPage pagetemp = new ZbbPage();
+                                pagetemp.lines.Add(new ZbbPageStep());
+                                _strokesPageAll.Add(pagetemp);
                             }
                         }
                         LogHelper.Logerror.Error("【画板】（changepages）添加失败，strokes_page_all为0，" + ex.Message, ex);
                     }
                 }
-                stylusPoints = new StylusPointCollection();
-                stylusPoint = new StylusPoint();
-                stroke = null;
+                _stylusPoints = new StylusPointCollection();
+                _stylusPoint = new StylusPoint();
+                _stroke = null;
             }
             else
             {
-                if (isFirst)
+                if (_isFirst)
                 {
-                    stylusPoint.X = _x;
-                    stylusPoint.Y = _y;
+                    _stylusPoint.X = x;
+                    _stylusPoint.Y = y;
                     //_color.A = (byte)(Pressure * 255f);
                     //stylusPoint.PressureFactor = Pressure;
-                    stylusPoints.Add(stylusPoint);
-                    if (stylusPoints.Count > 1)
+                    _stylusPoints.Add(_stylusPoint);
+                    if (_stylusPoints.Count > 1)
                     {
-                        stroke = new Stroke(stylusPoints);
-                        drawingAttributes = new DrawingAttributes
+                        _stroke = new Stroke(_stylusPoints);
+                        _drawingAttributes = new DrawingAttributes
                         {
-                            Color = _color,
-                            Width = _size * 4.5,
-                            Height = _size * 4.5,
+                            Color = color,
+                            Width = size * 4.5,
+                            Height = size * 4.5,
                             FitToCurve = true,
                             //IsHighlighter =true,
                             IgnorePressure = true
                         };
-                        stroke.DrawingAttributes = drawingAttributes;
-                        m_canvas.Strokes.Add(stroke);
-                        isFirst = false;
+                        _stroke.DrawingAttributes = _drawingAttributes;
+                        _mCanvas.Strokes.Add(_stroke);
+                        _isFirst = false;
                     }
                 }
                 else
                 {
-                    if (m_canvas.Strokes.Count > 0)
+                    if (_mCanvas.Strokes.Count > 0)
                     {
-                        stylusPoint.X = _x;
-                        stylusPoint.Y = _y;
-                        stylusPoints.Add(stylusPoint);
-                        stroke = new Stroke(stylusPoints);
-                        drawingAttributes = new DrawingAttributes
+                        _stylusPoint.X = x;
+                        _stylusPoint.Y = y;
+                        _stylusPoints.Add(_stylusPoint);
+                        _stroke = new Stroke(_stylusPoints);
+                        _drawingAttributes = new DrawingAttributes
                         {
-                            Color = _color,
-                            Width = _size * 4.5,
-                            Height = _size * 4.5,
+                            Color = color,
+                            Width = size * 4.5,
+                            Height = size * 4.5,
                             FitToCurve = true,
                             IgnorePressure = false
                         };
-                        stroke.DrawingAttributes = drawingAttributes;
-                        m_canvas.Strokes[m_canvas.Strokes.Count - 1] = stroke;
+                        _stroke.DrawingAttributes = _drawingAttributes;
+                        _mCanvas.Strokes[_mCanvas.Strokes.Count - 1] = _stroke;
                     }
                 }
             }
         }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        //public void changepages(double _x, double _y, bool _new, Color _color, int _size, int i)
+        //public void changepages(double _x, double _y, bool mnew, Color _color, int _size, int i)
         //{
         //    try
         //    {
-        //        if (_new)
+        //        if (mnew)
         //        {
         //            if (stroke != null && stroke.StylusPoints.Count > 1)
         //            {
@@ -508,4 +495,4 @@ namespace Common.system
         //    }
         //}
     }
-}
+}

XHWK.WKTool/system/DataProvider.cs → XHWK.WKTool/Utils/DataProvider.cs

@@ -8,41 +8,53 @@ namespace Common.system
     public class DataProvider
     {
         ///3DES解密   
-        public static string TripleDESDecrypt(string pToDecrypt, string sKey)
+        public static string TripleDesDecrypt(string pToDecrypt, string sKey)
         {
             sKey = sKey.Substring(0, 24);
-            TripleDESCryptoServiceProvider des = new TripleDESCryptoServiceProvider
-            {
-                Mode = CipherMode.ECB,
-                Padding = PaddingMode.Zeros
-            };
+            TripleDESCryptoServiceProvider des = new TripleDESCryptoServiceProvider { Mode = CipherMode.ECB, Padding = PaddingMode.Zeros };
             byte[] inputByteArray = new byte[pToDecrypt.Length / 2];
             for (int x = 0; x < pToDecrypt.Length / 2; x++)
             {
                 int i = (Convert.ToInt32(pToDecrypt.Substring(x * 2, 2), 16));
                 inputByteArray[x] = (byte)i;
             }
-
-            des.Key = ASCIIEncoding.ASCII.GetBytes(sKey);
-            des.IV = new byte[] { 0, 00, 00, 00, 00, 00, 00, 00, };
+            des.Key = Encoding.ASCII.GetBytes(sKey);
+            des.IV = new byte[]
+            {
+                0,
+                00,
+                00,
+                00,
+                00,
+                00,
+                00,
+                00,
+            };
             MemoryStream ms = new MemoryStream();
             CryptoStream cs = new CryptoStream(ms, des.CreateDecryptor(), CryptoStreamMode.Write);
             cs.Write(inputByteArray, 0, inputByteArray.Length);
             cs.FlushFinalBlock();
-
-            StringBuilder ret = new StringBuilder();
-
             return System.Text.Encoding.Default.GetString(ms.ToArray()).Replace("\0", "");
         }
+
         /// <summary>
         /// 返回一个时间戳到秒
         /// </summary>
         /// <returns></returns>
         public static long TimestampTotalSeconds()
         {
-            TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            TimeSpan ts = DateTime.UtcNow -
+            new DateTime(
+                1970,
+                1,
+                1,
+                0,
+                0,
+                0,
+                0
+            );
             long timestr = Convert.ToInt64(ts.TotalSeconds);
             return timestr;
         }
     }
-}
+}

XHWK.WKTool/system/DownloadManager.cs → XHWK.WKTool/Utils/DownloadManager.cs

@@ -15,11 +15,12 @@ namespace Common.system
     /// </summary>
     public class DownloadManager
     {
-        private long fromIndex = 0;//开始下载的位置
-        private bool isRun = false;//是否正在进行
-        private DownloadInfoModel dlInfo;
+        private long _fromIndex; //开始下载的位置
+        private bool _isRun; //是否正在进行
+        private DownloadInfoModel _dlInfo;
+
+        private List<DownloadService> _dls = new List<DownloadService>();
 
-        private List<DownloadService> dls = new List<DownloadService>();
         /// <summary>
         /// 开始下载
         /// </summary>
@@ -43,15 +44,15 @@ namespace Common.system
 
         public DownloadManager(DownloadInfoModel dlInfo)
         {
-            this.dlInfo = dlInfo;
+            this._dlInfo = dlInfo;
         }
         /// <summary>
         /// 暂停
         /// </summary>
         public void Stop()
         {
-            isRun = false;
-            dls.ForEach(dl => dl.Stop());
+            _isRun = false;
+            _dls.ForEach(dl => dl.Stop());
             OnStopHandler();
         }
         /// <summary>
@@ -59,7 +60,7 @@ namespace Common.system
         /// </summary>
         public void Start()
         {
-            dlInfo.isReStart = false;
+            _dlInfo.isReStart = false;
             WorkStart();
         }
         /// <summary>
@@ -67,7 +68,7 @@ namespace Common.system
         /// </summary>
         public void ReStart()
         {
-            dlInfo.isReStart = true;
+            _dlInfo.isReStart = true;
             WorkStart();
         }
         /// <summary>
@@ -77,14 +78,13 @@ namespace Common.system
         {
             new Action(() =>
             {
-                if (dlInfo.isReStart)
+                if (_dlInfo.isReStart)
                 {
                     Stop();
                 }
-
-                while (dls.Where(dl => !dl.isStopped).Count() > 0)
+                while (_dls.Where(dl => !dl.isStopped).Count() > 0)
                 {
-                    if (dlInfo.isReStart)
+                    if (_dlInfo.isReStart)
                     {
                         Thread.Sleep(100);
                     }
@@ -93,90 +93,85 @@ namespace Common.system
                         return;
                     }
                 }
-
-                isRun = true;
+                _isRun = true;
                 OnStartHandler();
                 //首次任务或者不支持断点续传的进入
-                if (dlInfo.isNewTask || (!dlInfo.isNewTask && !dlInfo.IsSupportMultiThreading))
+                if (_dlInfo.isNewTask || (!_dlInfo.isNewTask && !_dlInfo.IsSupportMultiThreading))
                 {
                     try
                     {
                         //第一次请求获取一小块数据，根据返回的情况判断是否支持断点续传
-                        using (System.Net.WebResponse rsp = ZHttpUtil.Download
-                               (
-                                   dlInfo.downloadUrlList[0],
+                        using (System.Net.WebResponse rsp = ZHttpUtil.Download(
+                                   _dlInfo.downloadUrlList[0],
                                    0,
                                    0,
-                                   dlInfo.method
+                                   _dlInfo.method
                                ))
                         {
                             //获取文件名，如果包含附件名称则取下附件，否则从url获取名称
-                            string Disposition = rsp.Headers["Content-Disposition"];
+                            string disposition = rsp.Headers["Content-Disposition"];
                             try
                             {
-                                if (Disposition != null)
+                                if (disposition != null)
                                 {
-                                    dlInfo.fileName = Disposition.Split('=')[1];
+                                    _dlInfo.fileName = disposition.Split('=')[1];
                                 }
                                 else
                                 {
-                                    dlInfo.fileName = Path.GetFileName(rsp.ResponseUri.AbsolutePath);
+                                    _dlInfo.fileName = Path.GetFileName(rsp.ResponseUri.AbsolutePath);
                                 }
                             }
                             catch (Exception) //无法获取文件名时  使用传入保存名称
                             {
-                                dlInfo.fileName = dlInfo.saveFileName;
+                                _dlInfo.fileName = _dlInfo.saveFileName;
                             }
 
                             //默认给流总数
-                            dlInfo.count = rsp.ContentLength;
+                            _dlInfo.count = rsp.ContentLength;
                             //尝试获取 Content-Range 头部，不为空说明支持断点续传
                             string contentRange = rsp.Headers["Content-Range"];
                             if (contentRange != null)
                             {
                                 //支持断点续传的话，就取range 这里的总数
-                                dlInfo.count = long.Parse(rsp.Headers["Content-Range"].Split('/')[1]);
-                                dlInfo.IsSupportMultiThreading = true;
+                                _dlInfo.count = long.Parse(rsp.Headers["Content-Range"].Split('/')[1]);
+                                _dlInfo.IsSupportMultiThreading = true;
 
                                 //生成一个临时文件名
                                 //var tempFileName = Convert.ToBase64String(Encoding.UTF8.GetBytes(dlInfo.fileName)).ToUpper();
                                 //tempFileName = tempFileName.Length > 32 ? tempFileName.Substring(0, 32) : tempFileName;
                                 //dlInfo.tempFileName = "test"; //tempFileName + DateTime.Now.ToString("yyyyMMddHHmmssfff");
-                                ///创建线程信息
-                                ///
-                                GetTaskInfo(dlInfo);
+                                GetTaskInfo(_dlInfo);
                             }
                             else
                             {
                                 //不支持断点续传则一开始就直接读完整流
-                                Save(GetRealFileName(dlInfo), rsp.GetResponseStream());
+                                Save(GetRealFileName(_dlInfo), rsp.GetResponseStream());
                                 OnFineshHandler();
                             }
                         }
                     }
                     catch (Exception ex)
                     {
-                        string ErrMessage = "【下载】(DownloadManager):" + ex.Message;
-                        LogHelper.Logerror.Error(ErrMessage, ex);
+                        string errMessage = "【下载】(DownloadManager):" + ex.Message;
+                        LogHelper.Logerror.Error(errMessage, ex);
                         OnDisconnectHandler();
                         return;
                     }
-                    dlInfo.isNewTask = false;
+                    _dlInfo.isNewTask = false;
                 }
                 //如果支持断点续传采用这个
-                if (dlInfo.IsSupportMultiThreading)
+                if (_dlInfo.IsSupportMultiThreading)
                 {
-                    StartTask(dlInfo);
+                    StartTask(_dlInfo);
 
                     //等待合并
-                    while (dls.Where(td => !td.isFinish).Count() > 0 && isRun)
+                    while (_dls.Count(td => !td.isFinish) > 0 && _isRun)
                     {
                         Thread.Sleep(100);
                     }
-                    if ((dls.Where(td => !td.isFinish).Count() == 0))
+                    if ((_dls.Count(td => !td.isFinish) == 0))
                     {
-
-                        CombineFiles(dlInfo);
+                        CombineFiles(_dlInfo);
                         OnFineshHandler();
                     }
                 }
@@ -231,7 +226,7 @@ namespace Common.system
 
         private void StartTask(DownloadInfoModel dlInfo)
         {
-            dls = new List<DownloadService>();
+            _dls = new List<DownloadService>();
             if (dlInfo.TaskInfoList != null)
             {
                 foreach (TaskInfoModel item in dlInfo.TaskInfoList)
@@ -239,15 +234,15 @@ namespace Common.system
                     DownloadService dl = new DownloadService();
                     dl.OnDownload += OnDownloadHandler;
                     dl.OnDisconnect += OnDisconnectHandler;
-                    dls.Add(dl);
+                    _dls.Add(dl);
                     try
                     {
                         dl.Start(item, dlInfo.isReStart);
                     }
                     catch (Exception ex)
                     {
-                        string ErrMessage = "【下载】(DownloadManager):" + ex.Message;
-                        LogHelper.Logerror.Error(ErrMessage, ex);
+                        string errMessage = "【下载】(DownloadManager):" + ex.Message;
+                        LogHelper.Logerror.Error(errMessage, ex);
                     }
                 }
             }
@@ -310,14 +305,14 @@ namespace Common.system
                     {
                         int repeatTimes = 0;
                         byte[] buffer = new byte[1024];
-                        int length = 0;
-                        while ((length = stream.Read(buffer, 0, buffer.Length)) > 0 && isRun)
+                        int length;
+                        while ((length = stream.Read(buffer, 0, buffer.Length)) > 0 && _isRun)
                         {
                             writer.Write(buffer, 0, length);
-                            fromIndex += length;
+                            _fromIndex += length;
                             if (repeatTimes % 5 == 0)
                             {
-                                writer.Flush();//一定大小就刷一次缓冲区
+                                writer.Flush(); //一定大小就刷一次缓冲区
                                 OnDownloadHandler();
                             }
                             repeatTimes++;
@@ -340,7 +335,10 @@ namespace Common.system
         {
             new Action(() =>
             {
-                OnStart.Invoke();
+                if (OnStart != null)
+                {
+                    OnStart.Invoke();
+                }
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -350,7 +348,7 @@ namespace Common.system
         {
             new Action(() =>
             {
-                OnStop.Invoke();
+                OnStop?.Invoke();
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -360,12 +358,12 @@ namespace Common.system
         {
             new Action(() =>
             {
-                for (int i = 0; i < dlInfo.TaskInfoList.Count; i++)
+                for (int i = 0; i < _dlInfo.TaskInfoList.Count; i++)
                 {
-                    string tempFile = dlInfo.TaskInfoList[i].filePath;
+                    string tempFile = _dlInfo.TaskInfoList[i].filePath;
                     File.Delete(tempFile);
                 }
-                OnFinsh.Invoke(dlInfo.saveFileName);
+                OnFinsh?.Invoke(_dlInfo.saveFileName);
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -376,7 +374,7 @@ namespace Common.system
             new Action(() =>
             {
                 long current = GetDownloadLength();
-                OnDownload.Invoke(current, dlInfo.count, dlInfo.saveFileName);
+                OnDownload?.Invoke(current, _dlInfo.count, _dlInfo.saveFileName);
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -386,7 +384,7 @@ namespace Common.system
         {
             new Action(() =>
             {
-                OnDisconnect.Invoke(dlInfo.saveFileName);
+                OnDisconnect?.Invoke(_dlInfo.saveFileName);
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -395,13 +393,13 @@ namespace Common.system
         /// <returns></returns>
         public long GetDownloadLength()
         {
-            if (dlInfo.IsSupportMultiThreading)
+            if (_dlInfo.IsSupportMultiThreading)
             {
-                return dls.Sum(dl => dl.GetDownloadedCount());
+                return _dls.Sum(dl => dl.GetDownloadedCount());
             }
             else
             {
-                return fromIndex;
+                return _fromIndex;
             }
         }
 
@@ -409,7 +407,6 @@ namespace Common.system
         /// 获取保存文件名
         /// </summary>
         /// <returns></returns>
-        public DownloadInfoModel GetFileInfo => dlInfo;
-
+        public DownloadInfoModel GetFileInfo => _dlInfo;
     }
 }

XHWK.WKTool/system/DownloadService.cs → XHWK.WKTool/Utils/DownloadService.cs

@@ -13,17 +13,16 @@ namespace Common.system
     /// </summary>
     public class DownloadService
     {
-        private string downloadUrl = "";//文件下载地址
-        private string filePath = "";//文件保存路径
-        private string method = "";//方法
-        private long fromIndex = 0;//开始下载的位置
-        private long toIndex = 0;//结束下载的位置
-        private long count = 0;//总大小
-        private long size = 524288;//每次下载大小 512kb
-        private bool isRun = false;//是否正在进行
+        private string _downloadUrl = ""; //文件下载地址
+        private string _filePath = ""; //文件保存路径
+        private string _method = ""; //方法
+        private long _fromIndex; //开始下载的位置
+        private long _toIndex; //结束下载的位置
+        private long _count; //总大小
+        private readonly long _size = 524288; //每次下载大小 512kb
+        private bool _isRun; //是否正在进行
 
-
-        public bool isFinish = false;//是否已下载完成{ get; private set; }
+        public bool isFinish; //是否已下载完成{ get; private set; }
 
         public bool isStopped = true;//是否已停止{ get; private set; }
 
@@ -47,12 +46,12 @@ namespace Common.system
 
         public long GetDownloadedCount()
         {
-            return count - toIndex + fromIndex - 1;
+            return _count - _toIndex + _fromIndex - 1;
         }
 
         public void Stop()
         {
-            isRun = false;
+            _isRun = false;
         }
 
         /// <summary>
@@ -63,30 +62,30 @@ namespace Common.system
         /// <returns></returns>
         public bool Start(TaskInfoModel info, bool isReStart)
         {
-            downloadUrl = info.downloadUrl;
-            fromIndex = info.fromIndex;
-            toIndex = info.toIndex;
-            method = info.method;
-            filePath = info.filePath;
-            count = info.count;
+            _downloadUrl = info.downloadUrl;
+            _fromIndex = info.fromIndex;
+            _toIndex = info.toIndex;
+            _method = info.method;
+            _filePath = info.filePath;
+            _count = info.count;
             isStopped = false;
-            if (File.Exists(filePath))
+            if (File.Exists(_filePath))
             {
                 if (isReStart)
                 {
-                    File.Delete(filePath);
-                    File.Create(filePath).Close();
+                    File.Delete(_filePath);
+                    File.Create(_filePath).Close();
                 }
             }
             else
             {
-                File.Create(filePath).Close();
+                File.Create(_filePath).Close();
             }
-            using (FileStream file = File.Open(filePath, FileMode.Open))
+            using (FileStream file = File.Open(_filePath, FileMode.Open))
             {
-                fromIndex = info.fromIndex + file.Length;
+                _fromIndex = info.fromIndex + file.Length;
             }
-            if (fromIndex >= toIndex)
+            if (_fromIndex >= _toIndex)
             {
                 OnFineshHandler();
                 isFinish = true;
@@ -94,48 +93,46 @@ namespace Common.system
                 return false;
             }
             OnStartHandler();
-            isRun = true;
+            _isRun = true;
             new Action(() =>
             {
-                WebResponse rsp;
-                while (fromIndex < toIndex && isRun)
+                while (_fromIndex < _toIndex && _isRun)
                 {
                     long to;
-                    if (fromIndex + size >= toIndex - 1)
+                    if (_fromIndex + _size >= _toIndex - 1)
                     {
-                        to = toIndex - 1;
+                        to = _toIndex - 1;
                     }
                     else
                     {
-                        to = fromIndex + size;
+                        to = _fromIndex + _size;
                     }
                     try
                     {
-                        using (rsp = ZHttpUtil.Download
-                               (
-                                   downloadUrl,
-                                   fromIndex,
+                        WebResponse rsp;
+                        using (rsp = ZHttpUtil.Download(
+                                   _downloadUrl,
+                                   _fromIndex,
                                    to,
-                                   method
+                                   _method
                                ))
                         {
-                            Save(filePath, rsp.GetResponseStream());
+                            Save(_filePath, rsp.GetResponseStream());
                         }
                     }
                     catch (Exception ex)
                     {
-                        string ErrMessage = "【下载】(DownloadService):" + ex.Message;
-                        LogHelper.Logerror.Error(ErrMessage, ex);
+                        string errMessage = "【下载】(DownloadService):" + ex.Message;
+                        LogHelper.Logerror.Error(errMessage, ex);
                         OnDisconnectHandler();
                         return;
                     }
                 }
-                if (!isRun)
+                if (!_isRun)
                 {
                     isStopped = true;
                 }
-
-                if (fromIndex >= toIndex)
+                if (_fromIndex >= _toIndex)
                 {
                     isFinish = true;
                     isStopped = true;
@@ -160,11 +157,11 @@ namespace Common.system
                     {
                         int repeatTimes = 0;
                         byte[] buffer = new byte[1024];
-                        int length = 0;
-                        while ((length = stream.Read(buffer, 0, buffer.Length)) > 0 && isRun)
+                        int length;
+                        while ((length = stream.Read(buffer, 0, buffer.Length)) > 0 && _isRun)
                         {
                             writer.Write(buffer, 0, length);
-                            fromIndex += length;
+                            _fromIndex += length;
                             if (repeatTimes % 5 == 0)
                             {
                                 OnDownloadHandler();

XHWK.WKTool/system/FreeMemoryHelper.cs → XHWK.WKTool/Utils/FreeMemoryHelper.cs

@@ -36,9 +36,12 @@ namespace Common.system
             CreateKey();
             RegistryKey currentUser = Registry.CurrentUser;
             RegistryKey registryKey = currentUser.OpenSubKey("SOFTWARE\\DevExpress\\Components", writable: true);
-            registryKey.GetValue("LastAboutShowedTime");
-            string value = DateTime.Now.ToString("MM/dd/yyyy HH:mm:ss");
-            registryKey.SetValue("LastAboutShowedTime", value);
+            if (registryKey != null)
+            {
+                registryKey.GetValue("LastAboutShowedTime");
+                string value = DateTime.Now.ToString("MM/dd/yyyy HH:mm:ss");
+                registryKey.SetValue("LastAboutShowedTime", value);
+            }
             currentUser.Dispose();
         }
 
@@ -49,9 +52,12 @@ namespace Common.system
             if (currentUser.OpenSubKey("SOFTWARE\\DevExpress\\Components", writable: true) == null)
             {
                 RegistryKey registryKey = currentUser.CreateSubKey("SOFTWARE\\DevExpress\\Components");
-                registryKey.CreateSubKey("LastAboutShowedTime").SetValue("LastAboutShowedTime", DateTime.Now.ToString("MM/dd/yyyy HH:mm:ss"));
-                registryKey.CreateSubKey("DisableSmartTag").SetValue("LastAboutShowedTime", false);
-                registryKey.CreateSubKey("SmartTagWidth").SetValue("LastAboutShowedTime", 350);
+                if (registryKey != null)
+                {
+                    registryKey.CreateSubKey("LastAboutShowedTime")?.SetValue("LastAboutShowedTime", DateTime.Now.ToString("MM/dd/yyyy HH:mm:ss"));
+                    registryKey.CreateSubKey("DisableSmartTag")?.SetValue("LastAboutShowedTime", false);
+                    registryKey.CreateSubKey("SmartTagWidth")?.SetValue("LastAboutShowedTime", 350);
+                }
             }
 
             currentUser.Dispose();

XHWK.WKTool/system/ImageHelper.cs → XHWK.WKTool/Utils/ImageHelper.cs

@@ -3,7 +3,6 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Text;
-using System.Threading;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -29,9 +28,10 @@ namespace Common.system
                 if (File.Exists(path))
                 {
                     FileStream fs = File.OpenRead(path); //OpenRead
-                    int filelength = 0;
+                    int filelength;
                     filelength = (int)fs.Length; //获得文件长度
                     byte[] image = new byte[filelength]; //建立一个字节数组
+                    // ReSharper disable once MustUseReturnValue
                     fs.Read(image, 0, filelength); //按字节流读取
                     System.Drawing.Image result = System.Drawing.Image.FromStream(fs);
                     fs.Close();
@@ -61,9 +61,10 @@ namespace Common.system
                 if (File.Exists(path))
                 {
                     FileStream fs = File.OpenRead(path); //OpenRead
-                    int filelength = 0;
+                    int filelength;
                     filelength = (int)fs.Length; //获得文件长度
                     byte[] image = new byte[filelength]; //建立一个字节数组
+                    // ReSharper disable once MustUseReturnValue
                     fs.Read(image, 0, filelength); //按字节流读取
                     System.Drawing.Image result = System.Drawing.Image.FromStream(fs);
                     fs.Close();
@@ -87,18 +88,15 @@ namespace Common.system
         /// <returns></returns>
         public static BitmapImage ReadBitmapImageFile(string path)
         {
-            BitmapImage bitmap = new BitmapImage();
+            BitmapImage bitmap;
             try
             {
                 using (MemoryStream ms = new MemoryStream(File.ReadAllBytes(path)))
                 {
-                    bitmap = new BitmapImage
-                    {
-                        DecodePixelHeight = 100
-                    };
+                    bitmap = new BitmapImage { DecodePixelHeight = 100 };
                     bitmap.BeginInit();
-                    bitmap.CacheOption = BitmapCacheOption.OnLoad;//设置缓存模式
-                    bitmap.StreamSource = ms;//通过StreamSource加载图片
+                    bitmap.CacheOption = BitmapCacheOption.OnLoad; //设置缓存模式
+                    bitmap.StreamSource = ms; //通过StreamSource加载图片
                     bitmap.EndInit();
                     bitmap.Freeze();
                 }
@@ -112,30 +110,28 @@ namespace Common.system
 
         #region 获取RGB
 
-        private static Bitmap _Bitmap = null;
-        private static StringBuilder sb = new StringBuilder();
+        private static Bitmap _bitmap;
+        private static StringBuilder _sb = new StringBuilder();
 
-        public static string GetRGB(int x, int y)
+        public static string GetRgb(int x, int y)
         {
-            sb = new StringBuilder();
+            _sb = new StringBuilder();
             try
             {
-                System.Drawing.Color color = _Bitmap.GetPixel(x, y);
-
-                sb.Append("RGB:（");
-                sb.Append(color.R.ToString());
-                sb.Append(",");
-                sb.Append(color.G.ToString());
-                sb.Append(",");
-                sb.Append(color.B.ToString());
-                sb.Append("）");
+                System.Drawing.Color color = _bitmap.GetPixel(x, y);
+                _sb.Append("RGB:（");
+                _sb.Append(color.R.ToString());
+                _sb.Append(",");
+                _sb.Append(color.G.ToString());
+                _sb.Append(",");
+                _sb.Append(color.B.ToString());
+                _sb.Append("）");
             }
             catch (Exception ex)
             {
                 LogHelper.Logerror.Error("ImageHelper(GetRGB)" + ex.Message, ex);
             }
-
-            return sb.ToString();
+            return _sb.ToString();
         }
 
         #endregion 获取RGB
@@ -145,43 +141,47 @@ namespace Common.system
         /// <summary>
         /// 截图通用方法 创建人：赵耀 创建时间：2020年8月11日
         /// </summary>
-        /// <param name="ScreenSize">截图的区域，设置new Rectangle(0, 0, 0, 0)为截全屏</param>
-        /// <param name="ImageSavePath">图片存储路径，为空或null则保存到临时文件夹</param>
-        /// <param name="IsRetImg">是否返回图片</param>
-        /// <param name="bitmapimg">图片</param>
+        /// <param name="screenSize">截图的区域，设置new Rectangle(0, 0, 0, 0)为截全屏</param>
+        /// <param name="imageSavePath">图片存储路径，为空或null则保存到临时文件夹</param>
         /// <param name="level">压缩等级，0到100，0 最差质量，100 最佳</param>
         /// <returns></returns>
-        public static bool GetScreenshot(Rectangle ScreenSize, string ImageSavePath, long level = -1)
+        public static bool GetScreenshot(Rectangle screenSize, string imageSavePath, long level = -1)
         {
             try
             {
                 System.Drawing.Size bounds = PrimaryScreen.DESKTOP;
-                if (string.IsNullOrEmpty(ImageSavePath))
+                if (string.IsNullOrEmpty(imageSavePath))
                 {
-                    ImageSavePath = GetTempImagePath();//如果为空则指定临时存储路径
+                    imageSavePath = GetTempImagePath(); //如果为空则指定临时存储路径
                 }
                 double scaleWidth = (bounds.Width * 1.0) / SystemParameters.PrimaryScreenWidth;
                 double scaleHeight = (bounds.Height * 1.0) / SystemParameters.PrimaryScreenHeight;
                 int width = bounds.Width;
                 int height = bounds.Height;
-                if (ScreenSize.Size != new System.Drawing.Size(0, 0))
+                if (screenSize.Size != new System.Drawing.Size(0, 0))
                 {
-                    width = (int)(ScreenSize.Size.Width * scaleWidth);
-                    height = (int)(ScreenSize.Size.Height * scaleHeight);
+                    width = (int)(screenSize.Size.Width * scaleWidth);
+                    height = (int)(screenSize.Size.Height * scaleHeight);
                 }
-                int l = (int)(ScreenSize.X * scaleWidth);
-                int t = (int)(ScreenSize.Y * scaleHeight);
-                if (_Bitmap != null)
+                int l = (int)(screenSize.X * scaleWidth);
+                int t = (int)(screenSize.Y * scaleHeight);
+                if (_bitmap != null)
                 {
-                    _Bitmap.Dispose();
+                    _bitmap.Dispose();
                 }
-                _Bitmap = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-                using (Graphics g = Graphics.FromImage(_Bitmap))
+                _bitmap = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+                using (Graphics g = Graphics.FromImage(_bitmap))
                 {
-                    g.CopyFromScreen(l, t, 0, 0, _Bitmap.Size, CopyPixelOperation.SourceCopy);
-                    Compress(_Bitmap, ImageSavePath, level);
+                    g.CopyFromScreen(
+                        l,
+                        t,
+                        0,
+                        0,
+                        _bitmap.Size,
+                        CopyPixelOperation.SourceCopy
+                    );
+                    Compress(_bitmap, imageSavePath, level);
                 }
-
                 GC.Collect();
                 return true;
             }
@@ -195,46 +195,60 @@ namespace Common.system
         /// <summary>
         /// 截图通用方法 创建人：赵耀 创建时间：2020年8月11日
         /// </summary>
-        /// <param name="ScreenSize">截图的区域，设置new Rectangle(0, 0, 0, 0)为截全屏</param>
-        /// <param name="ImageSavePath">图片存储路径，为空或null则保存到临时文件夹</param>
-        /// <param name="IsRetImg">是否返回图片</param>
+        /// <param name="screenSize">截图的区域，设置new Rectangle(0, 0, 0, 0)为截全屏</param>
+        /// <param name="imageSavePath">图片存储路径，为空或null则保存到临时文件夹</param>
+        /// <param name="isRetImg">是否返回图片</param>
         /// <param name="bitmapimg">图片</param>
         /// <param name="level">压缩等级，0到100，0 最差质量，100 最佳</param>
         /// <returns></returns>
-        public static bool GetScreenshot(Rectangle ScreenSize, string ImageSavePath, bool IsRetImg, out BitmapImage bitmapimg, long level = -1)
+        public static bool GetScreenshot
+        (
+            Rectangle screenSize,
+            string imageSavePath,
+            bool isRetImg,
+            out BitmapImage bitmapimg,
+            long level = -1
+        )
         {
             bitmapimg = null;
             try
             {
                 System.Drawing.Size bounds = PrimaryScreen.DESKTOP;
-                if (string.IsNullOrEmpty(ImageSavePath))
+                if (string.IsNullOrEmpty(imageSavePath))
                 {
-                    ImageSavePath = GetTempImagePath();//如果为空则指定临时存储路径
+                    imageSavePath = GetTempImagePath(); //如果为空则指定临时存储路径
                 }
                 double scaleWidth = (bounds.Width * 1.0) / SystemParameters.PrimaryScreenWidth;
                 double scaleHeight = (bounds.Height * 1.0) / SystemParameters.PrimaryScreenHeight;
                 int width = bounds.Width;
                 int height = bounds.Height;
-                if (ScreenSize.Size != new System.Drawing.Size(0, 0))
+                if (screenSize.Size != new System.Drawing.Size(0, 0))
                 {
-                    width = (int)(ScreenSize.Size.Width * scaleWidth);
-                    height = (int)(ScreenSize.Size.Height * scaleHeight);
+                    width = (int)(screenSize.Size.Width * scaleWidth);
+                    height = (int)(screenSize.Size.Height * scaleHeight);
                 }
-                int l = (int)(ScreenSize.X * scaleWidth);
-                int t = (int)(ScreenSize.Y * scaleHeight);
-                if (_Bitmap != null)
+                int l = (int)(screenSize.X * scaleWidth);
+                int t = (int)(screenSize.Y * scaleHeight);
+                if (_bitmap != null)
                 {
-                    _Bitmap.Dispose();
+                    _bitmap.Dispose();
                 }
-                _Bitmap = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-                using (Graphics g = Graphics.FromImage(_Bitmap))
+                _bitmap = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+                using (Graphics g = Graphics.FromImage(_bitmap))
                 {
-                    g.CopyFromScreen(l, t, 0, 0, _Bitmap.Size, CopyPixelOperation.SourceCopy);
-                    Compress(_Bitmap, ImageSavePath, level);
+                    g.CopyFromScreen(
+                        l,
+                        t,
+                        0,
+                        0,
+                        _bitmap.Size,
+                        CopyPixelOperation.SourceCopy
+                    );
+                    Compress(_bitmap, imageSavePath, level);
                 }
-                if (IsRetImg)
+                if (isRetImg)
                 {
-                    Uri uri = new Uri(ImageSavePath, UriKind.Absolute);
+                    Uri uri = new Uri(imageSavePath, UriKind.Absolute);
                     bitmapimg = new BitmapImage(uri);
                 }
                 GC.Collect();
@@ -253,12 +267,20 @@ namespace Common.system
         /// <returns></returns>
         public static string GetTempImagePath()
         {
-            TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-
-            string TempPath = FileToolsCommon.GetFileAbsolutePath("/temp/Screenshot/");
-            FileToolsCommon.CreateDirectory(TempPath);
-            TempPath += Convert.ToInt64(ts.TotalMilliseconds).ToString() + ".jpg";
-            return TempPath;
+            TimeSpan ts = DateTime.Now -
+            new DateTime(
+                1970,
+                1,
+                1,
+                0,
+                0,
+                0,
+                0
+            );
+            string tempPath = FileToolsCommon.GetFileAbsolutePath("/temp/Screenshot/");
+            FileToolsCommon.CreateDirectory(tempPath);
+            tempPath += Convert.ToInt64(ts.TotalMilliseconds).ToString() + ".jpg";
+            return tempPath;
         }
 
         #endregion 截图统一方法
@@ -275,8 +297,8 @@ namespace Common.system
         {
             if (level <= -1)
             {
-                int ImageCompressionLevel = int.Parse(FileToolsCommon.GetConfigValue("ImageCompressionLevel"));
-                level = ImageCompressionLevel;
+                int imageCompressionLevel = int.Parse(FileToolsCommon.GetConfigValue("ImageCompressionLevel"));
+                level = imageCompressionLevel;
             }
             Stream s = new FileStream(destFile, FileMode.Create);
             Compress(srcBitMap, s, level);
@@ -291,19 +313,11 @@ namespace Common.system
         /// <param name="level">压缩等级，0到100，0 最差质量，100 最佳</param>
         public static void Compress(Bitmap srcBitmap, Stream destStream, long level)
         {
-            ImageCodecInfo myImageCodecInfo;
-            System.Drawing.Imaging.Encoder myEncoder;
-            EncoderParameter myEncoderParameter;
-            EncoderParameters myEncoderParameters;
-
             //获取表示jpeg编解码器的imagecodecinfo对象
-            myImageCodecInfo = GetEncoderInfo("image/jpeg");
-
-            myEncoder = System.Drawing.Imaging.Encoder.Quality;
-
-            myEncoderParameters = new EncoderParameters(1);
-
-            myEncoderParameter = new EncoderParameter(myEncoder, level);
+            ImageCodecInfo myImageCodecInfo = GetEncoderInfo("image/jpeg");
+            System.Drawing.Imaging.Encoder myEncoder = System.Drawing.Imaging.Encoder.Quality;
+            EncoderParameters myEncoderParameters = new EncoderParameters(1);
+            EncoderParameter myEncoderParameter = new EncoderParameter(myEncoder, level);
             myEncoderParameters.Param[0] = myEncoderParameter;
             srcBitmap.Save(destStream, myImageCodecInfo, myEncoderParameters);
         }
@@ -331,13 +345,18 @@ namespace Common.system
         /// <summary>
         /// 压缩图片 -测试方法 待完善 暂无用
         /// </summary>
-        /// <param name="_bitmap">原图片</param>
+        /// <param name="mbitmap">原图片</param>
         /// <param name="dFile">压缩后保存图片地址</param>
         /// <param name="flag">压缩质量（数字越小压缩率越高）1-100</param>
         /// <param name="size">压缩后图片的最大大小</param>
-        /// <param name="sfsc">是否是第一次调用</param>
         /// <returns></returns>
-        public static bool CompressImage(Bitmap _bitmap, string dFile, int flag = 90, int size = 300)
+        public static bool CompressImage
+        (
+            Bitmap mbitmap,
+            string dFile,
+            int flag = 90,
+            int size = 300
+        )
         {
             ////如果是第一次调用，原始图像的大小小于要压缩的大小，则直接复制文件，并且返回true
             //FileInfo firstFileInfo = new FileInfo(sFile);
@@ -347,86 +366,88 @@ namespace Common.system
             //    return true;
             //}
             //Image iSource = Image.FromFile(sFile);
-            Image iSource = _bitmap;
+            Image iSource = mbitmap;
             ImageFormat tFormat = iSource.RawFormat;
             int dHeight = iSource.Height / 2;
             int dWidth = iSource.Width / 2;
             int sW, sH;
             //按比例缩放
-            System.Drawing.Size tem_size = new System.Drawing.Size(iSource.Width, iSource.Height);
-            if (tem_size.Width > dHeight || tem_size.Width > dWidth)
+            System.Drawing.Size temSize = new System.Drawing.Size(iSource.Width, iSource.Height);
+            if (temSize.Width > dHeight || temSize.Width > dWidth)
             {
-                if ((tem_size.Width * dHeight) > (tem_size.Width * dWidth))
+                if ((temSize.Width * dHeight) > (temSize.Width * dWidth))
                 {
                     sW = dWidth;
-                    sH = (dWidth * tem_size.Height) / tem_size.Width;
+                    sH = (dWidth * temSize.Height) / temSize.Width;
                 }
                 else
                 {
                     sH = dHeight;
-                    sW = (tem_size.Width * dHeight) / tem_size.Height;
+                    sW = (temSize.Width * dHeight) / temSize.Height;
                 }
             }
             else
             {
-                sW = tem_size.Width;
-                sH = tem_size.Height;
+                sW = temSize.Width;
+                sH = temSize.Height;
             }
-
             Bitmap ob = new Bitmap(dWidth, dHeight);
             Graphics g = Graphics.FromImage(ob);
-
             g.Clear(System.Drawing.Color.WhiteSmoke);
             g.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
             g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
             g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
-
-            g.DrawImage(iSource, new Rectangle((dWidth - sW) / 2, (dHeight - sH) / 2, sW, sH), 0, 0, iSource.Width, iSource.Height, GraphicsUnit.Pixel);
-
+            g.DrawImage(
+                iSource,
+                new Rectangle(
+                    (dWidth - sW) / 2,
+                    (dHeight - sH) / 2,
+                    sW,
+                    sH
+                ),
+                0,
+                0,
+                iSource.Width,
+                iSource.Height,
+                GraphicsUnit.Pixel
+            );
             g.Dispose();
 
             //以下代码为保存图片时，设置压缩质量
             EncoderParameters ep = new EncoderParameters();
             long[] qy = new long[1];
-            qy[0] = flag;//设置压缩的比例1-100
+            qy[0] = flag; //设置压缩的比例1-100
             EncoderParameter eParam = new EncoderParameter(System.Drawing.Imaging.Encoder.Quality, qy);
             ep.Param[0] = eParam;
-
             try
             {
-                ImageCodecInfo[] arrayICI = ImageCodecInfo.GetImageEncoders();
-                ImageCodecInfo jpegICIinfo = null;
-                for (int x = 0; x < arrayICI.Length; x++)
+                ImageCodecInfo[] arrayIci = ImageCodecInfo.GetImageEncoders();
+                ImageCodecInfo jpegIcIinfo = null;
+                for (int x = 0; x < arrayIci.Length; x++)
                 {
-                    if (arrayICI[x].FormatDescription.Equals("JPEG"))
+                    if (arrayIci[x].FormatDescription.Equals("JPEG"))
                     {
-                        jpegICIinfo = arrayICI[x];
+                        jpegIcIinfo = arrayIci[x];
                         break;
                     }
                 }
-                if (jpegICIinfo != null)
+                if (jpegIcIinfo != null)
                 {
                     if (flag > 0)
                     {
-                        ob.Save(dFile, jpegICIinfo, ep);//dFile是压缩后的新路径
+                        ob.Save(dFile, jpegIcIinfo, ep); //dFile是压缩后的新路径
                         FileInfo fi = new FileInfo(dFile);
                         if (fi.Length > 1024 * size)
                         {
                             flag -= 10;
-                            CompressImage(_bitmap, dFile, flag, size);
+                            CompressImage(
+                                mbitmap,
+                                dFile,
+                                flag,
+                                size
+                            );
                         }
                     }
-                    //ob.Save(dFile, jpegICIinfo, ep);
-                    //FileInfo fi = new FileInfo(dFile);
-                    //bool IsAgain = false;
-                    //if (fi.Length > 1024 * size)
-                    //{
-                    //    fi.CopyTo(dFile + fi.Length);
-                    //    fi.Delete();
-                    //    Bitmap newbitmap = ReadImageFile(dFile + fi.Length);
-                    //    CompressImage(newbitmap, dFile, flag, size);
-                    //    FileToolsCommon.DeleteFile(dFile + fi.Length);
-                    //}
                 }
                 else
                 {
@@ -454,30 +475,37 @@ namespace Common.system
         /// </summary>
         /// <param name="ui">需要截图的UI控件</param>
         /// <param name="filePathName">图片保存地址 命名 1.png</param>
-        /// <param name="ImgWidth">转换后高</param>
-        /// <param name="ImgHeight">转换后高</param>
-        public static void SaveUI(FrameworkElement ui, string filePathName, int ImgWidth, int ImgHeight)
+        /// <param name="imgWidth">转换后高</param>
+        /// <param name="imgHeight">转换后高</param>
+        public static void SaveUi
+        (
+            FrameworkElement ui,
+            string filePathName,
+            int imgWidth,
+            int imgHeight
+        )
         {
-            Console.WriteLine("截图的路径为:" + filePathName);
+            Console.WriteLine(@"截图的路径为:" + filePathName);
             try
             {
                 RenderTargetBitmap bmp = new RenderTargetBitmap(
-                       (int)ui.ActualWidth,
-                       (int)ui.ActualHeight,
-                       1 / 96, 1 / 96,
-                       PixelFormats.Default
-                   );
+                    (int)ui.ActualWidth,
+                    (int)ui.ActualHeight,
+                    96,
+                    96,
+                    PixelFormats.Default
+                );
                 bmp.Render(ui);
                 BitmapEncoder encoder = new PngBitmapEncoder();
                 encoder.Frames.Add(BitmapFrame.Create(bmp));
-                if (ImgWidth > 0)
+                if (imgWidth > 0)
                 {
                     MemoryStream memoryStream = new MemoryStream();
                     encoder.Save(memoryStream);
                     Bitmap bit = new Bitmap(memoryStream, true);
-                    Bitmap Img = new Bitmap(bit, ImgWidth, ImgHeight);
-                    Img.Save(filePathName);
-                    Img.Dispose();
+                    Bitmap img = new Bitmap(bit, imgWidth, imgHeight);
+                    img.Save(filePathName);
+                    img.Dispose();
                     bit.Dispose();
                     memoryStream.Dispose();
                 }
@@ -495,10 +523,16 @@ namespace Common.system
             }
         }
 
-        public static void SaveUI2(FrameworkElement frameworkElement, string filePathName)
+        public static void SaveUi2(FrameworkElement frameworkElement, string filePathName)
         {
             System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
-            RenderTargetBitmap bmp = new RenderTargetBitmap((int)frameworkElement.ActualWidth, (int)frameworkElement.ActualHeight, 1 / 96, 1 / 96, PixelFormats.Default);
+            RenderTargetBitmap bmp = new RenderTargetBitmap(
+                (int)frameworkElement.ActualWidth,
+                (int)frameworkElement.ActualHeight,
+                96,
+                96,
+                PixelFormats.Default
+            );
             bmp.Render(frameworkElement);
             BitmapEncoder encoder = new PngBitmapEncoder();
             encoder.Frames.Add(BitmapFrame.Create(bmp));
@@ -506,22 +540,21 @@ namespace Common.system
             fs.Close();
         }
 
-        public static Bitmap SaveUI2Bitmap(FrameworkElement frameworkElement, int width, int height)
+        public static Bitmap SaveUi2Bitmap(FrameworkElement frameworkElement, int width, int height)
         {
             using (MemoryStream outStream = new MemoryStream())
             {
                 RenderTargetBitmap bmp = new RenderTargetBitmap(
-                        (int)frameworkElement.ActualWidth,
-                        (int)frameworkElement.ActualHeight,
-                        1 / 96,
-                        1 / 96,
-                        PixelFormats.Default
-                    );
+                    (int)frameworkElement.ActualWidth,
+                    (int)frameworkElement.ActualHeight,
+                    96,
+                    96,
+                    PixelFormats.Default
+                );
                 bmp.Render(frameworkElement);
                 BitmapEncoder enc = new PngBitmapEncoder();
                 enc.Frames.Add(BitmapFrame.Create(bmp));
                 enc.Save(outStream);
-
                 System.Drawing.Bitmap bitmap = new System.Drawing.Bitmap(outStream);
                 return new Bitmap(bitmap, width, height);
             }
@@ -531,25 +564,38 @@ namespace Common.system
         /// 截图转换成bitmap
         /// </summary>
         /// <param name="element"></param>
+        /// <param name="filePathName"></param>
         /// <param name="width">默认控件宽度</param>
         /// <param name="height">默认控件高度</param>
         /// <param name="x">默认0</param>
         /// <param name="y">默认0</param>
         /// <returns></returns>
-        public static Bitmap ToBitmap(FrameworkElement element, string filePathName, int width = 0, int height = 0, int x = 0, int y = 0)
+        public static Bitmap ToBitmap
+        (
+            FrameworkElement element,
+            string filePathName,
+            int width = 0,
+            int height = 0,
+            int x = 0,
+            int y = 0
+        )
         {
             if (width == 0) width = (int)element.ActualWidth;
             if (height == 0) height = (int)element.ActualHeight;
-
-            var rtb = new RenderTargetBitmap(width, height, x, y, System.Windows.Media.PixelFormats.Default);
+            var rtb = new RenderTargetBitmap(
+                width,
+                height,
+                x,
+                y,
+                System.Windows.Media.PixelFormats.Default
+            );
             rtb.Render(element);
-            var bit = BitmapSourceToBitmap(rtb);
+            Bitmap bit = BitmapSourceToBitmap(rtb);
 
             //测试代码
             DirectoryInfo d = new DirectoryInfo(System.IO.Path.Combine(Directory.GetCurrentDirectory(), "Cache"));
             if (!d.Exists) d.Create();
             bit.Save(System.IO.Path.Combine(d.FullName, "控件截图.png"));
-
             return bit;
         }
 
@@ -567,6 +613,8 @@ namespace Common.system
         /// Convert BitmapSource to Bitmap
         /// </summary>
         /// <param name="source"></param>
+        /// <param name="width"></param>
+        /// <param name="height"></param>
         /// <returns></returns>
         public static Bitmap BitmapSourceToBitmap(BitmapSource source, int width, int height)
         {
@@ -578,16 +626,27 @@ namespace Common.system
                 switch (source.Format.ToString())
                 {
                     case "Rgb24":
-                    case "Bgr24": format = System.Drawing.Imaging.PixelFormat.Format24bppRgb; break;
-                    case "Bgra32": format = System.Drawing.Imaging.PixelFormat.Format32bppPArgb; break;
-                    case "Bgr32": format = System.Drawing.Imaging.PixelFormat.Format32bppRgb; break;
-                    case "Pbgra32": format = System.Drawing.Imaging.PixelFormat.Format32bppArgb; break;
+                    case "Bgr24":
+                        format = System.Drawing.Imaging.PixelFormat.Format24bppRgb;
+                        break;
+                    case "Bgra32":
+                        format = System.Drawing.Imaging.PixelFormat.Format32bppPArgb;
+                        break;
+                    case "Bgr32":
+                        format = System.Drawing.Imaging.PixelFormat.Format32bppRgb;
+                        break;
+                    case "Pbgra32":
+                        format = System.Drawing.Imaging.PixelFormat.Format32bppArgb;
+                        break;
                 }
                 bmp = new Bitmap(width, height, format);
-                BitmapData data = bmp.LockBits(new System.Drawing.Rectangle(System.Drawing.Point.Empty, bmp.Size),
-                    ImageLockMode.WriteOnly,
-                    format);
-                source.CopyPixels(Int32Rect.Empty, data.Scan0, data.Height * data.Stride, data.Stride);
+                BitmapData data = bmp.LockBits(new System.Drawing.Rectangle(System.Drawing.Point.Empty, bmp.Size), ImageLockMode.WriteOnly, format);
+                source.CopyPixels(
+                    Int32Rect.Empty,
+                    data.Scan0,
+                    data.Height * data.Stride,
+                    data.Stride
+                );
                 bmp.UnlockBits(data);
             }
             catch
@@ -598,7 +657,6 @@ namespace Common.system
                     bmp = null;
                 }
             }
-
             return bmp;
         }
 
@@ -609,7 +667,6 @@ namespace Common.system
         /// <summary>
         /// 裁剪图片（去掉白边）
         /// </summary>
-        /// <param name="FilePath"></param>
         public static Bitmap CutImageWhitePart(Bitmap bmp)
         {
             //Bitmap bmp = new Bitmap(FilePath);
@@ -617,10 +674,10 @@ namespace Common.system
             int top = 0, left = 0, right = bmp.Width, bottom = bmp.Height;
 
             //寻找最上面的标线,从左(0)到右，从上(0)到下
-            for (int i = 0; i < bmp.Height; i++)//行
+            for (int i = 0; i < bmp.Height; i++) //行
             {
                 bool find = false;
-                for (int j = 0; j < bmp.Width; j++)//列
+                for (int j = 0; j < bmp.Width; j++) //列
                 {
                     System.Drawing.Color c = bmp.GetPixel(j, i);
                     if (!IsWhite(c))
@@ -636,10 +693,10 @@ namespace Common.system
                 }
             }
             //寻找最左边的标线，从上（top位）到下，从左到右
-            for (int i = 0; i < bmp.Width; i++)//列
+            for (int i = 0; i < bmp.Width; i++) //列
             {
                 bool find = false;
-                for (int j = top; j < bmp.Height; j++)//行
+                for (int j = top; j < bmp.Height; j++) //行
                 {
                     System.Drawing.Color c = bmp.GetPixel(i, j);
                     if (!IsWhite(c))
@@ -655,10 +712,10 @@ namespace Common.system
                 }
             }
             //寻找最下边标线，从下到上，从左到右
-            for (int i = bmp.Height - 1; i >= 0; i--)//行
+            for (int i = bmp.Height - 1; i >= 0; i--) //行
             {
                 bool find = false;
-                for (int j = left; j < bmp.Width; j++)//列
+                for (int j = left; j < bmp.Width; j++) //列
                 {
                     System.Drawing.Color c = bmp.GetPixel(j, i);
                     if (!IsWhite(c))
@@ -674,10 +731,10 @@ namespace Common.system
                 }
             }
             //寻找最右边的标线，从上到下，从右往左
-            for (int i = bmp.Width - 1; i >= 0; i--)//列
+            for (int i = bmp.Width - 1; i >= 0; i--) //列
             {
                 bool find = false;
-                for (int j = 0; j <= bottom; j++)//行
+                for (int j = 0; j <= bottom; j++) //行
                 {
                     System.Drawing.Color c = bmp.GetPixel(i, j);
                     if (!IsWhite(c))
@@ -692,11 +749,15 @@ namespace Common.system
                     break;
                 }
             }
-
-            if (right - left <= 0)//zxyceshi
+            if (right - left <= 0) //zxyceshi
             {
                 //克隆位图对象的一部分。
-                System.Drawing.Rectangle cloneRect = new System.Drawing.Rectangle(left, top, 1, bottom - top);
+                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);
@@ -705,7 +766,12 @@ namespace Common.system
             else
             {
                 //克隆位图对象的一部分。
-                System.Drawing.Rectangle cloneRect = new System.Drawing.Rectangle(left, top, right - left, bottom - top);
+                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);
@@ -723,7 +789,6 @@ namespace Common.system
             {
                 return true;
             }
-
             return false;
         }
 
@@ -733,6 +798,7 @@ namespace Common.system
     public class SaveImageModel
     {
         public string FilePath { get; set; }
+
         public BitmapEncoder encoder { get; set; }
         //public RenderTargetBitmap bmp { get; set; }
     }
@@ -745,4 +811,4 @@ namespace Common.system
         public string filePathName { get; set; }
         public RenderTargetBitmap bmp { get; set; }
     }
-}
+}

XHWK.WKTool/Utils/ImageOperationUtil.cs

@@ -13,38 +13,40 @@ namespace XHWK.WKTool.Utils
     {
         #region 图片拉伸移动
 
-        private System.Windows.Point initialPoint;
-
-        private Thumb RectLeftUp;
-        private Thumb RectRightUp;
-        private Thumb RectLeftDown;
-        private Thumb RectRightDown;
-        private System.Windows.Shapes.Rectangle RectImgBorder;
-        private System.Windows.Controls.Image imgCanvas;
-        private Grid GridM;
-        private bool mouseDown = false;
-
-        public void setMouseDown(bool mouseDown) {
-            this.mouseDown = mouseDown;
+        private System.Windows.Point _initialPoint;
+
+        private Thumb _rectLeftUp;
+        private Thumb _rectRightUp;
+        private Thumb _rectLeftDown;
+        private Thumb _rectRightDown;
+        private System.Windows.Shapes.Rectangle _rectImgBorder;
+        private System.Windows.Controls.Image _imgCanvas;
+        private Grid _gridM;
+        private bool _mouseDown;
+
+        public void SetMouseDown(bool mouseDown)
+        {
+            this._mouseDown = mouseDown;
         }
 
-        public ImageOperationUtil(
-             Thumb RectLeftUp,
-             Thumb RectRightUp,
-             Thumb RectLeftDown,
-             Thumb RectRightDown,
-             System.Windows.Shapes.Rectangle RectImgBorder,
-             System.Windows.Controls.Image imgCanvas,
-             Grid GridM
-            )
+        public ImageOperationUtil
+        (
+            Thumb rectLeftUp,
+            Thumb rectRightUp,
+            Thumb rectLeftDown,
+            Thumb rectRightDown,
+            System.Windows.Shapes.Rectangle rectImgBorder,
+            System.Windows.Controls.Image imgCanvas,
+            Grid gridM
+        )
         {
-            this.RectLeftUp = RectLeftUp;
-            this.RectRightUp = RectRightUp;
-            this.RectLeftDown = RectLeftDown;
-            this.RectRightDown = RectRightDown;
-            this.RectImgBorder = RectImgBorder;
-            this.imgCanvas = imgCanvas;
-            this.GridM = GridM;
+            this._rectLeftUp = rectLeftUp;
+            this._rectRightUp = rectRightUp;
+            this._rectLeftDown = rectLeftDown;
+            this._rectRightDown = rectRightDown;
+            this._rectImgBorder = rectImgBorder;
+            this._imgCanvas = imgCanvas;
+            this._gridM = gridM;
         }
 
         /// <summary>
@@ -52,21 +54,21 @@ namespace XHWK.WKTool.Utils
         /// </summary>
         public void HideAngleBorder()
         {
-            RectLeftUp.Visibility = Visibility.Hidden;
-            RectRightUp.Visibility = Visibility.Hidden;
-            RectLeftDown.Visibility = Visibility.Hidden;
-            RectRightDown.Visibility = Visibility.Hidden;
-            RectImgBorder.Visibility = Visibility.Hidden;
+            _rectLeftUp.Visibility = Visibility.Hidden;
+            _rectRightUp.Visibility = Visibility.Hidden;
+            _rectLeftDown.Visibility = Visibility.Hidden;
+            _rectRightDown.Visibility = Visibility.Hidden;
+            _rectImgBorder.Visibility = Visibility.Hidden;
         }
 
         private void ShowAngleBorder()
         {
             PointLocation();
-            RectLeftUp.Visibility = Visibility.Visible;
-            RectRightUp.Visibility = Visibility.Visible;
-            RectLeftDown.Visibility = Visibility.Visible;
-            RectRightDown.Visibility = Visibility.Visible;
-            RectImgBorder.Visibility = Visibility.Visible;
+            _rectLeftUp.Visibility = Visibility.Visible;
+            _rectRightUp.Visibility = Visibility.Visible;
+            _rectLeftDown.Visibility = Visibility.Visible;
+            _rectRightDown.Visibility = Visibility.Visible;
+            _rectImgBorder.Visibility = Visibility.Visible;
         }
 
         /// <summary>
@@ -74,84 +76,79 @@ namespace XHWK.WKTool.Utils
         /// </summary>
         private void PointLocation()
         {
-            RectImgBorder.Width = imgCanvas.ActualWidth + 10.0;
-            RectImgBorder.Height = imgCanvas.ActualHeight + 10.0;
-            RectImgBorder.Margin = new Thickness(imgCanvas.Margin.Left - 5.0, imgCanvas.Margin.Top - 5.0, 0, 0);
-
-            Canvas.SetLeft(RectLeftUp, imgCanvas.Margin.Left - 10.0);
-            Canvas.SetTop(RectLeftUp, imgCanvas.Margin.Top - 10.0);
-
-            Canvas.SetLeft(RectRightUp, imgCanvas.Margin.Left + imgCanvas.ActualWidth - 10.0);
-            Canvas.SetTop(RectRightUp, imgCanvas.Margin.Top - 10.0);
-
-            Canvas.SetLeft(RectLeftDown, imgCanvas.Margin.Left - 10.0);
-            Canvas.SetTop(RectLeftDown, imgCanvas.Margin.Top + imgCanvas.ActualHeight - 10.0);
-
-            Canvas.SetLeft(RectRightDown, imgCanvas.Margin.Left + imgCanvas.ActualWidth - 10.0);
-            Canvas.SetTop(RectRightDown, imgCanvas.Margin.Top + imgCanvas.ActualHeight - 10.0);
+            _rectImgBorder.Width = _imgCanvas.ActualWidth + 10.0;
+            _rectImgBorder.Height = _imgCanvas.ActualHeight + 10.0;
+            _rectImgBorder.Margin = new Thickness(
+                _imgCanvas.Margin.Left - 5.0,
+                _imgCanvas.Margin.Top - 5.0,
+                0,
+                0
+            );
+            Canvas.SetLeft(_rectLeftUp, _imgCanvas.Margin.Left - 10.0);
+            Canvas.SetTop(_rectLeftUp, _imgCanvas.Margin.Top - 10.0);
+            Canvas.SetLeft(_rectRightUp, _imgCanvas.Margin.Left + _imgCanvas.ActualWidth - 10.0);
+            Canvas.SetTop(_rectRightUp, _imgCanvas.Margin.Top - 10.0);
+            Canvas.SetLeft(_rectLeftDown, _imgCanvas.Margin.Left - 10.0);
+            Canvas.SetTop(_rectLeftDown, _imgCanvas.Margin.Top + _imgCanvas.ActualHeight - 10.0);
+            Canvas.SetLeft(_rectRightDown, _imgCanvas.Margin.Left + _imgCanvas.ActualWidth - 10.0);
+            Canvas.SetTop(_rectRightDown, _imgCanvas.Margin.Top + _imgCanvas.ActualHeight - 10.0);
         }
 
         public void PicEMap_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            System.Windows.Point point = e.GetPosition(imgCanvas);
-            initialPoint = point;
-
+            System.Windows.Point point = e.GetPosition(_imgCanvas);
+            _initialPoint = point;
             HideAngleBorder();
         }
 
         public void imgCanvas_MouseMove(object sender, MouseEventArgs e)
         {
-            if (e.LeftButton == MouseButtonState.Pressed && mouseDown)
+            if (e.LeftButton == MouseButtonState.Pressed && _mouseDown)
             {
-                System.Windows.Point point = e.GetPosition(imgCanvas);
-                imgCanvas.Margin = new Thickness(imgCanvas.Margin.Left + (point.X - initialPoint.X), imgCanvas.Margin.Top + (point.Y - initialPoint.Y), 0, 0);
-                App.PageDrawList[App.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
-                {
-                    X = imgCanvas.Margin.Left,
-                    Y = imgCanvas.Margin.Top
-                };
-                App.PageDrawList[App.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
-                {
-                    CenterX = imgCanvas.ActualWidth,
-                    CenterY = imgCanvas.ActualHeight
-                };
+                System.Windows.Point point = e.GetPosition(_imgCanvas);
+                _imgCanvas.Margin = new Thickness(
+                    _imgCanvas.Margin.Left + (point.X - _initialPoint.X),
+                    _imgCanvas.Margin.Top + (point.Y - _initialPoint.Y),
+                    0,
+                    0
+                );
+                App.PageDrawList[App.PageContextData.currpage - 1].ImageLocation = new TranslateTransform { X = _imgCanvas.Margin.Left, Y = _imgCanvas.Margin.Top };
+                App.PageDrawList[App.PageContextData.currpage - 1].ImageSizes = new ScaleTransform { CenterX = _imgCanvas.ActualWidth, CenterY = _imgCanvas.ActualHeight };
                 App.PageDrawList[App.PageContextData.currpage - 1].IsImageLocation = false;
             }
         }
 
         public void imgCanvas_MouseUp()
         {
-            if (mouseDown)
+            if (_mouseDown)
             {
                 ShowAngleBorder();
             }
         }
 
-        private PointF imgRightDown;
+        private PointF _imgRightDown;
 
         /// <summary>
         /// 设置控件最上层
         /// </summary>
         /// <param name="element">
         /// </param>
-        public void BringToFront(Thumb element)//图片置于最顶层显示
+        public void BringToFront(Thumb element) //图片置于最顶层显示
         {
             if (element == null)
             {
                 return;
             }
-
             Canvas parent = element.Parent as Canvas;
             if (parent == null)
             {
                 return;
             }
-
-            int maxZ = parent.Children.OfType<UIElement>()//linq语句，取Zindex的最大值
-              .Where(x => x != element)
-              .Select(x => Canvas.GetZIndex(x))
-              .Max();
-            Canvas.SetZIndex(element, maxZ + 1);
+            int maxZ = parent.Children.OfType<UIElement>() //linq语句，取Zindex的最大值
+                .Where(x => x != element)
+                .Select(x => Panel.GetZIndex(x))
+                .Max();
+            Panel.SetZIndex(element, maxZ + 1);
         }
 
         public void RectRightUp_DragStarted(object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e)
@@ -160,28 +157,21 @@ namespace XHWK.WKTool.Utils
             {
                 Thumb thu = (Thumb)sender;
                 BringToFront(thu);
-
-                imgRightDown = new System.Drawing.PointF((float)(imgCanvas.Margin.Left + imgCanvas.ActualWidth), (float)(imgCanvas.Margin.Top + imgCanvas.ActualHeight));
+                _imgRightDown = new System.Drawing.PointF((float)(_imgCanvas.Margin.Left + _imgCanvas.ActualWidth), (float)(_imgCanvas.Margin.Top + _imgCanvas.ActualHeight));
                 HideAngleBorder();
                 switch (thu.Name)
                 {
                     case "RectLeftUp":
-                        RectLeftUp.Visibility = Visibility.Visible;
+                        _rectLeftUp.Visibility = Visibility.Visible;
                         break;
-
                     case "RectRightUp":
-                        RectRightUp.Visibility = Visibility.Visible;
+                        _rectRightUp.Visibility = Visibility.Visible;
                         break;
-
                     case "RectLeftDown":
-                        RectLeftDown.Visibility = Visibility.Visible;
+                        _rectLeftDown.Visibility = Visibility.Visible;
                         break;
-
                     case "RectRightDown":
-                        RectRightDown.Visibility = Visibility.Visible;
-                        break;
-
-                    default:
+                        _rectRightDown.Visibility = Visibility.Visible;
                         break;
                 }
             }
@@ -195,134 +185,131 @@ namespace XHWK.WKTool.Utils
         {
             try
             {
-                if (mouseDown)
+                if (_mouseDown)
                 {
                     Thumb thu = (Thumb)sender;
-
-                    #region 判断是否超出 暂无
-
-                    double plul = Canvas.GetLeft(RectLeftUp);
-                    double plut = Canvas.GetTop(RectLeftUp);
-                    double prdl = Canvas.GetLeft(RectRightDown);
-                    double prdt = Canvas.GetTop(RectRightDown);
-
-                    #endregion 判断是否超出 暂无
-
-                    double imgW = 0;
-                    double imgH = 0;
-                    double imgX = 0;
-                    double imgY = 0;
+                    double imgW;
+                    double imgH;
+                    double imgX;
+                    double imgY;
                     switch (thu.Name)
                     {
                         case "RectLeftUp":
 
                             #region 左上
 
-                            imgW = imgRightDown.X - (Mouse.GetPosition(GridM).X);
-                            imgH = imgRightDown.Y - (Mouse.GetPosition(GridM).Y);
-                            imgX = 0;
-                            imgY = 0;
+                            imgW = _imgRightDown.X - (Mouse.GetPosition(_gridM).X);
+                            imgH = _imgRightDown.Y - (Mouse.GetPosition(_gridM).Y);
                             if (imgW < 50)
                             {
-                                imgCanvas.Width = 50;
-                                imgX = imgCanvas.Margin.Left;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(RectRightDown) - 50);
+                                _imgCanvas.Width = 50;
+                                imgX = _imgCanvas.Margin.Left;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(_rectRightDown) - 50);
                             }
                             else
                             {
-                                imgCanvas.Width = imgW;
-                                imgX = Mouse.GetPosition(GridM).X;
+                                _imgCanvas.Width = imgW;
+                                imgX = Mouse.GetPosition(_gridM).X;
                                 Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
                             }
                             if (imgH < 50)
                             {
-                                imgCanvas.Height = 50;
-                                imgY = imgCanvas.Margin.Top;
-                                Canvas.SetTop(thu, Canvas.GetTop(RectRightDown) - 50);
+                                _imgCanvas.Height = 50;
+                                imgY = _imgCanvas.Margin.Top;
+                                Canvas.SetTop(thu, Canvas.GetTop(_rectRightDown) - 50);
                             }
                             else
                             {
-                                imgCanvas.Height = imgH;
-                                imgY = Mouse.GetPosition(GridM).Y;
+                                _imgCanvas.Height = imgH;
+                                imgY = Mouse.GetPosition(_gridM).Y;
                                 Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
                             }
-                            imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+                            _imgCanvas.Margin = new Thickness(
+                                imgX,
+                                imgY,
+                                0,
+                                0
+                            );
 
                             #endregion 左上
 
                             break;
-
                         case "RectRightUp":
 
                             #region 右上
 
-                            imgW = Mouse.GetPosition(GridM).X - imgCanvas.Margin.Left;
-                            imgH = imgRightDown.Y - (Mouse.GetPosition(GridM).Y);
-                            imgX = 0;
-                            imgY = 0;
+                            imgW = Mouse.GetPosition(_gridM).X - _imgCanvas.Margin.Left;
+                            imgH = _imgRightDown.Y - (Mouse.GetPosition(_gridM).Y);
                             if (imgW < 50)
                             {
-                                imgCanvas.Width = 50;
-                                imgX = imgCanvas.Margin.Left;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(RectLeftUp) + 50);
+                                _imgCanvas.Width = 50;
+                                imgX = _imgCanvas.Margin.Left;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(_rectLeftUp) + 50);
                             }
                             else
                             {
-                                imgCanvas.Width = imgW;
-                                imgX = imgCanvas.Margin.Left;
+                                _imgCanvas.Width = imgW;
+                                imgX = _imgCanvas.Margin.Left;
                                 Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
                             }
                             if (imgH < 50)
                             {
-                                imgCanvas.Height = 50;
-                                imgY = imgCanvas.Margin.Top;
-                                Canvas.SetTop(thu, Canvas.GetTop(RectRightDown) - 50);
+                                _imgCanvas.Height = 50;
+                                imgY = _imgCanvas.Margin.Top;
+                                Canvas.SetTop(thu, Canvas.GetTop(_rectRightDown) - 50);
                             }
                             else
                             {
-                                imgCanvas.Height = imgH;
-                                imgY = Mouse.GetPosition(GridM).Y;
+                                _imgCanvas.Height = imgH;
+                                imgY = Mouse.GetPosition(_gridM).Y;
                                 Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
                             }
-                            imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+                            _imgCanvas.Margin = new Thickness(
+                                imgX,
+                                imgY,
+                                0,
+                                0
+                            );
 
                             #endregion 右上
 
                             break;
-
                         case "RectLeftDown":
 
                             #region 左下
 
-                            imgW = imgRightDown.X - (Mouse.GetPosition(GridM).X);
-                            imgH = Mouse.GetPosition(GridM).Y - imgCanvas.Margin.Top;
-                            imgX = 0;
-                            imgY = 0;
+                            imgW = _imgRightDown.X - (Mouse.GetPosition(_gridM).X);
+                            imgH = Mouse.GetPosition(_gridM).Y - _imgCanvas.Margin.Top;
                             if (imgW < 50)
                             {
-                                imgCanvas.Width = 50;
-                                imgX = imgCanvas.Margin.Left;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(RectRightDown) - 50);
+                                _imgCanvas.Width = 50;
+                                imgX = _imgCanvas.Margin.Left;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(_rectRightDown) - 50);
                             }
                             else
                             {
-                                imgCanvas.Width = imgW;
-                                imgX = Mouse.GetPosition(GridM).X;
+                                _imgCanvas.Width = imgW;
+                                imgX = Mouse.GetPosition(_gridM).X;
                                 Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
                             }
                             if (imgH < 50)
                             {
-                                imgCanvas.Height = 50;
-                                imgY = imgCanvas.Margin.Top;
-                                Canvas.SetTop(thu, Canvas.GetTop(RectLeftUp) + 50);
+                                _imgCanvas.Height = 50;
+                                imgY = _imgCanvas.Margin.Top;
+                                Canvas.SetTop(thu, Canvas.GetTop(_rectLeftUp) + 50);
                             }
                             else
                             {
-                                imgCanvas.Height = imgH;
-                                imgY = imgCanvas.Margin.Top;
+                                _imgCanvas.Height = imgH;
+                                imgY = _imgCanvas.Margin.Top;
                                 Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
                             }
-                            imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+                            _imgCanvas.Margin = new Thickness(
+                                imgX,
+                                imgY,
+                                0,
+                                0
+                            );
                             //imgCanvas.Width = imgRightDown.X - (Mouse.GetPosition(GridM).X);
                             //imgCanvas.Height = Mouse.GetPosition(GridM).Y - imgCanvas.Margin.Top;
                             //imgCanvas.Margin = new Thickness(Mouse.GetPosition(GridM).X, imgCanvas.Margin.Top, 0, 0);
@@ -330,31 +317,30 @@ namespace XHWK.WKTool.Utils
                             #endregion 左下
 
                             break;
-
                         case "RectRightDown":
 
                             #region 右下
 
-                            imgW = Mouse.GetPosition(GridM).X - imgCanvas.Margin.Left;
-                            imgH = Mouse.GetPosition(GridM).Y - imgCanvas.Margin.Top;
+                            imgW = Mouse.GetPosition(_gridM).X - _imgCanvas.Margin.Left;
+                            imgH = Mouse.GetPosition(_gridM).Y - _imgCanvas.Margin.Top;
                             if (imgW < 50)
                             {
-                                imgCanvas.Width = 50;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(RectLeftUp) + 50);
+                                _imgCanvas.Width = 50;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(_rectLeftUp) + 50);
                             }
                             else
                             {
-                                imgCanvas.Width = imgW;
+                                _imgCanvas.Width = imgW;
                                 Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
                             }
                             if (imgH < 50)
                             {
-                                imgCanvas.Height = 50;
-                                Canvas.SetTop(thu, Canvas.GetTop(RectLeftUp) + 50);
+                                _imgCanvas.Height = 50;
+                                Canvas.SetTop(thu, Canvas.GetTop(_rectLeftUp) + 50);
                             }
                             else
                             {
-                                imgCanvas.Height = imgH;
+                                _imgCanvas.Height = imgH;
                                 Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
                             }
                             //imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
@@ -364,20 +350,9 @@ namespace XHWK.WKTool.Utils
                             #endregion 右下
 
                             break;
-
-                        default:
-                            break;
                     }
-                    App.PageDrawList[App.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
-                    {
-                        X = imgCanvas.Margin.Left,
-                        Y = imgCanvas.Margin.Top
-                    };
-                    App.PageDrawList[App.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
-                    {
-                        CenterX = imgCanvas.ActualWidth,
-                        CenterY = imgCanvas.ActualHeight
-                    };
+                    App.PageDrawList[App.PageContextData.currpage - 1].ImageLocation = new TranslateTransform { X = _imgCanvas.Margin.Left, Y = _imgCanvas.Margin.Top };
+                    App.PageDrawList[App.PageContextData.currpage - 1].ImageSizes = new ScaleTransform { CenterX = _imgCanvas.ActualWidth, CenterY = _imgCanvas.ActualHeight };
                     App.PageDrawList[App.PageContextData.currpage - 1].IsImageLocation = false;
                 }
             }
@@ -395,10 +370,6 @@ namespace XHWK.WKTool.Utils
         /// <summary>
         /// 点击标题栏 隐藏截图的四个点和线
         /// </summary>
-        /// <param name="sender">
-        /// </param>
-        /// <param name="e">
-        /// </param>
         public void Grid_MouseDown()
         {
             HideAngleBorder();
@@ -407,13 +378,9 @@ namespace XHWK.WKTool.Utils
         /// <summary>
         /// 鼠标左键点击事件
         /// </summary>
-        /// <param name="sender">
-        /// </param>
-        /// <param name="e">
-        /// </param>
         public void Window_MouseLeftButtonDown_1()
         {
-            if (RectImgBorder.Visibility != Visibility.Hidden)
+            if (_rectImgBorder.Visibility != Visibility.Hidden)
             {
                 HideAngleBorder();
             }
@@ -421,4 +388,4 @@ namespace XHWK.WKTool.Utils
 
         #endregion 图片拉伸移动
     }
-}
+}

XHWK.WKTool/system/JsonHelper.cs → XHWK.WKTool/Utils/JsonHelper.cs

@@ -24,11 +24,11 @@ namespace Common.system
         /// 类对像转换成json格式
         /// </summary>
         /// <param name="t"></param>
-        /// <param name="HasNullIgnore">是否忽略NULL值</param>
+        /// <param name="hasNullIgnore">是否忽略NULL值</param>
         /// <returns></returns>
-        public static string ToJson(object t, bool HasNullIgnore)
+        public static string ToJson(object t, bool hasNullIgnore)
         {
-            if (HasNullIgnore)
+            if (hasNullIgnore)
             {
                 return JsonConvert.SerializeObject(t, Newtonsoft.Json.Formatting.Indented, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
             }

XHWK.WKTool/system/KeyboardHookCommon.cs → XHWK.WKTool/Utils/KeyboardHookCommon.cs

@@ -15,10 +15,12 @@ namespace Common.system
         /// 全局按键按下
         /// </summary>
         public event KeyEventHandler KeyDownEvent;
+
         /// <summary>
         /// 窗口按键按下
         /// </summary>
         public event KeyPressEventHandler KeyPressEvent;
+
         /// <summary>
         /// 全局按键抬起
         /// </summary>
@@ -26,8 +28,9 @@ namespace Common.system
 
         public delegate int HookProc(int nCode, int wParam, IntPtr lParam);
 
-        private static int hKeyboardHook = 0; //声明键盘钩子处理的初始值
-                                              //值在Microsoft SDK的Winuser.h里查询
+        private static int _hKeyboardHook; //声明键盘钩子处理的初始值
+
+        //值在Microsoft SDK的Winuser.h里查询
         /// <summary>
         /// 线程键盘钩子监听鼠标消息设为2，全局键盘监听鼠标消息设为13
         /// </summary>
@@ -36,48 +39,62 @@ namespace Common.system
         /// <summary>
         /// 声明KeyboardHookProcedure作为HookProc类型
         /// </summary>
-        private HookProc KeyboardHookProcedure;
+        private HookProc _keyboardHookProcedure;
 
         /// <summary>
         /// 自己创建窗口按键 
         /// </summary>
-        private const int WM_KEYDOWN = 0x100;//KEYDOWN
+        private const int WM_KEYDOWN = 0x100; //KEYDOWN
+
         /// <summary>
         /// 窗口按键抬起
         /// </summary>
-        private const int WM_KEYUP = 0x101;//KEYUP
+        private const int WM_KEYUP = 0x101; //KEYUP
+
         /// <summary>
         /// 全局系统按键
         /// </summary>
-        private const int WM_SYSKEYDOWN = 0x104;//SYSKEYDOWN
+        private const int WM_SYSKEYDOWN = 0x104; //SYSKEYDOWN
+
         /// <summary>
         /// 全局按键抬起
         /// </summary>
-        private const int WM_SYSKEYUP = 0x105;//SYSKEYUP
+        private const int WM_SYSKEYUP = 0x105; //SYSKEYUP
 
         //键盘结构
         [StructLayout(LayoutKind.Sequential)]
         public class KeyboardHookStruct
         {
-            public int vkCode;  //定一个虚拟键码。该代码必须有一个价值的范围1至254
+            public int vkCode; //定一个虚拟键码。该代码必须有一个价值的范围1至254
             public int scanCode; // 指定的硬件扫描码的关键
-            public int flags;  // 键标志
+            public int flags; // 键标志
             public int time; // 指定的时间戳记的这个讯息
             public int dwExtraInfo; // 指定额外信息相关的信息
         }
+
         //使用此功能，安装了一个钩子
         [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
-        public static extern int SetWindowsHookEx(int idHook, HookProc lpfn, IntPtr hInstance, int threadId);
-
+        public static extern int SetWindowsHookEx
+        (
+            int idHook,
+            HookProc lpfn,
+            IntPtr hInstance,
+            int threadId
+        );
 
         //调用此函数卸载钩子
         [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
         public static extern bool UnhookWindowsHookEx(int idHook);
 
-
         //使用此功能，通过信息钩子继续下一个钩子
         [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
-        public static extern int CallNextHookEx(int idHook, int nCode, int wParam, IntPtr lParam);
+        public static extern int CallNextHookEx
+        (
+            int idHook,
+            int nCode,
+            int wParam,
+            IntPtr lParam
+        );
 
         // 取得当前线程编号（线程钩子需要用到）
         [DllImport("kernel32.dll")]
@@ -89,27 +106,34 @@ namespace Common.system
 
         //ToAscii职能的转换指定的虚拟键码和键盘状态的相应字符或字符
         [DllImport("user32")]
-        public static extern int ToAscii(int uVirtKey, //[in] 指定虚拟关键代码进行翻译。
-                                         int uScanCode, // [in] 指定的硬件扫描码的关键须翻译成英文。高阶位的这个值设定的关键，如果是（不压）
-                                         byte[] lpbKeyState, // [in] 指针，以256字节数组，包含当前键盘的状态。每个元素（字节）的数组包含状态的一个关键。如果高阶位的字节是一套，关键是下跌（按下）。在低比特，如果设置表明，关键是对切换。在此功能，只有肘位的CAPS LOCK键是相关的。在切换状态的NUM个锁和滚动锁定键被忽略。
-                                         byte[] lpwTransKey, // [out] 指针的缓冲区收到翻译字符或字符。
-                                         int fuState); // [in] Specifies whether a menu is active. This parameter must be 1 if a menu is active, or 0 otherwise.
+        public static extern int ToAscii
+        (
+            int uVirtKey, //[in] 指定虚拟关键代码进行翻译。
+            int uScanCode, // [in] 指定的硬件扫描码的关键须翻译成英文。高阶位的这个值设定的关键，如果是（不压）
+            byte[] lpbKeyState, // [in] 指针，以256字节数组，包含当前键盘的状态。每个元素（字节）的数组包含状态的一个关键。如果高阶位的字节是一套，关键是下跌（按下）。在低比特，如果设置表明，关键是对切换。在此功能，只有肘位的CAPS LOCK键是相关的。在切换状态的NUM个锁和滚动锁定键被忽略。
+            byte[] lpwTransKey, // [out] 指针的缓冲区收到翻译字符或字符。
+            int fuState
+        ); // [in] Specifies whether a menu is active. This parameter must be 1 if a menu is active, or 0 otherwise.
 
         //获取按键的状态
         [DllImport("user32")]
         public static extern int GetKeyboardState(byte[] pbKeyState);
 
-
         [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
         private static extern short GetKeyState(int vKey);
 
         public void Start()
         {
             // 安装键盘钩子
-            if (hKeyboardHook == 0)
+            if (_hKeyboardHook == 0)
             {
-                KeyboardHookProcedure = new HookProc(KeyboardHookProc);
-                hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProcedure, GetModuleHandle(System.Diagnostics.Process.GetCurrentProcess().MainModule.ModuleName), 0);
+                _keyboardHookProcedure = KeyboardHookProc;
+                _hKeyboardHook = SetWindowsHookEx(
+                    WH_KEYBOARD_LL,
+                    _keyboardHookProcedure,
+                    GetModuleHandle(System.Diagnostics.Process.GetCurrentProcess().MainModule?.ModuleName),
+                    0
+                );
                 //hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProcedure, Marshal.GetHINSTANCE(Assembly.GetExecutingAssembly().GetModules()[0]), 0);
                 //************************************
                 //键盘线程钩子
@@ -126,26 +150,24 @@ namespace Common.system
                 //如果为0，钩子子程与所有的线程关联，即为全局钩子
                 //************************************
                 //如果SetWindowsHookEx失败
-                if (hKeyboardHook == 0)
+                if (_hKeyboardHook == 0)
                 {
                     Stop();
                     throw new Exception("安装键盘钩子失败");
                 }
             }
         }
+
         public void Stop()
         {
             bool retKeyboard = true;
-
-
-            if (hKeyboardHook != 0)
+            if (_hKeyboardHook != 0)
             {
-                retKeyboard = UnhookWindowsHookEx(hKeyboardHook);
-                hKeyboardHook = 0;
+                retKeyboard = UnhookWindowsHookEx(_hKeyboardHook);
+                _hKeyboardHook = 0;
             }
             try
             {
-
                 if (!(retKeyboard))
                 {
                     throw new Exception("卸载钩子失败！");
@@ -153,9 +175,10 @@ namespace Common.system
             }
             catch (Exception)
             {
-
+                // ignored
             }
         }
+
         ////接收SetWindowsHookEx返回值  
         //private static int _hHookValue = 0;
         private int KeyboardHookProc(int nCode, int wParam, IntPtr lParam)
@@ -163,11 +186,11 @@ namespace Common.system
             // 侦听键盘事件
             if ((nCode >= 0) && (KeyDownEvent != null || KeyUpEvent != null || KeyPressEvent != null))
             {
-                KeyboardHookStruct MyKeyboardHookStruct = (KeyboardHookStruct)Marshal.PtrToStructure(lParam, typeof(KeyboardHookStruct));
+                KeyboardHookStruct myKeyboardHookStruct = (KeyboardHookStruct)Marshal.PtrToStructure(lParam, typeof(KeyboardHookStruct));
                 // raise KeyDown
                 if (KeyDownEvent != null && (wParam == WM_KEYDOWN || wParam == WM_SYSKEYDOWN))
                 {
-                    Keys keyData = (Keys)MyKeyboardHookStruct.vkCode;
+                    Keys keyData = (Keys)myKeyboardHookStruct.vkCode;
                     KeyEventArgs e = new KeyEventArgs(keyData);
                     KeyDownEvent(this, e);
                 }
@@ -177,9 +200,15 @@ namespace Common.system
                 {
                     byte[] keyState = new byte[256];
                     GetKeyboardState(keyState);
-
                     byte[] inBuffer = new byte[2];
-                    if (ToAscii(MyKeyboardHookStruct.vkCode, MyKeyboardHookStruct.scanCode, keyState, inBuffer, MyKeyboardHookStruct.flags) == 1)
+                    if (ToAscii(
+                            myKeyboardHookStruct.vkCode,
+                            myKeyboardHookStruct.scanCode,
+                            keyState,
+                            inBuffer,
+                            myKeyboardHookStruct.flags
+                        ) ==
+                        1)
                     {
                         KeyPressEventArgs e = new KeyPressEventArgs((char)inBuffer[0]);
                         KeyPressEvent(this, e);
@@ -189,20 +218,24 @@ namespace Common.system
                 // 键盘抬起
                 if (KeyUpEvent != null && (wParam == WM_KEYUP || wParam == WM_SYSKEYUP))
                 {
-                    Keys keyData = (Keys)MyKeyboardHookStruct.vkCode;
+                    Keys keyData = (Keys)myKeyboardHookStruct.vkCode;
                     KeyEventArgs e = new KeyEventArgs(keyData);
                     KeyUpEvent(this, e);
                 }
-
             }
             //如果返回1，则结束消息，这个消息到此为止，不再传递。
             //如果返回0或调用CallNextHookEx函数则消息出了这个钩子继续往下传递，也就是传给消息真正的接受者
-            return CallNextHookEx(hKeyboardHook, nCode, wParam, lParam);
+            return CallNextHookEx(
+                _hKeyboardHook,
+                nCode,
+                wParam,
+                lParam
+            );
         }
+
         ~KeyboardHookCommon()
         {
             Stop();
         }
-
     }
-}
+}

XHWK.WKTool/system/LatticeFileHelper.cs → XHWK.WKTool/Utils/LatticeFileHelper.cs

@@ -17,51 +17,62 @@ namespace Common.system
         /// <summary>
         /// 打印进程
         /// </summary>
-        public static Process PrintProcess = null;
+        public static Process PrintProcess;
 
         /// <summary>
         /// 输出日志文件地址  每个文件2MB左右
         /// </summary>
-        private static string LogPath = "";
+        private static string _logPath = "";
+
         /// <summary>
         /// 运行配置 首次打开必须运行
         /// </summary>
         public static void RunPrintConfig()
         {
-            string Path = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintConfig.exe");
+            string path = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintConfig.exe");
             Process myProcess = new Process();
-            LogPath = CreateLog();
-            myProcess.StartInfo.FileName = Path;   //绝对路径
+            _logPath = CreateLog();
+            myProcess.StartInfo.FileName = path; //绝对路径
             //myProcess.StartInfo.Arguments = "";
-            myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
-            myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
-            myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
-            myProcess.StartInfo.RedirectStandardInput = true;      //用于模拟该进程控制台的输入
+            myProcess.StartInfo.UseShellExecute = false; //不使用操作系统外壳程序启动
+            myProcess.StartInfo.RedirectStandardError = true; //重定向标准错误输出
+            myProcess.StartInfo.CreateNoWindow = true; //不显示程序窗口
+            myProcess.StartInfo.RedirectStandardInput = true; //用于模拟该进程控制台的输入
             //外部程序(这里是FFMPEG)输出流时候产生的事件,这里是把流的处理过程转移到下面的方法中,详细请查阅MSDN
-            myProcess.ErrorDataReceived += new DataReceivedEventHandler(Output);
-            myProcess.Start();                 //启动线程
-            myProcess.BeginErrorReadLine();    //开始异步读取
-            myProcess.WaitForExit();           //阻塞等待进程结束
-            myProcess.Close();                 //关闭进程
-            myProcess.Dispose();               //释放资源
+            myProcess.ErrorDataReceived += Output;
+            myProcess.Start(); //启动线程
+            myProcess.BeginErrorReadLine(); //开始异步读取
+            myProcess.WaitForExit(); //阻塞等待进程结束
+            myProcess.Close(); //关闭进程
+            myProcess.Dispose(); //释放资源
         }
 
         /// <summary>
         /// 生成点阵打印文件
         /// </summary>
-        /// <param name="PDFPath">PDF文件位置</param>
-        /// <param name="SavePath">保存文件位置 TPF</param>
-        /// <param name="PrintResult">输出结果，非0为失败</param>
-        /// <param name="StandardError">错误信息</param>
-        /// <param name="StandardOutput">输出信息["1536.688.35.70","1536.688.35.71","1536.688.35.72"]</param>
-        /// <param name="PointType">0 为方点，1 为圆点 默认方点</param>
-        public static void GeneratingPDF(string PDFPath, string SavePath, out int PrintResult, out string StandardError, out string StandardOutput, int PointType = 0)
+        /// <param name="pdfPath">PDF文件位置</param>
+        /// <param name="savePath">保存文件位置 TPF</param>
+        /// <param name="printResult">输出结果，非0为失败</param>
+        /// <param name="standardError">错误信息</param>
+        /// <param name="standardOutput">输出信息["1536.688.35.70","1536.688.35.71","1536.688.35.72"]</param>
+        /// <param name="pointType">0 为方点，1 为圆点 默认方点</param>
+        public static void GeneratingPdf
+        (
+            string pdfPath,
+            string savePath,
+            out int printResult,
+            out string standardError,
+            out string standardOutput,
+            int pointType = 0
+        )
         {
             //XML点阵文件位置
-            string XmlFile = FileToolsCommon.GetFileAbsolutePath("/LatticeXML/print_license.xml");
-            string ContentParameter = null;
-            ContentParameter = "-sMode=Generate \"-sPDF=" + PDFPath + "\" \"-sLIC=" + XmlFile + "\" \"-oTPF=" + SavePath + "\" \"-dType=" + PointType + "\" ";//[-dType=0] [-dPrint=0] [-pStart=0]
+            string xmlFile = FileToolsCommon.GetFileAbsolutePath("/LatticeXML/print_license.xml");
+            string contentParameter;
+            contentParameter = "-sMode=Generate \"-sPDF=" + pdfPath + "\" \"-sLIC=" + xmlFile + "\" \"-oTPF=" + savePath + "\" \"-dType=" + pointType + "\" "; //[-dType=0] [-dPrint=0] [-pStart=0]
+
             #region 制作点阵文件参数说明
+
             //-sMode = Generate - sPDF = d:\l\e.pdf - sLIC = d:\l\a.xml - oPDF = d:\l\11210.pdf"
             //当 - sMode = Generate，参数如下：
             //PrintTool.exe - sMode = Generate - sPDF = -sLIC = < -oPDF =| -oTPF=> [dType=] [-dPrint] [-pStart =]
@@ -72,96 +83,111 @@ namespace Common.system
             //- dType 0 为方点，1 为圆点；可选参数，默认 0。详细参数区别，参见 3.1 点阵形状
             //- dPrint 0 为激光打印机，1 为印刷机；可选参数，默认 0。详细参数区别，参见 3.2 点阵 PDF 适用打印场景
             //- pStart 整数，选择从哪页点阵资源开始制作点阵文件， 即起始点阵资源页序号；可选参数，默认0。关于 - pStart 的功能说明，参见 1.3.1.高级设置
+
             #endregion
+
             while (PrintProcess != null)
             {
                 Thread.Sleep(100);
             }
-            Process[] KillProcessArray = Process.GetProcessesByName("PrintTool");
-            foreach (Process KillProcess in KillProcessArray)
+            Process[] killProcessArray = Process.GetProcessesByName("PrintTool");
+            foreach (Process killProcess in killProcessArray)
             {
-                KillProcess.Kill();
+                killProcess.Kill();
             }
             PrintProcess = new Process();
-            LogPath = CreateLog();
-            PrintProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintTool.exe");   //绝对路径
-            PrintProcess.StartInfo.Arguments = ContentParameter;
-            PrintProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
-            PrintProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
+            _logPath = CreateLog();
+            PrintProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintTool.exe"); //绝对路径
+            PrintProcess.StartInfo.Arguments = contentParameter;
+            PrintProcess.StartInfo.UseShellExecute = false; //不使用操作系统外壳程序启动
+            PrintProcess.StartInfo.RedirectStandardError = true; //重定向标准错误输出
             PrintProcess.StartInfo.RedirectStandardOutput = true;
-            PrintProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
-            PrintProcess.StartInfo.RedirectStandardInput = true;      //用于模拟该进程控制台的输入
+            PrintProcess.StartInfo.CreateNoWindow = true; //不显示程序窗口
+            PrintProcess.StartInfo.RedirectStandardInput = true; //用于模拟该进程控制台的输入
             //外部程序(这里是FFMPEG)输出流时候产生的事件,这里是把流的处理过程转移到下面的方法中,详细请查阅MSDN
-            PrintProcess.ErrorDataReceived += new DataReceivedEventHandler(Output);
-            PrintProcess.Start();                 //启动线程
-            PrintProcess.WaitForExit();           //阻塞等待进程结束
-            StandardError = PrintProcess.StandardError.ReadToEnd();
-            StandardOutput = PrintProcess.StandardOutput.ReadToEnd();
+            PrintProcess.ErrorDataReceived += Output;
+            PrintProcess.Start(); //启动线程
+            PrintProcess.WaitForExit(); //阻塞等待进程结束
+            standardError = PrintProcess.StandardError.ReadToEnd();
+            standardOutput = PrintProcess.StandardOutput.ReadToEnd();
             //PrintProcess.BeginErrorReadLine();    //开始异步读取
-            Output("【制作点阵文件】错误：" + StandardError);
-            Output("【制作点阵文件】返回信息：" + StandardOutput);
-            PrintResult = PrintProcess.ExitCode;     //打印结果 非0则为打印失败
-            Output("【制作点阵文件】" + ContentParameter);//记录打印日志
-            PrintProcess.Close();                 //关闭进程
-            PrintProcess.Dispose();               //释放资源
+            Output("【制作点阵文件】错误：" + standardError);
+            Output("【制作点阵文件】返回信息：" + standardOutput);
+            printResult = PrintProcess.ExitCode; //打印结果 非0则为打印失败
+            Output("【制作点阵文件】" + contentParameter); //记录打印日志
+            PrintProcess.Close(); //关闭进程
+            PrintProcess.Dispose(); //释放资源
+
             #region 进程是否已经释放
-            bool IsRunning = true;
-            while (IsRunning)
+
+            bool isRunning = true;
+            while (isRunning)
             {
-                IsRunning = false;
-                Process[] ProcessArray = Process.GetProcessesByName("PrintTool");
-                foreach (Process KillProcess in ProcessArray)
+                isRunning = false;
+                Process[] processArray = Process.GetProcessesByName("PrintTool");
+                if (processArray.Length > 0)
                 {
-                    IsRunning = true;
+                    isRunning = true;
                     Thread.Sleep(100);
                 }
             }
+
             #endregion
+
             PrintProcess = null;
         }
 
         /// <summary>
         /// 获取打印机列表
         /// </summary>
-        /// <param name="DefaultPrinter">默认打印机</param>
+        /// <param name="defaultPrinter">默认打印机</param>
         /// <returns>打印机列表</returns>
-        public static List<string> GetPrinterList(out string DefaultPrinter)
+        public static List<string> GetPrinterList(out string defaultPrinter)
         {
-            List<string> PrintersList = new List<string>();
-            DefaultPrinter = null;
+            List<string> printersList = new List<string>();
+            defaultPrinter = null;
             try
             {
                 PrintDocument print = new PrintDocument();
-                DefaultPrinter = print.PrinterSettings.PrinterName;//默认打印机名
-                foreach (string sPrint in PrinterSettings.InstalledPrinters)//获取所有打印机名称
+                defaultPrinter = print.PrinterSettings.PrinterName; //默认打印机名
+                foreach (string sPrint in PrinterSettings.InstalledPrinters) //获取所有打印机名称
                 {
-                    PrintersList.Add(sPrint);
+                    printersList.Add(sPrint);
                 }
             }
             catch (Exception)
             {
-
+                // ignored
             }
-            return PrintersList;
+            return printersList;
         }
 
         /// <summary>
         /// 打印TPF点阵文件
         /// </summary>
-        /// <param name="TPFPath">TPF路径</param>
-        /// <param name="PrinterNum">打印份数</param>
-        /// <param name="PrinterName">打印机名称</param>
-        /// <param name="PrintResult">输出结果，非0为失败</param>
-        /// <param name="StandardError">错误信息</param>
-        /// <param name="StandardOutput">输出信息</param>
-        public static void PrinterTPFFile(string TPFPath, int PrinterNum, string PrinterName, out int PrintResult, out string StandardError, out string StandardOutput)
+        /// <param name="tpfPath">TPF路径</param>
+        /// <param name="printerNum">打印份数</param>
+        /// <param name="printerName">打印机名称</param>
+        /// <param name="printResult">输出结果，非0为失败</param>
+        /// <param name="standardError">错误信息</param>
+        /// <param name="standardOutput">输出信息</param>
+        public static void PrinterTpfFile
+        (
+            string tpfPath,
+            int printerNum,
+            string printerName,
+            out int printResult,
+            out string standardError,
+            out string standardOutput
+        )
         {
-            TPFPath = TPFPath.Replace("/", "\\");
+            tpfPath = tpfPath.Replace("/", "\\");
             //XML点阵文件位置
             //string XmlFile = FileToolsCommon.GetFileAbsolutePath("/LatticeXML/print_license.xml");
-            string ContentParameter = null;
-            ContentParameter = " -sMode=Print \"-sTPF=" + TPFPath + "\" \"-sPrinter=" + PrinterName + "\" \"-dCopy=" + PrinterNum + "\"";//\"-dPaperSize=9\"
+            string contentParameter = " -sMode=Print \"-sTPF=" + tpfPath + "\" \"-sPrinter=" + printerName + "\" \"-dCopy=" + printerNum + "\""; //\"-dPaperSize=9\"
+
             #region 打印参数说明
+
             //-sMode = Print，参数如下：
             //PrintTool.exe - sMode = Print - sTPF = [-dCopy =][-dPaperSize =] - sPrinter =
             //-sTPF 需要打印的 TPF 文件路径
@@ -171,51 +197,57 @@ namespace Common.system
             //- sPrinter 打印机名称
             // 打印完成后，如果打印成功，PrintTool.exe 退出值为 0。
             //如果打印失败，程序退出值为非 0。
+
             #endregion
+
             while (PrintProcess != null)
             {
                 Thread.Sleep(100);
             }
-            Process[] KillProcessArray = Process.GetProcessesByName("PrintTool");
-            foreach (Process KillProcess in KillProcessArray)
+            Process[] killProcessArray = Process.GetProcessesByName("PrintTool");
+            foreach (Process killProcess in killProcessArray)
             {
-                KillProcess.Kill();
+                killProcess.Kill();
             }
             PrintProcess = new Process();
-            LogPath = CreateLog();
-            PrintProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintTool.exe").Replace("/", "\\"); ;   //绝对路径
-            PrintProcess.StartInfo.Arguments = ContentParameter;
-            PrintProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
-            PrintProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
+            _logPath = CreateLog();
+            PrintProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintTool.exe").Replace("/", "\\");
+            PrintProcess.StartInfo.Arguments = contentParameter;
+            PrintProcess.StartInfo.UseShellExecute = false; //不使用操作系统外壳程序启动
+            PrintProcess.StartInfo.RedirectStandardError = true; //重定向标准错误输出
             PrintProcess.StartInfo.RedirectStandardOutput = true;
-            PrintProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
-            PrintProcess.StartInfo.RedirectStandardInput = true;      //用于模拟该进程控制台的输入
+            PrintProcess.StartInfo.CreateNoWindow = true; //不显示程序窗口
+            PrintProcess.StartInfo.RedirectStandardInput = true; //用于模拟该进程控制台的输入
             //外部程序(这里是FFMPEG)输出流时候产生的事件,这里是把流的处理过程转移到下面的方法中,详细请查阅MSDN
-            PrintProcess.ErrorDataReceived += new DataReceivedEventHandler(Output);
-            PrintProcess.Start();                 //启动线程
+            PrintProcess.ErrorDataReceived += Output;
+            PrintProcess.Start(); //启动线程
             //PrintProcess.BeginErrorReadLine();    //开始异步读取
-            PrintProcess.WaitForExit();           //阻塞等待进程结束
-            StandardError = PrintProcess.StandardError.ReadToEnd();
-            StandardOutput = PrintProcess.StandardOutput.ReadToEnd();
-            Output("【制作点阵文件】错误：" + StandardError);
-            Output("【制作点阵文件】返回信息：" + StandardOutput);
-            PrintResult = PrintProcess.ExitCode;     //打印结果 非0则为打印失败
-            Output("【打印TPF文件】" + ContentParameter);//记录打印日志
-            PrintProcess.Close();                 //关闭进程
-            PrintProcess.Dispose();               //释放资源
+            PrintProcess.WaitForExit(); //阻塞等待进程结束
+            standardError = PrintProcess.StandardError.ReadToEnd();
+            standardOutput = PrintProcess.StandardOutput.ReadToEnd();
+            Output("【制作点阵文件】错误：" + standardError);
+            Output("【制作点阵文件】返回信息：" + standardOutput);
+            printResult = PrintProcess.ExitCode; //打印结果 非0则为打印失败
+            Output("【打印TPF文件】" + contentParameter); //记录打印日志
+            PrintProcess.Close(); //关闭进程
+            PrintProcess.Dispose(); //释放资源
+
             #region 进程是否已经释放
-            bool IsRunning = true;
-            while (IsRunning)
+
+            bool isRunning = true;
+            while (isRunning)
             {
-                IsRunning = false;
-                Process[] ProcessArray = Process.GetProcessesByName("PrintTool");
-                foreach (Process KillProcess in ProcessArray)
+                isRunning = false;
+                Process[] processArray = Process.GetProcessesByName("PrintTool");
+                if (processArray.Length > 0)
                 {
-                    IsRunning = true;
+                    isRunning = true;
                     Thread.Sleep(100);
                 }
             }
+
             #endregion
+
             PrintProcess = null;
         }
 
@@ -225,52 +257,52 @@ namespace Common.system
         /// <returns></returns>
         private static string CreateLog()
         {
-            string LogFileName = DateTime.Now.ToString("yyyyMMdd");
-            string LogFilePath = FileToolsCommon.GetFileAbsolutePath("/Log/PrintLog/");
-            FileToolsCommon.CreateDirectory(LogFilePath);
-            string LogName = LogFilePath + LogFileName + ".log";
+            string logFileName = DateTime.Now.ToString("yyyyMMdd");
+            string logFilePath = FileToolsCommon.GetFileAbsolutePath("/Log/PrintLog/");
+            FileToolsCommon.CreateDirectory(logFilePath);
+            string logName = logFilePath + logFileName + ".log";
             try
             {
-                if (!FileToolsCommon.IsExistFile(LogName))
+                if (!FileToolsCommon.IsExistFile(logName))
                 {
-                    FileToolsCommon.CreateFile(LogName);
+                    FileToolsCommon.CreateFile(logName);
                     //FileToolsCommon.AppendText(LogName, "\r\n****************************************************************************************************" +
                     //    "****************************************************************************************************\r\n");
-                    return LogName;
+                    return logName;
                 }
                 else
                 {
                     int num = 0;
-                    while (FileToolsCommon.GetFileSizeByMb(LogName) > 2)
+                    while (FileToolsCommon.GetFileSizeByMb(logName) > 2)
                     {
                         num++;
-                        LogName = LogFilePath + LogFileName + "_" + num + ".log";
-                        FileToolsCommon.CreateFile(LogName);
+                        logName = logFilePath + logFileName + "_" + num + ".log";
+                        FileToolsCommon.CreateFile(logName);
                     }
                     //FileToolsCommon.AppendText(LogName, "\r\n****************************************************************************************************" +
                     //    "****************************************************************************************************\r\n");
-                    return LogName;
+                    return logName;
                 }
             }
             catch (Exception)
             {
-                return LogName;
+                return logName;
             }
         }
 
         /// <summary>
         /// 输出日志
         /// </summary>
-        /// <param name="Message"></param>
-        private static void Output(string Message)
+        /// <param name="message"></param>
+        private static void Output(string message)
         {
-            if (!string.IsNullOrEmpty(Message))
+            if (!string.IsNullOrEmpty(message))
             {
-                FileToolsCommon.AppendText(LogPath, Message + "\r\n");
-                FileToolsCommon.AppendText(LogPath, "\r\n****************************************************************************************************" +
-                         "****************************************************************************************************\r\n");
+                FileToolsCommon.AppendText(_logPath, message + "\r\n");
+                FileToolsCommon.AppendText(_logPath, "\r\n****************************************************************************************************" + "****************************************************************************************************\r\n");
             }
         }
+
         /// <summary>
         /// 输出结果
         /// </summary>
@@ -281,4 +313,4 @@ namespace Common.system
             Output(output.Data);
         }
     }
-}
+}

XHWK.WKTool/system/LogHelper.cs → XHWK.WKTool/Utils/LogHelper.cs

@@ -5,8 +5,6 @@ using System.IO;
 
 namespace Common.system
 {
-    using XHWK.WKTool.system;
-
     public class LogHelper
     {
         public static readonly log4net.ILog Loginfo = log4net.LogManager.GetLogger("loginfo");

XHWK.WKTool/system/MouseEventCommon.cs → XHWK.WKTool/Utils/MouseEventCommon.cs

@@ -20,11 +20,8 @@ namespace Common.system
 
         /// <summary>   
         /// 获取鼠标的坐标   
-        /// </summary>   
-        /// <param name="lpPoint">传址参数，坐标point类型</param>   
+        /// </summary>
         /// <returns>获取成功返回真</returns>   
-
-
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
         public static extern bool GetCursorPos(out POINT pt);
 

XHWK.WKTool/system/PdfTrunImage.cs → XHWK.WKTool/Utils/PdfTrunImage.cs

@@ -32,8 +32,16 @@ namespace Common.system
         /// <param name="endPageNum">从PDF文档的第几页开始停止转换</param>
         /// <param name="imageFormat">设置所需图片格式</param>
         /// <param name="definition">设置图片的清晰度，数字越大越清晰</param>
-        public static List<string> ConvertPDF2Image(string pdfInputPath, string imageOutputPath,
-            string imageName, int startPageNum, int endPageNum, ImageFormat imageFormat, Definition definition)
+        public static List<string> ConvertPdf2Image
+        (
+            string pdfInputPath,
+            string imageOutputPath,
+            string imageName,
+            int startPageNum,
+            int endPageNum,
+            ImageFormat imageFormat,
+            Definition definition
+        )
         {
             List<string> images = new List<string>();
             try
@@ -57,7 +65,6 @@ namespace Common.system
                 }
                 if (startPageNum > endPageNum)
                 {
-                    int tempPageNum = startPageNum;
                     startPageNum = endPageNum;
                     endPageNum = startPageNum;
                 }
@@ -66,7 +73,7 @@ namespace Common.system
                 for (int i = startPageNum; i <= endPageNum; i++)
                 {
                     Bitmap pageImage = pdfFile.GetPageImage(i - 1, 56 * (int)definition);
-                    string imgPath = imageOutputPath + imageName + i.ToString() + "." + imageFormat.ToString();
+                    string imgPath = imageOutputPath + imageName + i.ToString() + "." + imageFormat;
                     pageImage.Save(imgPath, imageFormat);
                     images.Add(imgPath);
                     // 返回的图片绝对路径集合
@@ -78,8 +85,7 @@ namespace Common.system
             }
             catch (System.Exception ex)
             {
-                LogHelper.Logerror.Error("PDF转图片" +
-                    "【PdfTrunImage】" + ex.Message, ex);
+                LogHelper.Logerror.Error("PDF转图片" + "【PdfTrunImage】" + ex.Message, ex);
                 images = new List<string>();
                 return images;
             }

XHWK.WKTool/system/PrimaryScreen.cs → XHWK.WKTool/Utils/PrimaryScreen.cs

@@ -78,9 +78,9 @@ namespace Common.system
             get
             {
                 IntPtr hdc = GetDC(IntPtr.Zero);
-                int DpiX = GetDeviceCaps(hdc, LOGPIXELSX);
+                int dpiX = GetDeviceCaps(hdc, LOGPIXELSX);
                 ReleaseDC(IntPtr.Zero, hdc);
-                return DpiX;
+                return dpiX;
             }
         }
         /// <summary>
@@ -91,9 +91,9 @@ namespace Common.system
             get
             {
                 IntPtr hdc = GetDC(IntPtr.Zero);
-                int DpiX = GetDeviceCaps(hdc, LOGPIXELSY);
+                int dpiX = GetDeviceCaps(hdc, LOGPIXELSY);
                 ReleaseDC(IntPtr.Zero, hdc);
-                return DpiX;
+                return dpiX;
             }
         }
         /// <summary>
@@ -126,9 +126,9 @@ namespace Common.system
                 GetDeviceCaps(hdc, DESKTOPHORZRES);
                 /* int d = */
                 GetDeviceCaps(hdc, HORZRES);
-                float ScaleX = GetDeviceCaps(hdc, DESKTOPHORZRES) / (float)GetDeviceCaps(hdc, HORZRES);
+                float mScaleX = GetDeviceCaps(hdc, DESKTOPHORZRES) / (float)GetDeviceCaps(hdc, HORZRES);
                 ReleaseDC(IntPtr.Zero, hdc);
-                return ScaleX;
+                return mScaleX;
             }
         }
         /// <summary>
@@ -139,9 +139,9 @@ namespace Common.system
             get
             {
                 IntPtr hdc = GetDC(IntPtr.Zero);
-                float ScaleY = (float)GetDeviceCaps(hdc, DESKTOPVERTRES) / GetDeviceCaps(hdc, VERTRES);
+                float scaleY = (float)GetDeviceCaps(hdc, DESKTOPVERTRES) / GetDeviceCaps(hdc, VERTRES);
                 ReleaseDC(IntPtr.Zero, hdc);
-                return ScaleY;
+                return scaleY;
             }
         }
 
@@ -158,7 +158,12 @@ namespace Common.system
             get
             {
                 RectangleF rect = System.Windows.Forms.Screen.GetWorkingArea(new System.Drawing.Point((int)ScaleScreenSize.Width, (int)ScaleScreenSize.Height));
-                return new RectangleF(((float)rect.X) / (DpiX / 96f), ((float)rect.Y) / (DpiX / 96f), ((float)rect.Width) / (DpiX / 96f), ((float)rect.Height) / (DpiY / 96f));
+                return new RectangleF(
+                    rect.X / (DpiX / 96f),
+                    rect.Y / (DpiX / 96f),
+                    rect.Width / (DpiX / 96f),
+                    rect.Height / (DpiY / 96f)
+                );
             }
         }
         #endregion

XHWK.WKTool/system/QueueSync.cs → XHWK.WKTool/Utils/QueueSync.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Common.system
 {
@@ -14,25 +10,8 @@ namespace Common.system
     /// <typeparam name="T"></typeparam>
     public class QueueSync<T>
     {
-        int _maxcount = 10000;
-        Queue<T> _queue = new Queue<T>();
-        /// <summary>
-        /// 获取该队列包含的元素数
-        /// </summary>
-        public int Count
-        {
-            get
-            {
-                if (_queue == null)
-                {
-                    return 0;
-                }
-                else
-                {
-                    return _queue.Count;
-                }
-            }
-        }
+        int _maxcount;
+        private Queue<T> _queue = new Queue<T>();
 
         /// <summary>
         /// 默认1000
@@ -45,7 +24,6 @@ namespace Common.system
         /// <param name="maxcount"></param>
         public QueueSync(int maxcount)
         {
-            //_maxcount = Math.Max(maxcount, _maxcount);
             _maxcount = maxcount;
         }
 
@@ -56,7 +34,6 @@ namespace Common.system
         /// <returns></returns>
         public bool Enqueue(T obj)
         {
-            bool result = false;
             lock (this)
             {
                 if (_queue.Count > _maxcount)
@@ -64,9 +41,8 @@ namespace Common.system
                     _queue.Dequeue();
                 }
                 _queue.Enqueue(obj);
-                result = true;
             }
-            return result;
+            return true;
         }
         /// <summary>
         /// 出队列
@@ -83,7 +59,7 @@ namespace Common.system
                 }
                 catch
                 {
-
+                    // ignored
                 }
             }
             return obj;

XHWK.WKTool/Utils/SplashScreen.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Reflection;
+using System.Threading;
+using System.Windows.Forms;
+
+namespace Common.system
+{
+    /// <summary>
+    /// 解决闪屏  加载等待 
+    /// 创建人：赵耀
+    /// 创建时间：2018年11月27日
+    /// </summary>
+    public class SplashScreen
+    {
+        private static object _obj = new object();
+
+        private static Form _splashForm;
+
+        private static Thread _splashThread;
+
+        private delegate void ChangeFormTextdelegate(string s);
+
+        public static void Show(Type splashFormType)
+        {
+            if (_splashThread != null)
+            {
+                return;
+            }
+
+            if (splashFormType == null)
+            {
+                throw (new Exception());
+            }
+            _splashThread = new Thread(
+                delegate()
+                {
+                    CreateInstance(splashFormType);
+                    Application.Run(_splashForm);
+                }
+            ) { IsBackground = true };
+            _splashThread.SetApartmentState(ApartmentState.STA);
+            _splashThread.Start();
+        }
+
+        public static void ChangeTitle(string status)
+        {
+            ChangeFormTextdelegate de = ChangeText;
+            _splashForm.Invoke(de, status);
+        }
+
+
+
+        public static void Close()
+        {
+            if (_splashThread == null || _splashForm == null)
+            {
+                return;
+            }
+            try
+            {
+                _splashForm.Invoke(new MethodInvoker(_splashForm.Close));
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+            _splashThread = null;
+            _splashForm = null;
+        }
+
+        private static void ChangeText(string title)
+        {
+            _splashForm.Text = title;
+        }
+
+        private static void CreateInstance(Type formType)
+        {
+            if (_splashForm == null)
+            {
+                lock (_obj)
+                {
+                    object obj = formType.InvokeMember(
+                        null,
+                        BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.CreateInstance,
+                        null,
+                        null,
+                        null
+                    );
+                    _splashForm = obj as Form;
+                    if (_splashForm != null)
+                    {
+                        _splashForm.TopMost = true;
+                        _splashForm.ShowInTaskbar = false;
+                        _splashForm.BringToFront();
+                        _splashForm.StartPosition = FormStartPosition.CenterScreen;
+                    }
+                }
+            }
+        }
+
+    }
+}

XHWK.WKTool/system/XmlUtilHelper.cs → XHWK.WKTool/Utils/XmlUtilHelper.cs

@@ -36,11 +36,12 @@ namespace Common.system
                 return null;
             }
         }
+
         /// <summary>
         /// 反序列化
         /// </summary>
         /// <param name="type"></param>
-        /// <param name="xml"></param>
+        /// <param name="stream"></param>
         /// <returns></returns>
         public static object Deserialize(Type type, Stream stream)
         {
@@ -48,17 +49,18 @@ namespace Common.system
 
             return xmldes.Deserialize(stream);
         }
+
         /// <summary>
         /// 反序列化实体
         /// </summary>
         /// <typeparam name="T"></typeparam>
-        /// <param name="strXML"></param>
+        /// <param name="strXml"></param>
         /// <returns></returns>
-        public static T DESerializer<T>(string strXML) where T : class
+        public static T DeSerializer<T>(string strXml) where T : class
         {
             try
             {
-                using (StringReader sr = new StringReader(strXML))
+                using (StringReader sr = new StringReader(strXml))
                 {
                     XmlSerializer serializer = new XmlSerializer(typeof(T));
                     return serializer.Deserialize(sr) as T;
@@ -72,8 +74,7 @@ namespace Common.system
 
         /// <summary>  
         /// 从xml序列中反序列化  
-        /// </summary>  
-        /// <param name="objname"></param>  
+        /// </summary>
         /// <returns></returns>  
         public static object Deserailize(Type type, string filename)
         {
@@ -107,17 +108,17 @@ namespace Common.system
         {
             if (!string.IsNullOrEmpty(xmlStr))
             {
-                StringReader StrStream = null;
-                XmlTextReader Xmlrdr = null;
+                StringReader strStream = null;
+                XmlTextReader xmlrdr = null;
                 try
                 {
                     DataSet ds = new DataSet();
                     //读取字符串中的信息  
-                    StrStream = new StringReader(xmlStr);
+                    strStream = new StringReader(xmlStr);
                     //获取StrStream中的数据  
-                    Xmlrdr = new XmlTextReader(StrStream);
+                    xmlrdr = new XmlTextReader(strStream);
                     //ds获取Xmlrdr中的数据                 
-                    ds.ReadXml(Xmlrdr);
+                    ds.ReadXml(xmlrdr);
                     return ds.Tables[0];
                 }
                 catch (Exception)
@@ -127,11 +128,11 @@ namespace Common.system
                 finally
                 {
                     //释放资源  
-                    if (Xmlrdr != null)
+                    if (xmlrdr != null)
                     {
-                        Xmlrdr.Close();
-                        StrStream.Close();
-                        StrStream.Dispose();
+                        xmlrdr.Close();
+                        strStream.Close();
+                        strStream.Dispose();
                     }
                 }
             }
@@ -151,7 +152,6 @@ namespace Common.system
         {
             using (StringWriter sw = new StringWriter())
             {
-                Type t = obj.GetType();
                 XmlSerializer serializer = new XmlSerializer(obj.GetType());
                 serializer.Serialize(sw, obj);
                 sw.Close();
@@ -166,24 +166,23 @@ namespace Common.system
         /// <returns></returns>
         public static string Serializer(Type type, object obj)
         {
-            MemoryStream Stream = new MemoryStream();
+            MemoryStream stream = new MemoryStream();
             XmlSerializer xml = new XmlSerializer(type);
             try
             {
                 //序列化对象
-                xml.Serialize(Stream, obj);
+                xml.Serialize(stream, obj);
             }
             catch (InvalidOperationException)
             {
                 //Logger.Log4NetHelp.Error("序列化失败:", ex);
             }
-            Stream.Position = 0;
-            StreamReader sr = new StreamReader(Stream);
+            stream.Position = 0;
+            StreamReader sr = new StreamReader(stream);
             string str = sr.ReadToEnd();
 
             sr.Dispose();
-            Stream.Dispose();
-
+            stream.Dispose();
             return str;
         }
 

XHWK.WKTool/Utils/ZAsposeUtil.cs

@@ -14,14 +14,15 @@ namespace XHWK.WKTool.Utils
         /// 将Word文档转换为图片的方法（该方法基于第三方DLL），
         /// 你可以像这样调用该方法： ConvertPDF2Image("F:\\PdfFile.doc", "F:\\","ImageFile", 1, 20);
         /// </summary>
-        /// <param name="pdfInputPath">Word文件路径</param>
+        /// <param name="wordInputPath"></param>
         /// <param name="imageOutputPath">图片输出路径，如果为空，默认值为Word所在路径</param>
         /// <param name="imageName">图片的名字，不需要带扩展名，如果为空，默认值为Word的名称</param>
         /// <param name="startPageNum">从PDF文档的第几页开始转换，如果为0，默认值为1</param>
         /// <param name="endPageNum">从PDF文档的第几页开始停止转换，如果为0，默认值为Word总页数</param>
         /// <param name="imageFormat">设置所需图片格式，如果为null，默认格式为PNG</param>
         /// <param name="resolution">设置图片的像素，数字越大越清晰，如果为0，默认值为128，建议最大值不要超过1024</param>
-        public static List<string> ConvertWordToImage(
+        public static List<string> ConvertWordToImage
+        (
             string wordInputPath,
             string imageOutputPath,
             string imageName,
@@ -29,7 +30,7 @@ namespace XHWK.WKTool.Utils
             int endPageNum = 0,
             Aspose.Words.SaveFormat imageFormat = Aspose.Words.SaveFormat.Png,
             float resolution = 128
-            )
+        )
         {
             // 返回的图片绝对路径集合
             List<string> images = new List<string>();
@@ -41,11 +42,21 @@ namespace XHWK.WKTool.Utils
                 // validate parameter
                 if (doc == null) { throw new Exception("Word文件无效或者Word文件被加密！"); }
                 if (imageOutputPath.Trim().Length == 0) { imageOutputPath = System.IO.Path.GetDirectoryName(wordInputPath); }
-                if (!Directory.Exists(imageOutputPath)) { Directory.CreateDirectory(imageOutputPath); }
+                if (!Directory.Exists(imageOutputPath))
+                {
+                    if (imageOutputPath != null)
+                    {
+                        Directory.CreateDirectory(imageOutputPath);
+                    }
+                }
                 if (imageName.Trim().Length == 0) { imageName = System.IO.Path.GetFileNameWithoutExtension(wordInputPath); }
                 if (startPageNum <= 0) { startPageNum = 1; }
                 if (endPageNum > doc.PageCount || endPageNum <= 0) { endPageNum = doc.PageCount; }
-                if (startPageNum > endPageNum) { int tempPageNum = startPageNum; startPageNum = endPageNum; endPageNum = startPageNum; }
+                if (startPageNum > endPageNum)
+                {
+                    startPageNum = endPageNum;
+                    endPageNum = startPageNum;
+                }
                 if (resolution <= 0) { resolution = 128; }
 
                 ImageSaveOptions imageSaveOptions = new ImageSaveOptions(imageFormat)
@@ -57,12 +68,13 @@ namespace XHWK.WKTool.Utils
                 for (int i = startPageNum; i <= endPageNum; i++)
                 {
                     imageSaveOptions.PageIndex = i - 1;
-                    string savepath = System.IO.Path.Combine(imageOutputPath, imageName) + "_" + i + "." + imageFormat.ToString();
-                    doc.Save(savepath, imageSaveOptions);
-                    images.Add(savepath);
+                    if (imageOutputPath != null)
+                    {
+                        string savepath = System.IO.Path.Combine(imageOutputPath, imageName) + "_" + i + "." + imageFormat.ToString();
+                        doc.Save(savepath, imageSaveOptions);
+                        images.Add(savepath);
+                    }
                 }
-                imageSaveOptions = null;
-                doc = null;
             }
             catch (Exception ex)
             {

XHWK.WKTool/Utils/ZAudioRecordHelper.cs

@@ -10,87 +10,86 @@ namespace XHWK.WKTool.Utils
     {
         public enum RecordType
         {
-            loudspeaker = 0, // 扬声器
-            microphone = 1 //麦克风
+            Loudspeaker = 0, // 扬声器
+            Microphone = 1 //麦克风
         }
 
         public enum RecordState
         {
-            stop = 0,
-            start = 1,
-            pause = 2
+            Stop = 0,
+            Start = 1,
+            Pause = 2
         }
 
         //录制的类型
-        private RecordType _t = RecordType.microphone;
+        private RecordType _t;
 
-        private RecordState _state = RecordState.stop;
+        private RecordState _state;
 
         //录制麦克风的声音
-        private WaveInEvent waveIn = null; //new WaveInEvent();
+        private WaveInEvent _waveIn; //new WaveInEvent();
 
         //录制扬声器的声音
-        private WasapiLoopbackCapture capture = null; //new WasapiLoopbackCapture();
+        private WasapiLoopbackCapture _capture; //new WasapiLoopbackCapture();
 
         //生成音频文件的对象
-        private WaveFileWriter writer = null;
+        private WaveFileWriter _writer;
 
-        private string audioFile = "";
+        private string _audioFile;
 
         public ZAudioRecordHelper(string filePath, RecordType type)
         {
             _t = type;
-            audioFile = filePath;
-            _state = RecordState.pause;
+            _audioFile = filePath;
+            _state = RecordState.Pause;
             try
             {
-                if (_t == RecordType.microphone)
+                if (_t == RecordType.Microphone)
                 {
-                    waveIn = new WaveInEvent();
-                    writer = new WaveFileWriter(audioFile, waveIn.WaveFormat);
+                    _waveIn = new WaveInEvent();
+                    _writer = new WaveFileWriter(_audioFile, _waveIn.WaveFormat);
                     //开始录音，写数据
-                    waveIn.DataAvailable += (s, a) =>
+                    _waveIn.DataAvailable += (s, a) =>
                     {
-                        if (_state == RecordState.start)
+                        if (_state == RecordState.Start)
                         {
-                            writer.Write(a.Buffer, 0, a.BytesRecorded);
+                            _writer.Write(a.Buffer, 0, a.BytesRecorded);
                         }
                     };
 
                     //结束录音
-                    waveIn.RecordingStopped += (s, a) =>
+                    _waveIn.RecordingStopped += (s, a) =>
                     {
-                        writer.Dispose();
-                        writer = null;
-                        waveIn.Dispose();
+                        _writer.Dispose();
+                        _writer = null;
+                        _waveIn.Dispose();
                     };
-
-                    waveIn.StartRecording();
+                    _waveIn.StartRecording();
                 }
                 else
                 {
-                    capture = new WasapiLoopbackCapture();
-                    writer = new WaveFileWriter(audioFile, capture.WaveFormat);
-
-                    capture.DataAvailable += (s, a) =>
+                    _capture = new WasapiLoopbackCapture();
+                    _writer = new WaveFileWriter(_audioFile, _capture.WaveFormat);
+                    _capture.DataAvailable += (s, a) =>
                     {
-                        if (_state == RecordState.start)
+                        if (_state == RecordState.Start)
                         {
-                            writer.Write(a.Buffer, 0, a.BytesRecorded);
+                            _writer.Write(a.Buffer, 0, a.BytesRecorded);
                         }
                     };
                     //结束录音
-                    capture.RecordingStopped += (s, a) =>
+                    _capture.RecordingStopped += (s, a) =>
                     {
-                        writer.Dispose();
-                        writer = null;
-                        capture.Dispose();
+                        _writer.Dispose();
+                        _writer = null;
+                        _capture.Dispose();
                     };
-                    capture.StartRecording();
+                    _capture.StartRecording();
                 }
             }
             catch (Exception)
             {
+                // ignored
             }
         }
 
@@ -99,7 +98,7 @@ namespace XHWK.WKTool.Utils
         /// </summary>
         public void StartRecordAudio()
         {
-            _state = RecordState.start;
+            _state = RecordState.Start;
         }
 
         /// <summary>
@@ -107,14 +106,14 @@ namespace XHWK.WKTool.Utils
         /// </summary>
         public void StopRecordAudio()
         {
-            _state = RecordState.stop;
-            if (_t == RecordType.microphone)
+            _state = RecordState.Stop;
+            if (_t == RecordType.Microphone)
             {
-                waveIn.StopRecording();
+                _waveIn.StopRecording();
             }
             else
             {
-                capture.StopRecording();
+                _capture.StopRecording();
             }
         }
 
@@ -123,7 +122,7 @@ namespace XHWK.WKTool.Utils
         /// </summary>
         public void PauseRecordAudio()
         {
-            _state = RecordState.pause;
+            _state = RecordState.Pause;
         }
 
         /// <summary>
@@ -131,7 +130,7 @@ namespace XHWK.WKTool.Utils
         /// </summary>
         public void ResumeRecordAudio()
         {
-            _state = RecordState.start;
+            _state = RecordState.Start;
         }
 
         /// <summary>
@@ -143,15 +142,14 @@ namespace XHWK.WKTool.Utils
         {
             string tempPath = Path.GetTempPath();
             // Console.WriteLine("临时路径:" + tempPath);
-            WaveInEvent mWaveIn = null;
+            WaveInEvent mWaveIn;
             WaveFileWriter mWriter = null;
-            WasapiLoopbackCapture mCapture = null;
+            WasapiLoopbackCapture mCapture;
             try
             {
-                if (type == RecordType.microphone)
+                if (type == RecordType.Microphone)
                 {
                     string mAudioFile = Path.Combine(tempPath, "_microphone.mp3");
-
                     mWaveIn = new WaveInEvent();
                     mWriter = new WaveFileWriter(mAudioFile, mWaveIn.WaveFormat);
                     //开始录音，写数据
@@ -160,49 +158,54 @@ namespace XHWK.WKTool.Utils
                     //结束录音
                     mWaveIn.RecordingStopped += (s, a) =>
                     {
-                        mWriter.Dispose();
+                        if (mWriter != null)
+                        {
+                            mWriter.Dispose();
+                        }
                         mWriter = null;
                         mWaveIn.Dispose();
-
                         if (File.Exists(mAudioFile))
                         {
                             File.Delete(mAudioFile);
                         }
                     };
-
                     mWaveIn.StartRecording();
-
-                    ThreadPool.QueueUserWorkItem(o =>
-                    {
-                        Thread.Sleep(200);
-                        mWaveIn.StopRecording();
-                    });
+                    ThreadPool.QueueUserWorkItem(
+                        o =>
+                        {
+                            Thread.Sleep(200);
+                            mWaveIn.StopRecording();
+                        }
+                    );
                 }
                 else
                 {
                     string mAudioFile = Path.Combine(tempPath, "_loudspeaker.mp3");
                     mCapture = new WasapiLoopbackCapture();
                     mWriter = new WaveFileWriter(mAudioFile, mCapture.WaveFormat);
-
-                    mCapture.DataAvailable += (s, a) => { mWriter.Write(a.Buffer, 0, a.BytesRecorded); };
+                    mCapture.DataAvailable += (s, a) =>
+                    {
+                        mWriter?.Write(a.Buffer, 0, a.BytesRecorded);
+                    };
                     //结束录音
                     mCapture.RecordingStopped += (s, a) =>
                     {
-                        mWriter.Dispose();
+                        mWriter?.Dispose();
                         mWriter = null;
                         mCapture.Dispose();
-
                         if (File.Exists(mAudioFile))
                         {
                             File.Delete(mAudioFile);
                         }
                     };
                     mCapture.StartRecording();
-                    ThreadPool.QueueUserWorkItem(o =>
-                    {
-                        Thread.Sleep(200);
-                        mCapture.StopRecording();
-                    });
+                    ThreadPool.QueueUserWorkItem(
+                        o =>
+                        {
+                            Thread.Sleep(200);
+                            mCapture.StopRecording();
+                        }
+                    );
                 }
             }
             catch (Exception)
@@ -212,7 +215,6 @@ namespace XHWK.WKTool.Utils
                     mWriter.Dispose();
                     mWriter = null;
                 }
-
                 return false;
             }
 

XHWK.WKTool/system/ZJClippingBorder.cs → XHWK.WKTool/Utils/ZClippingBorder.cs

@@ -5,7 +5,7 @@ using System.Windows.Media;
 
 namespace Common.system
 {
-    public class ZJClippingBorder : Border
+    public class ZClippingBorder : Border
     {
         private object _oldClip;
 

XHWK.WKTool/Utils/ZConfigAppUtil.cs

@@ -74,8 +74,8 @@
         {
             SetVaule("ServerIp", "127.0.0.1");
             SetVaule("ServerPort", "10088");
-            Console.WriteLine("ServerIp：" + GetVaule("ServerIp"));
-            Console.WriteLine("ServerXXX：" + (GetVaule("ServerXXX") == null));
+            Console.WriteLine(@"ServerIp：" + GetVaule("ServerIp"));
+            Console.WriteLine(@"ServerXXX：" + (GetVaule("ServerXXX") == null));
         }
     }
 }

XHWK.WKTool/Utils/ZVideoRecordHelper.cs

@@ -18,30 +18,22 @@ namespace XHWK.WKTool.Utils
             Pause = 2
         }
 
-        private RecordState _state = RecordState.Stop;
-
-        private string _filePath;
-        private int _width;
-        private int _height;
+        private RecordState _state;
 
         //录制帧率
-        private int _rate = 5;
 
         //录制质量
-        private int _quality = 8;
 
-        private bool _captureMouse = false;
+        private bool _captureMouse;
 
-        private VideoFileWriter videoWriter = new VideoFileWriter();//视频写入
-        private ScreenCaptureStream videoStreamer;//视频捕获
+        private VideoFileWriter _videoWriter = new VideoFileWriter(); //视频写入
+        private ScreenCaptureStream _videoStreamer; //视频捕获
 
         public ZVideoRecordHelper(string filePath, int width, int height, int rate = 5, int quality = 8, bool captureMouse = false)
         {
-            _filePath = filePath;
-            _width = width / 2 * 2;
-            _height = height / 2 * 2;
-            _rate = rate;
-            _quality = quality;
+            int width1 = width / 2 * 2;
+            int height1 = height / 2 * 2;
+            int rate1 = rate;
             _captureMouse = captureMouse;
             _state = RecordState.Pause;
             try
@@ -49,23 +41,28 @@ namespace XHWK.WKTool.Utils
                 // 打开写入
                 lock (this)
                 {
-                    videoWriter.Open(
-                        _filePath,
-                        _width,
-                        _height,
-                        _rate,
+                    _videoWriter.Open(
+                        filePath,
+                        width1,
+                        height1,
+                        rate1,
                         VideoCodec.MPEG4,
-                        _width * _height * _quality
+                        width1 * height1 * quality
                     );
                 }
-
-                System.Drawing.Rectangle rec = new System.Drawing.Rectangle(0, 0, _width, _height);
-                videoStreamer = new ScreenCaptureStream(rec, 1000 / _rate); //帧间隔需要和帧率关联，不然录的10秒视频文件不是10s
-                videoStreamer.NewFrame += VideoNewFrame;
-                videoStreamer.Start();
+                System.Drawing.Rectangle rec = new System.Drawing.Rectangle(
+                    0,
+                    0,
+                    width1,
+                    height1
+                );
+                _videoStreamer = new ScreenCaptureStream(rec, 1000 / rate1); //帧间隔需要和帧率关联，不然录的10秒视频文件不是10s
+                _videoStreamer.NewFrame += VideoNewFrame;
+                _videoStreamer.Start();
             }
             catch (Exception)
             {
+                // ignored
             }
         }
 
@@ -79,22 +76,22 @@ namespace XHWK.WKTool.Utils
         }
 
         [DllImport("user32.dll")]
-        private static extern bool GetCursorInfo(out CURSORINFO pci);
+        private static extern bool GetCursorInfo(out Cursorinfo pci);
 
         [StructLayout(LayoutKind.Sequential)]
-        private struct POINT
+        private struct Point
         {
             public Int32 x;
             public Int32 y;
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        private struct CURSORINFO
+        private struct Cursorinfo
         {
             public Int32 cbSize;
             public Int32 flags;
             public IntPtr hCursor;
-            public POINT ptScreenPos;
+            public Point ptScreenPos;
         }
 
         // 帧返回时绘制上鼠标
@@ -105,17 +102,15 @@ namespace XHWK.WKTool.Utils
                 if (_captureMouse)
                 {
                     var g = System.Drawing.Graphics.FromImage(e.Frame);
-                    CURSORINFO pci;
-                    pci.cbSize = Marshal.SizeOf(typeof(CURSORINFO));
+                    Cursorinfo pci;
+                    pci.cbSize = Marshal.SizeOf(typeof(Cursorinfo));
                     GetCursorInfo(out pci);
                     try
                     {
                         System.Windows.Forms.Cursor cur = new System.Windows.Forms.Cursor(pci.hCursor);
-                        cur.Draw
-                        (
+                        cur.Draw(
                             g,
-                            new System.Drawing.Rectangle
-                            (
+                            new System.Drawing.Rectangle(
                                 System.Windows.Forms.Cursor.Position.X - 10,
                                 System.Windows.Forms.Cursor.Position.Y - 10,
                                 cur.Size.Width,
@@ -123,9 +118,12 @@ namespace XHWK.WKTool.Utils
                             )
                         );
                     }
-                    catch { } //打开任务管理器时会导致异常
+                    catch
+                    {
+                        // ignored
+                    } //打开任务管理器时会导致异常
                 }
-                videoWriter.WriteVideoFrame(e.Frame);
+                _videoWriter.WriteVideoFrame(e.Frame);
             }
         }
 
@@ -136,11 +134,11 @@ namespace XHWK.WKTool.Utils
         {
             _state = RecordState.Stop;
             // 停止
-            videoStreamer.Stop();
+            _videoStreamer.Stop();
 
             //结束写入
-            videoWriter.Close();
-            videoWriter.Dispose();
+            _videoWriter.Close();
+            _videoWriter.Dispose();
         }
 
         /// <summary>

XHWK.WKTool/XHWK.WKTool.csproj

@@ -239,8 +239,8 @@
     <Compile Include="CountdownWindow.xaml.cs">
       <DependentUpon>CountdownWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="DAL\DAL_Upload.cs" />
-    <Compile Include="DAL\XHApi.cs" />
+    <Compile Include="DAL\DalUpload.cs" />
+    <Compile Include="DAL\XhApi.cs" />
     <Compile Include="DAL\ResultVo.cs" />
     <Compile Include="DeviceWindow.xaml.cs">
       <DependentUpon>DeviceWindow.xaml</DependentUpon>
@@ -294,7 +294,7 @@
     <Compile Include="Models\PrintModel.cs" />
     <Compile Include="Models\ResultVo.cs" />
     <Compile Include="Models\Tool.cs" />
-    <Compile Include="license\MyLicense.cs" />
+    <Compile Include="License\MyLicense.cs" />
     <Compile Include="Models\DownloadInfoModel.cs" />
     <Compile Include="Models\ViewModel.cs" />
     <Compile Include="PracticeWindow.xaml.cs">
@@ -310,37 +310,35 @@
       <DependentUpon>ScreenRecordingToolbarWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Skin\SkinConfig.cs" />
-    <Compile Include="system\AutoStartHelper.cs" />
-    <Compile Include="system\BlackboardNew.cs" />
-    <Compile Include="system\CameraHelper.cs" />
-    <Compile Include="system\CLeopardZip.cs" />
-    <Compile Include="system\DataConvertCommon.cs" />
-    <Compile Include="system\DataProvider.cs" />
-    <Compile Include="system\DownloadManager.cs" />
-    <Compile Include="system\DownloadService.cs" />
-    <Compile Include="system\FFMpeg.cs" />
-    <Compile Include="system\FileToolsCommon.cs" />
-    <Compile Include="system\FreeMemoryHelper.cs" />
-    <Compile Include="system\ZHttpUtil.cs" />
-    <Compile Include="system\ImageHelper.cs" />
-    <Compile Include="system\JsonHelper.cs" />
-    <Compile Include="system\KeyboardHookCommon.cs" />
-    <Compile Include="system\LatticeFileHelper.cs" />
-    <Compile Include="system\LogHelper.cs" />
-    <Compile Include="system\MouseEventCommon.cs" />
-    <Compile Include="system\PdfTrunImage.cs" />
-    <Compile Include="system\PrimaryScreen.cs" />
-    <Compile Include="system\QueueSync.cs" />
-    <Compile Include="system\SplashScreen.cs" />
-    <Compile Include="system\XmlUtilHelper.cs" />
-    <Compile Include="system\ZJClippingBorder.cs" />
+    <Compile Include="Utils\BlackboardNew.cs" />
+    <Compile Include="Utils\CameraHelper.cs" />
+    <Compile Include="Utils\DataConvertCommon.cs" />
+    <Compile Include="Utils\DataProvider.cs" />
+    <Compile Include="Utils\DownloadManager.cs" />
+    <Compile Include="Utils\DownloadService.cs" />
+    <Compile Include="Utils\FFMpeg.cs" />
+    <Compile Include="Utils\FileToolsCommon.cs" />
+    <Compile Include="Utils\FreeMemoryHelper.cs" />
+    <Compile Include="Utils\ZHttpUtil.cs" />
+    <Compile Include="Utils\ImageHelper.cs" />
+    <Compile Include="Utils\JsonHelper.cs" />
+    <Compile Include="Utils\KeyboardHookCommon.cs" />
+    <Compile Include="Utils\LatticeFileHelper.cs" />
+    <Compile Include="Utils\LogHelper.cs" />
+    <Compile Include="Utils\MouseEventCommon.cs" />
+    <Compile Include="Utils\PdfTrunImage.cs" />
+    <Compile Include="Utils\PrimaryScreen.cs" />
+    <Compile Include="Utils\QueueSync.cs" />
+    <Compile Include="Utils\SplashScreen.cs" />
+    <Compile Include="Utils\XmlUtilHelper.cs" />
+    <Compile Include="Utils\ZClippingBorder.cs" />
     <Compile Include="Utils\ImageOperationUtil.cs" />
     <Compile Include="Utils\pen\TQLPen\PenEvents.cs" />
     <Compile Include="Utils\pen\TQLPen\Pentiming.cs" />
-    <Compile Include="UControl\UC_MultiRangeSlider.xaml.cs">
+    <Compile Include="View\UControl\UC_MultiRangeSlider.xaml.cs">
       <DependentUpon>UC_MultiRangeSlider.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UControl\Uc_VideoItem.xaml.cs">
+    <Compile Include="View\UControl\Uc_VideoItem.xaml.cs">
       <DependentUpon>Uc_VideoItem.xaml</DependentUpon>
     </Compile>
     <Compile Include="UploadWindow.xaml.cs">
@@ -456,11 +454,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="UControl\UC_MultiRangeSlider.xaml">
+    <Page Include="View\UControl\UC_MultiRangeSlider.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UControl\Uc_VideoItem.xaml">
+    <Page Include="View\UControl\Uc_VideoItem.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

XHWK.WKTool/XHWK.WKTool.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>

XHWK.WKTool/system/SplashScreen.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Reflection;
-using System.Threading;
-using System.Windows.Forms;
-
-namespace Common.system
-{
-    /// <summary>
-    /// 解决闪屏  加载等待 
-    /// 创建人：赵耀
-    /// 创建时间：2018年11月27日
-    /// </summary>
-    public class SplashScreen
-    {
-        private static object _obj = new object();
-
-        private static Form _SplashForm = null;
-
-        private static Thread _SplashThread = null;
-
-        private delegate void ChangeFormTextdelegate(string s);
-
-        public static void Show(Type splashFormType)
-        {
-            if (_SplashThread != null)
-            {
-                return;
-            }
-
-            if (splashFormType == null)
-            {
-                throw (new Exception());
-            }
-
-            _SplashThread = new Thread(new ThreadStart(delegate ()
-            {
-                CreateInstance(splashFormType);
-                Application.Run(_SplashForm);
-            }))
-            {
-                IsBackground = true
-            };
-            _SplashThread.SetApartmentState(ApartmentState.STA);
-            _SplashThread.Start();
-        }
-
-        public static void ChangeTitle(string status)
-        {
-            ChangeFormTextdelegate de = new ChangeFormTextdelegate(ChangeText);
-            _SplashForm.Invoke(de, status);
-        }
-
-
-
-        public static void Close()
-        {
-            if (_SplashThread == null || _SplashForm == null)
-            {
-                return;
-            }
-
-            try
-            {
-                _SplashForm.Invoke(new MethodInvoker(_SplashForm.Close));
-            }
-            catch (Exception)
-            {
-            }
-            _SplashThread = null;
-            _SplashForm = null;
-        }
-
-        private static void ChangeText(string title)
-        {
-            _SplashForm.Text = title.ToString();
-        }
-
-
-
-        private static void CreateInstance(Type FormType)
-        {
-            if (_SplashForm == null)
-            {
-                lock (_obj)
-                {
-                    object obj = FormType.InvokeMember(null,
-                                        BindingFlags.DeclaredOnly |
-                                        BindingFlags.Public | BindingFlags.NonPublic |
-                                        BindingFlags.Instance | BindingFlags.CreateInstance, null, null, null);
-                    _SplashForm = obj as Form;
-                    _SplashForm.TopMost = true;
-                    _SplashForm.ShowInTaskbar = false;
-                    _SplashForm.BringToFront();
-                    _SplashForm.StartPosition = FormStartPosition.CenterScreen;
-                    if (_SplashForm == null)
-                    {
-                        throw (new Exception());
-                    }
-                }
-            }
-        }
-
-    }
-}