代码优化

XHWK.WKTool/Converters/ColorConverter.cs

@@ -8,6 +8,7 @@ namespace ComeCapture.Converters
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
+            // ReSharper disable once PossibleNullReferenceException
             return new SolidColorBrush((Color)System.Windows.Media.ColorConverter.ConvertFromString(value.ToString()));
         }
 

XHWK.WKTool/Converters/SizeConverter.cs

@@ -7,7 +7,7 @@ namespace ComeCapture.Converters
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            return int.Parse(value.ToString()) == int.Parse(parameter.ToString());
+            return parameter != null && value != null && int.Parse(value.ToString()) == int.Parse(parameter.ToString());
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)

XHWK.WKTool/Converters/ToolConverter.cs

@@ -8,7 +8,7 @@ namespace ComeCapture.Converters
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            return value.ToString() == parameter.ToString() ? Visibility.Visible : Visibility.Collapsed;
+            return parameter != null && value != null && value.ToString() == parameter.ToString() ? Visibility.Visible : Visibility.Collapsed;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)

XHWK.WKTool/Models/AppModel.cs

@@ -8,27 +8,27 @@ namespace ComeCapture
     {
         public AppModel()
         {
-            _Current = this;
+            _current = this;
         }
 
         #region 属性 Current
 
-        private static AppModel _Current = null;
+        private static AppModel _current;
 
-        public static AppModel Current => _Current;
+        public static AppModel Current => _current;
 
         #endregion 属性 Current
 
         #region 属性 MaskLeftWidth
 
-        private double _MaskLeftWidth = JieTuWindow.ScreenWidth;
+        private double _maskLeftWidth = JieTuWindow.ScreenWidth;
 
         public double MaskLeftWidth
         {
-            get => _MaskLeftWidth;
+            get => _maskLeftWidth;
             set
             {
-                _MaskLeftWidth = value;
+                _maskLeftWidth = value;
                 ShowSizeLeft = value;
                 RaisePropertyChanged(() => MaskLeftWidth);
             }
@@ -38,14 +38,14 @@ namespace ComeCapture
 
         #region 属性 MaskRightWidth
 
-        private double _MaskRightWidth = 0;
+        private double _maskRightWidth;
 
         public double MaskRightWidth
         {
-            get => _MaskRightWidth;
+            get => _maskRightWidth;
             set
             {
-                _MaskRightWidth = value;
+                _maskRightWidth = value;
                 RaisePropertyChanged(() => MaskRightWidth);
             }
         }
@@ -54,14 +54,14 @@ namespace ComeCapture
 
         #region 属性 MaskTopWidth
 
-        private double _MaskTopWidth = 0;
+        private double _maskTopWidth;
 
         public double MaskTopWidth
         {
-            get => _MaskTopWidth;
+            get => _maskTopWidth;
             set
             {
-                _MaskTopWidth = value;
+                _maskTopWidth = value;
                 RaisePropertyChanged(() => MaskTopWidth);
             }
         }
@@ -70,14 +70,14 @@ namespace ComeCapture
 
         #region 属性 MaskTopHeight
 
-        private double _MaskTopHeight = 0;
+        private double _maskTopHeight;
 
         public double MaskTopHeight
         {
-            get => _MaskTopHeight;
+            get => _maskTopHeight;
             set
             {
-                _MaskTopHeight = value;
+                _maskTopHeight = value;
                 ShowSizeTop = MaskTopHeight < 40 ? MaskTopHeight : MaskTopHeight - 40;
                 RaisePropertyChanged(() => MaskTopHeight);
             }
@@ -87,14 +87,14 @@ namespace ComeCapture
 
         #region 属性 MaskBottomHeight
 
-        private double _MaskBottomHeight = 0;
+        private double _maskBottomHeight;
 
         public double MaskBottomHeight
         {
-            get => _MaskBottomHeight;
+            get => _maskBottomHeight;
             set
             {
-                _MaskBottomHeight = value;
+                _maskBottomHeight = value;
                 RaisePropertyChanged(() => MaskBottomHeight);
             }
         }
@@ -103,41 +103,41 @@ namespace ComeCapture
 
         #region 属性 ShowSize
 
-        private string _ShowSize = "0 × 0";
+        private string _showSize = "0 × 0";
 
         public string ShowSize
         {
-            get => _ShowSize;
+            get => _showSize;
             set
             {
-                _ShowSize = value;
+                _showSize = value;
                 RaisePropertyChanged(() => ShowSize);
             }
         }
 
-        private static StringBuilder sb = new StringBuilder();
+        private static StringBuilder _sb = new StringBuilder();
 
         public void ChangeShowSize()
         {
-            sb = new StringBuilder();
-            sb.Append((int)(JieTuWindow.Current.MainImage.Width * JieTuWindow.ScreenScale));
-            sb.Append(" × ");
-            sb.Append((int)(JieTuWindow.Current.MainImage.Height * JieTuWindow.ScreenScale));
-            ShowSize = sb.ToString();
+            _sb = new StringBuilder();
+            _sb.Append((int)(JieTuWindow.Current.MainImage.Width * JieTuWindow.ScreenScale));
+            _sb.Append(" × ");
+            _sb.Append((int)(JieTuWindow.Current.MainImage.Height * JieTuWindow.ScreenScale));
+            ShowSize = _sb.ToString();
         }
 
         #endregion 属性 ShowSize
 
         #region 属性 ShowSizeLeft
 
-        private double _ShowSizeLeft = 0;
+        private double _showSizeLeft;
 
         public double ShowSizeLeft
         {
-            get => _ShowSizeLeft;
+            get => _showSizeLeft;
             set
             {
-                _ShowSizeLeft = value;
+                _showSizeLeft = value;
                 RaisePropertyChanged(() => ShowSizeLeft);
             }
         }
@@ -146,14 +146,14 @@ namespace ComeCapture
 
         #region 属性 ShowSizeTop
 
-        private double _ShowSizeTop = 0;
+        private double _showSizeTop;
 
         public double ShowSizeTop
         {
-            get => _ShowSizeTop;
+            get => _showSizeTop;
             set
             {
-                _ShowSizeTop = value;
+                _showSizeTop = value;
                 RaisePropertyChanged(() => ShowSizeTop);
             }
         }
@@ -162,14 +162,14 @@ namespace ComeCapture
 
         #region 属性 ShowRGB
 
-        private string _ShowRGB = string.Empty;
+        private string _showRgb = string.Empty;
 
         public string ShowRGB
         {
-            get => _ShowRGB;
+            get => _showRgb;
             set
             {
-                _ShowRGB = value;
+                _showRgb = value;
                 RaisePropertyChanged(() => ShowRGB);
             }
         }

XHWK.WKTool/Models/DownloadInfoModel.cs

@@ -2,6 +2,8 @@
 
 namespace Common.Model
 {
+    using System;
+
     /// <summary>
     /// 下载模型
     /// 创建人：赵耀
@@ -41,10 +43,11 @@ namespace Common.Model
             get => _isNewTask;
             set => _isNewTask = value;
         }
+
         /// <summary>
         /// 是否重新下载
         /// </summary>
-        private bool _isReStart = false;
+        private bool _isReStart;
 
         /// <summary>
         /// 是否重新下载
@@ -92,25 +95,26 @@ namespace Common.Model
 
             set
             {
-                List<string> UTF8ValueList = new List<string>();
+                List<string> utf8ValueList = new List<string>();
                 foreach (string val in value)
                 {
-                    string path = val.Substring(0, val.LastIndexOf("/") + 1);
-                    string name = val.Substring(val.LastIndexOf("/") + 1);
-                    string UTF8Name = System.Web.HttpUtility.UrlEncode(name);
-                    string UTF8Url = path + UTF8Name;
-                    UTF8ValueList.Add(UTF8Url);
-                    _downloadUrlList = UTF8ValueList;
+                    string path = val.Substring(0, val.LastIndexOf("/", StringComparison.Ordinal) + 1);
+                    string name = val.Substring(val.LastIndexOf("/", StringComparison.Ordinal) + 1);
+                    string utf8Name = System.Web.HttpUtility.UrlEncode(name);
+                    string utf8Url = path + utf8Name;
+                    utf8ValueList.Add(utf8Url);
+                    _downloadUrlList = utf8ValueList;
                 }
-                ;
             }
         }
+
         /// <summary>
         /// 是否支持断点续传
         /// 在任务开始后，如果需要暂停，应先通过这个判断是否支持
         /// 默认设为false
         /// </summary>
-        private bool _IsSupportMultiThreading = false;
+        private bool _isSupportMultiThreading;
+
         /// <summary>
         /// 是否支持断点续传
         /// 在任务开始后，如果需要暂停，应先通过这个判断是否支持
@@ -118,8 +122,8 @@ namespace Common.Model
         /// </summary>
         public bool IsSupportMultiThreading
         {
-            get => _IsSupportMultiThreading;
-            set => _IsSupportMultiThreading = value;
+            get => _isSupportMultiThreading;
+            set => _isSupportMultiThreading = value;
         }
         /// <summary>
         /// 线程任务列表

XHWK.WKTool/Models/EntityBase.cs

@@ -25,6 +25,7 @@ namespace ComeCapture.Models
         {
             if (PropertyChanged != null)
             {
+                // ReSharper disable once PolymorphicFieldLikeEventInvocation
                 PropertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(name));
             }
         }

XHWK.WKTool/Models/FileDirectoryData.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.ObjectModel;
 
 using XHWK.Model;
 

XHWK.WKTool/Models/FileDirectoryModel.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using XHWK.Model;
+using XHWK.Model;
 
 namespace XHWK.WKTool.Models
 {

XHWK.WKTool/Models/Limit.cs

@@ -14,10 +14,6 @@
         {
             return MemberwiseClone() as Limit;
         }
-
-        public Limit()
-        {
-        }
     }
 
     /// <summary>

XHWK.WKTool/Models/ModelCanvas.cs

@@ -10,20 +10,28 @@
             set { _name = value; OnPropertyChanged("Name"); }
         }
 
-        private string _Pic;
+        private string _pic;
 
         public string Pic
         {
-            get => _Pic;
-            set { _Pic = value; OnPropertyChanged("Pic"); }
+            get => _pic;
+            set
+            {
+                _pic = value;
+                OnPropertyChanged("Pic");
+            }
         }
 
-        private bool _Selected;
+        private bool _selected;
 
         public bool Selected
         {
-            get => _Selected;
-            set { _Selected = value; OnPropertyChanged("Selected"); }
+            get => _selected;
+            set
+            {
+                _selected = value;
+                OnPropertyChanged("Selected");
+            }
         }
     }
 }

XHWK.WKTool/Models/Tool.cs

@@ -2,15 +2,15 @@
 {
     public enum Tool
     {
-        Null,//无状态可移动
-        Rectangle,//长方形
-        Ellipse,//圆形
-        Line,//画刷
-        Text,//文字
-        Arrow,//箭头
-        Revoke,//撤销
-        Save,//保存
-        Cancel,//退出截图
-        OK//完成截图
+        Null, //无状态可移动
+        Rectangle, //长方形
+        Ellipse, //圆形
+        Line, //画刷
+        Text, //文字
+        Arrow, //箭头
+        Revoke, //撤销
+        Save, //保存
+        Cancel, //退出截图
+        Ok //完成截图
     }
 }

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -942,7 +942,7 @@ namespace XHWK.WKTool
                             (
                                 () =>
                                 {
-                                    MouseEventCommon.GetCursorPos(out MouseEventCommon.POINT pointRecord);
+                                    MouseEventCommon.GetCursorPos(out MouseEventCommon.Point pointRecord);
                                     if (pointRecord.X >= this.Left && pointRecord.X < this.Left + this.ActualWidth && pointRecord.Y >= this.Top && pointRecord.Y < this.Top + this.ActualHeight)
                                     {
                                         //LblMessage.Content = "在区域内：("+ pointRecord.X+","+pointRecord.Y+") ("+ Left + ","+Top+")";

XHWK.WKTool/Utils/DataConvertCommon.cs

@@ -19,15 +19,15 @@
         public static TChild ParentClassCopy<TParent, TChild>(TParent parent) where TChild : TParent, new()
         {
             TChild child = new TChild();
-            System.Type ParentType = typeof(TParent);
-            System.Reflection.PropertyInfo[] Properties = ParentType.GetProperties();
-            foreach (System.Reflection.PropertyInfo Propertie in Properties)
+            System.Type parentType = typeof(TParent);
+            System.Reflection.PropertyInfo[] properties = parentType.GetProperties();
+            foreach (System.Reflection.PropertyInfo propertie in properties)
             {
                 //循环遍历属性
-                if (Propertie.CanRead && Propertie.CanWrite)
+                if (propertie.CanRead && propertie.CanWrite)
                 {
                     //进行属性拷贝
-                    Propertie.SetValue(child, Propertie.GetValue(parent, null), null);
+                    propertie.SetValue(child, propertie.GetValue(parent, null), null);
                 }
             }
             return child;

XHWK.WKTool/Utils/MouseEventCommon.cs

@@ -23,7 +23,7 @@ namespace Common.system
         /// </summary>
         /// <returns>获取成功返回真</returns>   
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
-        public static extern bool GetCursorPos(out POINT pt);
+        public static extern bool GetCursorPos(out Point pt);
 
         /// <summary>
         /// 鼠标点击左键
@@ -33,7 +33,7 @@ namespace Common.system
         /// <param name="data"></param>
         public static void MouseLefClickEvent(int dx, int dy, int data)
         {
-            GetCursorPos(out POINT pointRecord);
+            GetCursorPos(out Point pointRecord);
             mouse_event((int)MouseEventFlag.MiddleDown, pointRecord.X, pointRecord.Y, data, 0);
             mouse_event((int)MouseEventFlag.MiddleUp, pointRecord.X, pointRecord.Y, data, 0);
         }
@@ -48,16 +48,17 @@ namespace Common.system
         /// <param name="data"></param>
         public static void MouseMiddleClickEvent(int data)
         {
-            GetCursorPos(out POINT pointRecord);
+            GetCursorPos(out Point pointRecord);
             mouse_event((int)MouseEventFlag.MiddleDown, pointRecord.X, pointRecord.Y, data, 0);
             mouse_event((int)MouseEventFlag.MiddleUp, pointRecord.X, pointRecord.Y, data, 0);
         }
 
-        public struct POINT
+        public struct Point
         {
             public int X;
             public int Y;
-            public POINT(int x, int y)
+
+            public Point(int x, int y)
             {
                 this.X = x;
                 this.Y = y;

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>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
 </Project>