zhao：1修改请求，2去除ZConfig，3整理优化代码

Common/AESHelper.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Common
 {
@@ -21,17 +18,19 @@ namespace Common
         /// </summary>
         /// <param name="content">Need encrypted string</param>
         /// <returns>Encrypted 16 hex string</returns>
-        public static string AESEncrypt(String Data)
+        public static string AESEncrypt(string Data)
         {
             string key = QrcodeLoginKey.PadRight(16, '0');
             // 256-AES key      
             byte[] keyArray = UTF8Encoding.ASCII.GetBytes(key);
             byte[] toEncryptArray = UTF8Encoding.ASCII.GetBytes(Data);
 
-            RijndaelManaged rDel = new RijndaelManaged();
-            rDel.Key = keyArray;
-            rDel.Mode = CipherMode.ECB;
-            rDel.Padding = PaddingMode.PKCS7;
+            RijndaelManaged rDel = new RijndaelManaged
+            {
+                Key = keyArray,
+                Mode = CipherMode.ECB,
+                Padding = PaddingMode.PKCS7
+            };
 
             ICryptoTransform cTransform = rDel.CreateEncryptor();
             byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0,
@@ -45,17 +44,19 @@ namespace Common
         /// </summary>
         /// <param name="hexString">Encrypted 16 hex string</param>
         /// <returns>Decrypted string</returns>
-        public static string AESDecrypt(String hexString)
+        public static string AESDecrypt(string hexString)
         {
             string key = QrcodeLoginKey.PadRight(16, '0');
             // 256-AES key      
             byte[] keyArray = UTF8Encoding.ASCII.GetBytes(key);
             byte[] toEncryptArray = HexStringToBytes(hexString);
 
-            RijndaelManaged rDel = new RijndaelManaged();
-            rDel.Key = keyArray;
-            rDel.Mode = CipherMode.ECB;
-            rDel.Padding = PaddingMode.PKCS7;
+            RijndaelManaged rDel = new RijndaelManaged
+            {
+                Key = keyArray,
+                Mode = CipherMode.ECB,
+                Padding = PaddingMode.PKCS7
+            };
 
             ICryptoTransform cTransform = rDel.CreateDecryptor();
             byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0,
@@ -87,7 +88,7 @@ namespace Common
         /// </summary>
         /// <param name="hexString">16 hex string</param>
         /// <returns>byte array</returns>
-        public static byte[] HexStringToBytes(String hexString)
+        public static byte[] HexStringToBytes(string hexString)
         {
             if (hexString == null || hexString.Equals(""))
             {

Common/Model/DownloadInfoModel.cs

@@ -19,8 +19,8 @@ namespace Common.Model
         /// </summary>
         public int taskCount
         {
-            get { return _taskCount; }
-            set { _taskCount = value; }
+            get => _taskCount;
+            set => _taskCount = value;
         }
         /// <summary>
         /// 保存的临时文件名
@@ -38,8 +38,8 @@ namespace Common.Model
         /// </summary>
         public bool isNewTask
         {
-            get { return _isNewTask; }
-            set { _isNewTask = value; }
+            get => _isNewTask;
+            set => _isNewTask = value;
         }
         /// <summary>
         /// 是否重新下载
@@ -51,8 +51,8 @@ namespace Common.Model
         /// </summary>
         public bool isReStart
         {
-            get { return _isReStart; }
-            set { _isReStart = value; }
+            get => _isReStart;
+            set => _isReStart = value;
         }
         /// <summary>
         /// 任务总大小
@@ -72,8 +72,8 @@ namespace Common.Model
         /// </summary>
         public string method
         {
-            get { return _method; }
-            set { _method = value; }
+            get => _method;
+            set => _method = value;
         }
         /// <summary>
         /// 文件名
@@ -88,7 +88,7 @@ namespace Common.Model
         /// </summary>
         public List<string> downloadUrlList
         {
-            get { return _downloadUrlList; }
+            get => _downloadUrlList;
 
             set
             {
@@ -118,8 +118,8 @@ namespace Common.Model
         /// </summary>
         public bool IsSupportMultiThreading
         {
-            get { return _IsSupportMultiThreading; }
-            set { _IsSupportMultiThreading = value; }
+            get => _IsSupportMultiThreading;
+            set => _IsSupportMultiThreading = value;
         }
         /// <summary>
         /// 线程任务列表
@@ -153,7 +153,7 @@ namespace Common.Model
         /// <summary>
         /// 分片的总大小
         /// </summary>
-        public long count { get { return this.toIndex - this.fromIndex + 1; } }
+        public long count => toIndex - fromIndex + 1;
     }
 
     /// <summary>

Common/system/BlackboardNew.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
@@ -69,7 +67,10 @@ namespace Common.system
         /// 笔粗细
         /// </summary>
         private readonly int pensize = 3;
-        private int undoOrRedo = 0; //是否在进行撤销恢复操作
+        /// <summary>
+        /// 是否在进行撤销恢复操作
+        /// </summary>
+        private int undoOrRedo = 0;
         /// <summary>
         /// 笔颜色
         /// </summary>
@@ -91,7 +92,8 @@ namespace Common.system
         {
             init(canvas, _pencolor);
         }
-        DrawingAttributes drawingAttributes;
+
+        private DrawingAttributes drawingAttributes;
         private void init(InkCanvas canvas, Color _pencolor)
         {
             m_canvas = canvas;
@@ -102,7 +104,7 @@ namespace Common.system
             if (canvas != null)
             {
                 canvas.EditingMode = InkCanvasEditingMode.Ink;
-                 drawingAttributes = new DrawingAttributes();
+                drawingAttributes = new DrawingAttributes();
                 canvas.DefaultDrawingAttributes = drawingAttributes;
                 drawingAttributes.Width = pensize;
                 drawingAttributes.Height = pensize;
@@ -205,7 +207,7 @@ namespace Common.system
         }
 
         // public方法 笔
-        public void change_pen(Color _color) 
+        public void change_pen(Color _color)
         {
             //this.type = ZPenType.Pen;
             DrawingAttributes drawingAttributes = new DrawingAttributes();
@@ -321,7 +323,7 @@ namespace Common.system
                 }
 
                 ZBBPage page = strokes_page_all[pagenum];
-                if (page != null&& page.lines.Count>0)
+                if (page != null && page.lines.Count > 0)
                 {
                     if (page.lines.Last().lines_curr.Count > 0)
                     {
@@ -335,9 +337,11 @@ namespace Common.system
                     StrokeCollection strokes = new StrokeCollection();
                     StylusPointCollection stylusPoints = new StylusPointCollection();
                     System.Windows.Input.StylusPointDescription stylusPointDescription = new StylusPointDescription();
-                    StylusPoint stylusPoint = new StylusPoint();
-                    stylusPoint.X = 580;
-                    stylusPoint.Y = 212;
+                    StylusPoint stylusPoint = new StylusPoint
+                    {
+                        X = 580,
+                        Y = 212
+                    };
                     stylusPoints.Add(stylusPoint);
                     Stroke stroke = new Stroke(stylusPoints);
 
@@ -350,10 +354,11 @@ namespace Common.system
                 }
             }
         }
-        StylusPointCollection stylusPoints = new StylusPointCollection();
-        StylusPoint stylusPoint = new StylusPoint();
-        Stroke stroke;
-        bool isFirst = true;
+
+        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)
         {
             if (_new)
@@ -393,12 +398,14 @@ namespace Common.system
                     if (stylusPoints.Count > 1)
                     {
                         stroke = new Stroke(stylusPoints);
-                        drawingAttributes = new DrawingAttributes();
-                        drawingAttributes.Color = _color;
-                        drawingAttributes.Width = _size*4.5;
-                        drawingAttributes.Height = _size * 4.5;
-                        drawingAttributes.FitToCurve = true;
-                        drawingAttributes.IgnorePressure = false;
+                        drawingAttributes = new DrawingAttributes
+                        {
+                            Color = _color,
+                            Width = _size * 4.5,
+                            Height = _size * 4.5,
+                            FitToCurve = true,
+                            IgnorePressure = false
+                        };
                         stroke.DrawingAttributes = drawingAttributes;
                         m_canvas.Strokes.Add(stroke);
                         isFirst = false;
@@ -412,12 +419,14 @@ namespace Common.system
                         stylusPoint.Y = _y;
                         stylusPoints.Add(stylusPoint);
                         stroke = new Stroke(stylusPoints);
-                        drawingAttributes = new DrawingAttributes();
-                        drawingAttributes.Color = _color;
-                        drawingAttributes.Width = _size * 4.5;
-                        drawingAttributes.Height = _size * 4.5;
-                        drawingAttributes.FitToCurve = true;
-                        drawingAttributes.IgnorePressure = false;
+                        drawingAttributes = new DrawingAttributes
+                        {
+                            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;
                     }

Common/system/CLeopardZip.cs

@@ -42,9 +42,11 @@ namespace Common.system
 
                     byte[] buffer = new byte[fs.Length];
                     fs.Read(buffer, 0, buffer.Length);
-                    ent = new ZipEntry(Path.Combine(parentFolderName, Path.GetFileName(folderToZip) + "/" + Path.GetFileName(file)));
-                    ent.DateTime = DateTime.Now;
-                    ent.Size = fs.Length;
+                    ent = new ZipEntry(Path.Combine(parentFolderName, Path.GetFileName(folderToZip) + "/" + Path.GetFileName(file)))
+                    {
+                        DateTime = DateTime.Now,
+                        Size = fs.Length
+                    };
 
                     fs.Close();
 
@@ -78,8 +80,12 @@ namespace Common.system
 
             folders = Directory.GetDirectories(folderToZip);
             foreach (string folder in folders)
+            {
                 if (!ZipDirectory(folder, zipStream, folderToZip))
+                {
                     return false;
+                }
+            }
 
             return result;
         }
@@ -95,11 +101,16 @@ namespace Common.system
         {
             bool result = false;
             if (!Directory.Exists(folderToZip))
+            {
                 return result;
+            }
 
             ZipOutputStream zipStream = new ZipOutputStream(File.Create(zipedFile));
             zipStream.SetLevel(6);
-            if (!string.IsNullOrEmpty(password)) zipStream.Password = password;
+            if (!string.IsNullOrEmpty(password))
+            {
+                zipStream.Password = password;
+            }
 
             result = ZipDirectory(folderToZip, zipStream, "");
 
@@ -136,7 +147,9 @@ namespace Common.system
             ZipEntry ent = null;
 
             if (!File.Exists(fileToZip))
+            {
                 return false;
+            }
 
             try
             {
@@ -147,7 +160,11 @@ namespace Common.system
 
                 fs = File.Create(zipedFile);
                 zipStream = new ZipOutputStream(fs);
-                if (!string.IsNullOrEmpty(password)) zipStream.Password = password;
+                if (!string.IsNullOrEmpty(password))
+                {
+                    zipStream.Password = password;
+                }
+
                 ent = new ZipEntry(Path.GetFileName(fileToZip));
                 zipStream.PutNextEntry(ent);
                 zipStream.SetLevel(6);
@@ -205,9 +222,13 @@ namespace Common.system
         {
             bool result = false;
             if (Directory.Exists(fileToZip))
+            {
                 result = ZipDirectory(fileToZip, zipedFile, password);
+            }
             else if (File.Exists(fileToZip))
+            {
                 result = ZipFile(fileToZip, zipedFile, password);
+            }
 
             return result;
         }
@@ -245,15 +266,23 @@ namespace Common.system
             string fileName;
 
             if (!File.Exists(fileToUnZip))
+            {
                 return false;
+            }
 
             if (!Directory.Exists(zipedFolder))
+            {
                 Directory.CreateDirectory(zipedFolder);
+            }
 
             try
             {
                 zipStream = new ZipInputStream(File.OpenRead(fileToUnZip));
-                if (!string.IsNullOrEmpty(password)) zipStream.Password = password;
+                if (!string.IsNullOrEmpty(password))
+                {
+                    zipStream.Password = password;
+                }
+
                 while ((ent = zipStream.GetNextEntry()) != null)
                 {
                     if (!string.IsNullOrEmpty(ent.Name))
@@ -274,9 +303,13 @@ namespace Common.system
                         {
                             size = zipStream.Read(data, 0, data.Length);
                             if (size > 0)
+                            {
                                 fs.Write(data, 0, data.Length);
+                            }
                             else
+                            {
                                 break;
+                            }
                         }
                     }
                 }
@@ -351,7 +384,9 @@ namespace Common.system
                         pathToZip = theEntry.Name;
 
                         if (pathToZip != "")
+                        {
                             directoryName = Path.GetDirectoryName(pathToZip) + "\\";
+                        }
 
                         string fileName = Path.GetFileName(pathToZip);
 
@@ -372,9 +407,13 @@ namespace Common.system
                                             size = zipfiles.Read(data, 0, data.Length);
 
                                             if (size > 0)
+                                            {
                                                 streamWriter.Write(data, 0, size);
+                                            }
                                             else
+                                            {
                                                 break;
+                                            }
                                         }
                                         streamWriter.Close();
                                     }
@@ -426,13 +465,19 @@ namespace Common.system
                     //  方法二，将文件分批读入缓冲区    
                     byte[] data = new byte[2048];
                     int size = 2048;
-                    ZipEntry entry = new ZipEntry(Path.GetFileName(file.Name));
-                    entry.DateTime = (file.CreationTime > file.LastWriteTime ? file.LastWriteTime : file.CreationTime);
+                    ZipEntry entry = new ZipEntry(Path.GetFileName(file.Name))
+                    {
+                        DateTime = (file.CreationTime > file.LastWriteTime ? file.LastWriteTime : file.CreationTime)
+                    };
                     s.PutNextEntry(entry);
                     while (true)
                     {
                         size = fs.Read(data, 0, size);
-                        if (size <= 0) break;
+                        if (size <= 0)
+                        {
+                            break;
+                        }
+
                         s.Write(data, 0, size);
                     }
                     fs.Close();
@@ -465,13 +510,19 @@ namespace Common.system
                 //  方法二，将文件分批读入缓冲区    
                 byte[] data = new byte[2048];
                 int size = 2048;
-                ZipEntry entry = new ZipEntry(Path.GetFileName(file.Name));
-                entry.DateTime = (file.CreationTime > file.LastWriteTime ? file.LastWriteTime : file.CreationTime);
+                ZipEntry entry = new ZipEntry(Path.GetFileName(file.Name))
+                {
+                    DateTime = (file.CreationTime > file.LastWriteTime ? file.LastWriteTime : file.CreationTime)
+                };
                 s.PutNextEntry(entry);
                 while (true)
                 {
                     size = fs.Read(data, 0, size);
-                    if (size <= 0) break;
+                    if (size <= 0)
+                    {
+                        break;
+                    }
+
                     s.Write(data, 0, size);
                 }
                 fs.Close();
@@ -515,9 +566,11 @@ namespace Common.system
                     FileStream fs = File.OpenRead(item.Key.ToString());
                     byte[] buffer = new byte[fs.Length];
                     fs.Read(buffer, 0, buffer.Length);
-                    ZipEntry entry = new ZipEntry(item.Key.Substring(dirPath.Length));
-                    entry.DateTime = item.Value;
-                    entry.Size = fs.Length;
+                    ZipEntry entry = new ZipEntry(item.Key.Substring(dirPath.Length))
+                    {
+                        DateTime = item.Value,
+                        Size = fs.Length
+                    };
                     fs.Close();
                     crc.Reset();
                     crc.Update(buffer);
@@ -587,7 +640,11 @@ namespace Common.system
         {
             //string directoryName = Path.GetDirectoryName(targetPath + "//") + "//";    
             string directoryName = targetPath;
-            if (!Directory.Exists(directoryName)) Directory.CreateDirectory(directoryName);//生成解压目录    
+            if (!Directory.Exists(directoryName))
+            {
+                Directory.CreateDirectory(directoryName);//生成解压目录    
+            }
+
             string CurrentDirectory = directoryName;
             byte[] data = new byte[2048];
             int size = 2048;
@@ -598,11 +655,14 @@ namespace Common.system
                 {
                     if (theEntry.IsDirectory)
                     {// 该结点是目录    
-                        if (!Directory.Exists(CurrentDirectory + theEntry.Name)) Directory.CreateDirectory(CurrentDirectory + theEntry.Name);
+                        if (!Directory.Exists(CurrentDirectory + theEntry.Name))
+                        {
+                            Directory.CreateDirectory(CurrentDirectory + theEntry.Name);
+                        }
                     }
                     else
                     {
-                        if (theEntry.Name != String.Empty)
+                        if (theEntry.Name != string.Empty)
                         {
                             //  检查多级目录是否存在  
                             if (theEntry.Name.Contains("\\"))
@@ -620,7 +680,11 @@ namespace Common.system
                                 while (true)
                                 {
                                     size = s.Read(data, 0, data.Length);
-                                    if (size <= 0) break;
+                                    if (size <= 0)
+                                    {
+                                        break;
+                                    }
+
                                     streamWriter.Write(data, 0, size);
                                 }
                                 streamWriter.Close();

Common/system/CameraHelper.cs

@@ -23,14 +23,8 @@ namespace Common.system
         /// </summary>
         public static FilterInfoCollection CameraDevices
         {
-            get
-            {
-                return _cameraDevices;
-            }
-            set
-            {
-                _cameraDevices = value;
-            }
+            get => _cameraDevices;
+            set => _cameraDevices = value;
         }
         /// <summary>
         /// 指示是否显示摄像头视频画面
@@ -38,8 +32,8 @@ namespace Common.system
         /// </summary>
         public static bool IsDisplay
         {
-            get { return _isDisplay; }
-            set { _isDisplay = value; }
+            get => _isDisplay;
+            set => _isDisplay = value;
         }
         /// <summary>
         /// 获取或设置VideoSourcePlayer控件，
@@ -47,7 +41,7 @@ namespace Common.system
         /// </summary>
         public static VideoSourcePlayer SourcePlayer
         {
-            get { return sourcePlayer; }
+            get => sourcePlayer;
             set
             {
                 if (_isDisplay)
@@ -72,10 +66,20 @@ namespace Common.system
         /// <returns><see cref="bool"/></returns>
         public static bool SetCameraDevice(int index)
         {
-            if (!isSet) _isDisplay = false;
+            if (!isSet)
+            {
+                _isDisplay = false;
+            }
             //无设备，返回false
-            if (_cameraDevices.Count <= 0 || index < 0) return false;
-            if (index > _cameraDevices.Count - 1) return false;
+            if (_cameraDevices.Count <= 0 || index < 0)
+            {
+                return false;
+            }
+
+            if (index > _cameraDevices.Count - 1)
+            {
+                return false;
+            }
             // 设定初始视频设备
             div = new VideoCaptureDevice(_cameraDevices[index].MonikerString);
             sourcePlayer.VideoSource = div;
@@ -91,7 +95,11 @@ namespace Common.system
         /// <returns>如果保存成功，则返回完整路径，否则为 null</returns>
         public static string CaptureImage(string filePath, string fileName = null)
         {
-            if (sourcePlayer.VideoSource == null) return null;
+            if (sourcePlayer.VideoSource == null)
+            {
+                return null;
+            }
+
             if (!Directory.Exists(filePath))
             {
                 Directory.CreateDirectory(filePath);
@@ -99,9 +107,13 @@ namespace Common.system
             try
             {
                 Image bitmap = sourcePlayer.GetCurrentVideoFrame();
-                if(bitmap!=null)
+                if (bitmap != null)
                 {
-                    if (fileName == null) fileName = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
+                    if (fileName == null)
+                    {
+                        fileName = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
+                    }
+
                     string fullPath = Path.Combine(filePath, fileName + "-cap.jpg");
                     bitmap.Save(fullPath, ImageFormat.Jpeg);
                     bitmap.Dispose();
@@ -109,9 +121,9 @@ namespace Common.system
                 }
                 return null;
             }
-            catch (Exception e)
+            catch (Exception)
             {
-          
+
                 return null;
             }
         }

Common/system/DataConvertCommon.cs

@@ -19,9 +19,9 @@
         public static TChild ParentClassCopy<TParent, TChild>(TParent parent) where TChild : TParent, new()
         {
             TChild child = new TChild();
-            var ParentType = typeof(TParent);
-            var Properties = ParentType.GetProperties();
-            foreach (var 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)

Common/system/DownloadManager.cs

@@ -50,7 +50,7 @@ namespace Common.system
         /// </summary>
         public void Stop()
         {
-            this.isRun = false;
+            isRun = false;
             dls.ForEach(dl => dl.Stop());
             OnStopHandler();
         }
@@ -59,7 +59,7 @@ namespace Common.system
         /// </summary>
         public void Start()
         {
-            this.dlInfo.isReStart = false;
+            dlInfo.isReStart = false;
             WorkStart();
         }
         /// <summary>
@@ -67,7 +67,7 @@ namespace Common.system
         /// </summary>
         public void ReStart()
         {
-            this.dlInfo.isReStart = true;
+            dlInfo.isReStart = true;
             WorkStart();
         }
         /// <summary>
@@ -79,16 +79,22 @@ namespace Common.system
             {
                 if (dlInfo.isReStart)
                 {
-                    this.Stop();
+                    Stop();
                 }
 
                 while (dls.Where(dl => !dl.isStopped).Count() > 0)
                 {
-                    if (dlInfo.isReStart) Thread.Sleep(100);
-                    else return;
+                    if (dlInfo.isReStart)
+                    {
+                        Thread.Sleep(100);
+                    }
+                    else
+                    {
+                        return;
+                    }
                 }
 
-                this.isRun = true;
+                isRun = true;
                 OnStartHandler();
                 //首次任务或者不支持断点续传的进入
                 if (dlInfo.isNewTask || (!dlInfo.isNewTask && !dlInfo.IsSupportMultiThreading))
@@ -96,17 +102,21 @@ namespace Common.system
                     try
                     {
                         //第一次请求获取一小块数据，根据返回的情况判断是否支持断点续传
-                        using (var rsp = HttpHelper.Download(dlInfo.downloadUrlList[0], 0, 0, dlInfo.method))
+                        using (System.Net.WebResponse rsp = HttpHelper.Download(dlInfo.downloadUrlList[0], 0, 0, dlInfo.method))
                         {
 
                             //获取文件名，如果包含附件名称则取下附件，否则从url获取名称
-                            var Disposition = rsp.Headers["Content-Disposition"];
+                            string Disposition = rsp.Headers["Content-Disposition"];
                             try
                             {
                                 if (Disposition != null)
+                                {
                                     dlInfo.fileName = Disposition.Split('=')[1];
+                                }
                                 else
+                                {
                                     dlInfo.fileName = Path.GetFileName(rsp.ResponseUri.AbsolutePath);
+                                }
                             }
                             catch (Exception)//无法获取文件名时  使用传入保存名称
                             {
@@ -116,7 +126,7 @@ namespace Common.system
                             //默认给流总数
                             dlInfo.count = rsp.ContentLength;
                             //尝试获取 Content-Range 头部，不为空说明支持断点续传
-                            var contentRange = rsp.Headers["Content-Range"];
+                            string contentRange = rsp.Headers["Content-Range"];
                             if (contentRange != null)
                             {
                                 //支持断点续传的话，就取range 这里的总数
@@ -155,11 +165,11 @@ namespace Common.system
                     StartTask(dlInfo);
 
                     //等待合并
-                    while (this.dls.Where(td => !td.isFinish).Count() > 0 && this.isRun)
+                    while (dls.Where(td => !td.isFinish).Count() > 0 && isRun)
                     {
                         Thread.Sleep(100);
                     }
-                    if ((this.dls.Where(td => !td.isFinish).Count() == 0))
+                    if ((dls.Where(td => !td.isFinish).Count() == 0))
                     {
 
                         CombineFiles(dlInfo);
@@ -178,14 +188,14 @@ namespace Common.system
             string realFilePath = GetRealFileName(dlInfo);
 
             //合并数据
-            byte[] buffer = new Byte[2048];
+            byte[] buffer = new byte[2048];
             int length = 0;
-            using (var fileStream = File.Open(realFilePath, FileMode.CreateNew))
+            using (FileStream fileStream = File.Open(realFilePath, FileMode.CreateNew))
             {
                 for (int i = 0; i < dlInfo.TaskInfoList.Count; i++)
                 {
-                    var tempFile = dlInfo.TaskInfoList[i].filePath;
-                    using (var tempStream = File.Open(tempFile, FileMode.Open))
+                    string tempFile = dlInfo.TaskInfoList[i].filePath;
+                    using (FileStream tempStream = File.Open(tempFile, FileMode.Open))
                     {
                         while ((length = tempStream.Read(buffer, 0, buffer.Length)) > 0)
                         {
@@ -205,8 +215,8 @@ namespace Common.system
         private static string GetRealFileName(DownloadInfoModel dlInfo)
         {
             //创建正式文件名，如果已存在则加数字序号创建，避免覆盖
-            var fileIndex = 0;
-            var realFilePath = Path.Combine(dlInfo.saveDir, dlInfo.saveFileName);
+            int fileIndex = 0;
+            string realFilePath = Path.Combine(dlInfo.saveDir, dlInfo.saveFileName);
             while (File.Exists(realFilePath))
             {
                 realFilePath = Path.Combine(dlInfo.saveDir, string.Format("{0}_{1}", fileIndex++, dlInfo.fileName));
@@ -217,12 +227,12 @@ namespace Common.system
 
         private void StartTask(DownloadInfoModel dlInfo)
         {
-            this.dls = new List<DownloadService>();
+            dls = new List<DownloadService>();
             if (dlInfo.TaskInfoList != null)
             {
-                foreach (var item in dlInfo.TaskInfoList)
+                foreach (TaskInfoModel item in dlInfo.TaskInfoList)
                 {
-                    var dl = new DownloadService();
+                    DownloadService dl = new DownloadService();
                     dl.OnDownload += OnDownloadHandler;
                     dl.OnDisconnect += OnDisconnectHandler;
                     dls.Add(dl);
@@ -245,17 +255,24 @@ namespace Common.system
         /// <param name="dlInfo"></param>
         private void GetTaskInfo(DownloadInfoModel dlInfo)
         {
-            var pieceSize = (dlInfo.count) / dlInfo.taskCount;
+            long pieceSize = (dlInfo.count) / dlInfo.taskCount;
             dlInfo.TaskInfoList = new List<TaskInfoModel>();
-            var rand = new Random();
-            var urlIndex = 0;
+            Random rand = new Random();
+            int urlIndex = 0;
             for (int i = 0; i <= dlInfo.taskCount + 1; i++)
             {
-                var from = (i * pieceSize);
+                long from = (i * pieceSize);
 
-                if (from >= dlInfo.count) break;
-                var to = from + pieceSize;
-                if (to >= dlInfo.count) to = dlInfo.count;
+                if (from >= dlInfo.count)
+                {
+                    break;
+                }
+
+                long to = from + pieceSize;
+                if (to >= dlInfo.count)
+                {
+                    to = dlInfo.count;
+                }
 
                 dlInfo.TaskInfoList.Add(
                     new TaskInfoModel
@@ -267,7 +284,10 @@ namespace Common.system
                         fromIndex = from,
                         toIndex = to
                     });
-                if (urlIndex >= dlInfo.downloadUrlList.Count) urlIndex = 0;
+                if (urlIndex >= dlInfo.downloadUrlList.Count)
+                {
+                    urlIndex = 0;
+                }
             }
         }
 
@@ -280,17 +300,17 @@ namespace Common.system
         {
             try
             {
-                using (var writer = File.Open(filePath, FileMode.Append))
+                using (FileStream writer = File.Open(filePath, FileMode.Append))
                 {
                     using (stream)
                     {
-                        var repeatTimes = 0;
+                        int repeatTimes = 0;
                         byte[] buffer = new byte[1024];
-                        var length = 0;
-                        while ((length = stream.Read(buffer, 0, buffer.Length)) > 0 && this.isRun)
+                        int length = 0;
+                        while ((length = stream.Read(buffer, 0, buffer.Length)) > 0 && isRun)
                         {
                             writer.Write(buffer, 0, length);
-                            this.fromIndex += length;
+                            fromIndex += length;
                             if (repeatTimes % 5 == 0)
                             {
                                 writer.Flush();//一定大小就刷一次缓冲区
@@ -316,7 +336,7 @@ namespace Common.system
         {
             new Action(() =>
             {
-                this.OnStart.Invoke();
+                OnStart.Invoke();
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -326,7 +346,7 @@ namespace Common.system
         {
             new Action(() =>
             {
-                this.OnStop.Invoke();
+                OnStop.Invoke();
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -338,10 +358,10 @@ namespace Common.system
             {
                 for (int i = 0; i < dlInfo.TaskInfoList.Count; i++)
                 {
-                    var tempFile = dlInfo.TaskInfoList[i].filePath;
+                    string tempFile = dlInfo.TaskInfoList[i].filePath;
                     File.Delete(tempFile);
                 }
-                this.OnFinsh.Invoke(dlInfo.saveFileName);
+                OnFinsh.Invoke(dlInfo.saveFileName);
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -352,7 +372,7 @@ namespace Common.system
             new Action(() =>
             {
                 long current = GetDownloadLength();
-                this.OnDownload.Invoke(current, dlInfo.count, dlInfo.saveFileName);
+                OnDownload.Invoke(current, dlInfo.count, dlInfo.saveFileName);
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -362,7 +382,7 @@ namespace Common.system
         {
             new Action(() =>
             {
-                this.OnDisconnect.Invoke(dlInfo.saveFileName);
+                OnDisconnect.Invoke(dlInfo.saveFileName);
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -371,18 +391,21 @@ namespace Common.system
         /// <returns></returns>
         public long GetDownloadLength()
         {
-            if (dlInfo.IsSupportMultiThreading) return dls.Sum(dl => dl.GetDownloadedCount());
-            else return this.fromIndex;
+            if (dlInfo.IsSupportMultiThreading)
+            {
+                return dls.Sum(dl => dl.GetDownloadedCount());
+            }
+            else
+            {
+                return fromIndex;
+            }
         }
 
         /// <summary>
         /// 获取保存文件名
         /// </summary>
         /// <returns></returns>
-        public DownloadInfoModel GetFileInfo
-        {
-            get { return dlInfo; }
-        }
+        public DownloadInfoModel GetFileInfo => dlInfo;
 
     }
 }

Common/system/DownloadService.cs

@@ -47,12 +47,12 @@ namespace Common.system
 
         public long GetDownloadedCount()
         {
-            return this.count - this.toIndex + this.fromIndex - 1;
+            return count - toIndex + fromIndex - 1;
         }
 
         public void Stop()
         {
-            this.isRun = false;
+            isRun = false;
         }
 
         /// <summary>
@@ -63,53 +63,58 @@ namespace Common.system
         /// <returns></returns>
         public bool Start(TaskInfoModel info, bool isReStart)
         {
-            this.downloadUrl = info.downloadUrl;
-            this.fromIndex = info.fromIndex;
-            this.toIndex = info.toIndex;
-            this.method = info.method;
-            this.filePath = info.filePath;
-            this.count = info.count;
-            this.isStopped = false;
-            if (File.Exists(this.filePath))
+            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 (isReStart)
                 {
-                    File.Delete(this.filePath);
-                    File.Create(this.filePath).Close();
+                    File.Delete(filePath);
+                    File.Create(filePath).Close();
                 }
             }
             else
             {
-                File.Create(this.filePath).Close();
+                File.Create(filePath).Close();
             }
-            using (var file = File.Open(this.filePath, FileMode.Open))
+            using (FileStream file = File.Open(filePath, FileMode.Open))
             {
-                this.fromIndex = info.fromIndex + file.Length;
+                fromIndex = info.fromIndex + file.Length;
             }
-            if (this.fromIndex >= this.toIndex)
+            if (fromIndex >= toIndex)
             {
                 OnFineshHandler();
-                this.isFinish = true;
-                this.isStopped = true;
+                isFinish = true;
+                isStopped = true;
                 return false;
             }
             OnStartHandler();
-            this.isRun = true;
+            isRun = true;
             new Action(() =>
             {
                 WebResponse rsp;
-                while (this.fromIndex < this.toIndex && isRun)
+                while (fromIndex < toIndex && isRun)
                 {
                     long to;
-                    if (this.fromIndex + this.size >= this.toIndex - 1)
-                        to = this.toIndex - 1;
+                    if (fromIndex + size >= toIndex - 1)
+                    {
+                        to = toIndex - 1;
+                    }
                     else
-                        to = this.fromIndex + size;
+                    {
+                        to = fromIndex + size;
+                    }
+
                     try
                     {
-                        using (rsp = HttpHelper.Download(this.downloadUrl, this.fromIndex, to, this.method))
+                        using (rsp = HttpHelper.Download(downloadUrl, fromIndex, to, method))
                         {
-                            Save(this.filePath, rsp.GetResponseStream());
+                            Save(filePath, rsp.GetResponseStream());
                         }
                     }
                     catch (Exception ex)
@@ -120,11 +125,15 @@ namespace Common.system
                         return;
                     }
                 }
-                if (!this.isRun) this.isStopped = true;
-                if (this.fromIndex >= this.toIndex)
+                if (!isRun)
                 {
-                    this.isFinish = true;
-                    this.isStopped = true;
+                    isStopped = true;
+                }
+
+                if (fromIndex >= toIndex)
+                {
+                    isFinish = true;
+                    isStopped = true;
                     OnFineshHandler();
                 }
 
@@ -140,17 +149,17 @@ namespace Common.system
         {
             try
             {
-                using (var writer = File.Open(filePath, FileMode.Append))
+                using (FileStream writer = File.Open(filePath, FileMode.Append))
                 {
                     using (stream)
                     {
-                        var repeatTimes = 0;
+                        int repeatTimes = 0;
                         byte[] buffer = new byte[1024];
-                        var length = 0;
-                        while ((length = stream.Read(buffer, 0, buffer.Length)) > 0 && this.isRun)
+                        int length = 0;
+                        while ((length = stream.Read(buffer, 0, buffer.Length)) > 0 && isRun)
                         {
                             writer.Write(buffer, 0, length);
-                            this.fromIndex += length;
+                            fromIndex += length;
                             if (repeatTimes % 5 == 0)
                             {
                                 OnDownloadHandler();
@@ -173,8 +182,10 @@ namespace Common.system
         {
             new Action(() =>
             {
-                if (this.OnStart != null)
-                    this.OnStart.Invoke();
+                if (OnStart != null)
+                {
+                    OnStart.Invoke();
+                }
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -184,10 +195,15 @@ namespace Common.system
         {
             new Action(() =>
             {
-                if (this.OnFinsh != null)
-                    this.OnFinsh.Invoke();
-                if (this.OnDownload != null)
-                    this.OnDownload.Invoke();
+                if (OnFinsh != null)
+                {
+                    OnFinsh.Invoke();
+                }
+
+                if (OnDownload != null)
+                {
+                    OnDownload.Invoke();
+                }
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -197,8 +213,10 @@ namespace Common.system
         {
             new Action(() =>
             {
-                if (this.OnDownload != null)
-                    this.OnDownload.Invoke();
+                if (OnDownload != null)
+                {
+                    OnDownload.Invoke();
+                }
             }).BeginInvoke(null, null);
         }
         /// <summary>
@@ -208,8 +226,10 @@ namespace Common.system
         {
             new Action(() =>
             {
-                if (this.OnDisconnect != null)
-                    this.OnDisconnect.Invoke();
+                if (OnDisconnect != null)
+                {
+                    OnDisconnect.Invoke();
+                }
             }).BeginInvoke(null, null);
 
         }

Common/system/FFMpeg.cs

@@ -18,18 +18,21 @@ namespace Common.system
     public class FFMpeg
     {
         public Process myProcess = null;
+
         /// <summary>
         /// ffmpeg输出日志文件地址  每个文件2MB左右
         /// </summary>
-        string LogPath = "";
+        private string LogPath = "";
+
         /// <summary>
         /// 是否可以录制扬声器
         /// </summary>
-        bool IsRecordSpeaker = true;
+        private bool IsRecordSpeaker = true;
+
         /// <summary>
         /// 是否可以录制麦克风
         /// </summary>
-        bool IsRecordMicrophone = true;
+        private bool IsRecordMicrophone = true;
         /// <summary>
         /// 录制屏幕
         /// </summary>
@@ -46,7 +49,7 @@ namespace Common.system
             //文件保存路径
             string PathName = GetRSFilePathName(FilePath);
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            foreach (var KillProcess in KillProcessArray)
+            foreach (Process KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
             }
@@ -157,7 +160,7 @@ namespace Common.system
             //文件保存路径
             string PathName = GetFilePathName(Mp3Path);
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            foreach (var KillProcess in KillProcessArray)
+            foreach (Process KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
             }
@@ -203,7 +206,7 @@ namespace Common.system
             #endregion
             myProcess = new Process();
             LogPath = CreateffmpegLog();
-            this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+            myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             if (IsRecordSpeaker && IsRecordMicrophone)
             {
                 myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\"  -f dshow -i audio=\"" +
@@ -250,7 +253,7 @@ namespace Common.system
             {
                 IsRunning = false;
                 Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
-                foreach (var KillProcess in ProcessArray)
+                foreach (Process KillProcess in ProcessArray)
                 {
                     IsRunning = true;
                     Thread.Sleep(100);
@@ -281,7 +284,7 @@ namespace Common.system
             {
                 IsRunning = false;
                 Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
-                foreach (var KillProcess in ProcessArray)
+                foreach (Process KillProcess in ProcessArray)
                 {
                     IsRunning = true;
                     Thread.Sleep(100);
@@ -317,7 +320,7 @@ namespace Common.system
             string Extension = FileToolsCommon.GetIOExtension(VideoSavePath);//扩展名
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
             //Debug.WriteLine(KillProcessArray.Length.ToString());
-            foreach (var KillProcess in KillProcessArray)
+            foreach (Process KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
             }
@@ -336,7 +339,7 @@ namespace Common.system
                     }
                 }
                 #endregion
-                this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+                myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
                 switch (Extension.ToUpper())
                 {
                     case ".MP4":
@@ -381,7 +384,7 @@ namespace Common.system
                 {
                     IsRunning = false;
                     Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
-                    foreach (var KillProcess in ProcessArray)
+                    foreach (Process KillProcess in ProcessArray)
                     {
                         IsRunning = true;
                         Thread.Sleep(100);
@@ -454,7 +457,7 @@ namespace Common.system
             #endregion
             myProcess = new Process();
             LogPath = CreateffmpegLog();
-            this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+            myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             if (Extension.ToUpper() == ".MP3")
             {
                 myProcess.StartInfo.Arguments = "-f concat  -safe 0 -i " + Path + "temp/filelist.d -c copy " + FilePath;
@@ -481,7 +484,7 @@ namespace Common.system
             {
                 IsRunning = false;
                 Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
-                foreach (var KillProcess in ProcessArray)
+                foreach (Process KillProcess in ProcessArray)
                 {
                     IsRunning = true;
                     Thread.Sleep(100);
@@ -494,7 +497,9 @@ namespace Common.system
                 FileToolsCommon.DeleteDirectory(Path + "temp/");
             }
             else
+            {
                 FileToolsCommon.DeleteDirectory(Path + "temprs/");
+            }
         }
 
         /// <summary>
@@ -502,7 +507,7 @@ namespace Common.system
         /// </summary>
         /// <param name="FilePath">文件路径</param>
         /// <returns></returns>
-        string GetFilePathName(string FilePath)
+        private string GetFilePathName(string FilePath)
         {
             //路径
             string Path = FileToolsCommon.GetDirectoryName(FilePath);
@@ -532,7 +537,7 @@ namespace Common.system
         /// </summary>
         /// <param name="FilePath">文件路径</param>
         /// <returns></returns>
-        string GetRSFilePathName(string FilePath)
+        private string GetRSFilePathName(string FilePath)
         {
             //路径
             string Path = FileToolsCommon.GetDirectoryName(FilePath);
@@ -568,7 +573,7 @@ namespace Common.system
                 Thread.Sleep(100);
             }
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            foreach (var KillProcess in KillProcessArray)
+            foreach (Process KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
             }
@@ -576,8 +581,8 @@ namespace Common.system
             {
                 myProcess = new Process();
                 LogPath = CreateffmpegLog();
-                this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
-                                                                                                                      //myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2 -s " + thubWidth + "*" + thubHeight + " -f image2 \"" + ImagePath + "\"";
+                myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+                                                                                                                 //myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2 -s " + thubWidth + "*" + thubHeight + " -f image2 \"" + ImagePath + "\"";
                 myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2 -f image2 \"" + ImagePath + "\"";
                 myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
                 myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
@@ -596,7 +601,7 @@ namespace Common.system
                 {
                     IsRunning = false;
                     Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
-                    foreach (var KillProcess in ProcessArray)
+                    foreach (Process KillProcess in ProcessArray)
                     {
                         IsRunning = true;
                         Thread.Sleep(100);
@@ -620,14 +625,14 @@ namespace Common.system
         /// <param name="Width">宽</param>
         /// <param name="Height">高</param>
         /// <returns></returns>
-        public bool VideoTranscode(string VideoPathName,string VideoSavePathName,int Width,int Height)
+        public bool VideoTranscode(string VideoPathName, string VideoSavePathName, int Width, int Height)
         {
             while (myProcess != null)
             {
                 Thread.Sleep(100);
             }
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            foreach (var KillProcess in KillProcessArray)
+            foreach (Process KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
             }
@@ -635,8 +640,8 @@ namespace Common.system
             {
                 myProcess = new Process();
                 LogPath = CreateffmpegLog();
-                this.myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
-                myProcess.StartInfo.Arguments = "-i "+ VideoPathName + " -acodec copy -vcodec libx264 -s "+ Width + "*"+ Height + " "+ VideoSavePathName;
+                myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
+                myProcess.StartInfo.Arguments = "-i " + VideoPathName + " -acodec copy -vcodec libx264 -s " + Width + "*" + Height + " " + VideoSavePathName;
                 myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
                 myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
                 myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -654,7 +659,7 @@ namespace Common.system
                 {
                     IsRunning = false;
                     Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
-                    foreach (var KillProcess in ProcessArray)
+                    foreach (Process KillProcess in ProcessArray)
                     {
                         IsRunning = true;
                         Thread.Sleep(100);
@@ -677,7 +682,7 @@ namespace Common.system
         /// 创建日志文件
         /// </summary>
         /// <returns></returns>
-        string CreateffmpegLog()
+        private string CreateffmpegLog()
         {
             string LogFileName = DateTime.Now.ToString("yyyyMMdd");
             string LogFilePath = FileToolsCommon.GetFileAbsolutePath("/Log/FFMpegLog/");
@@ -719,7 +724,7 @@ namespace Common.system
         /// <param name="output"></param>
         private void Output(object sendProcess, DataReceivedEventArgs output)
         {
-            if (!String.IsNullOrEmpty(output.Data))
+            if (!string.IsNullOrEmpty(output.Data))
             {
                 FileToolsCommon.AppendText(LogPath, output.Data);
             }
@@ -738,7 +743,7 @@ namespace Common.system
         /// <summary>
         /// 获取麦克风
         /// </summary>
-        string GetMicrophone()
+        private string GetMicrophone()
         {
             List<string> devs = new List<string>();
 
@@ -807,7 +812,7 @@ namespace Common.system
         }
 
         //录制麦克风的声音
-        WaveInEvent waveIn = null; //new WaveInEvent();
+        private WaveInEvent waveIn = null; //new WaveInEvent();
         /// <summary>
         /// 开始录制麦克风
         /// </summary>
@@ -874,7 +879,7 @@ namespace Common.system
 
 
         //录制扬声器的声音
-        WasapiLoopbackCapture capture = null; //new WasapiLoopbackCapture();
+        private WasapiLoopbackCapture capture = null; //new WasapiLoopbackCapture();
 
         /// <summary>
         /// 开始录制扬声器

Common/system/FileToolsCommon.cs

@@ -31,9 +31,14 @@ namespace Common.system
                     if (Path != "/")
                     {
                         if (Path.Substring(1, 1) == ":")
+                        {
                             return Path;
+                        }
+
                         if (Path.Substring(0, 1) != "/")
+                        {
                             Path = "/" + Path;
+                        }
                     }
                 }
                 string AbsolutePath = Application.StartupPath.ToString().Replace("\\", "/") + Path;
@@ -318,7 +323,7 @@ namespace Common.system
             //创建一个文件对象  
             FileInfo fi = new FileInfo(filePath);
             //double size = fi.Length / 1024;
-            double size = Math.Round(((double)fi.Length / 1024.0), 2, MidpointRounding.AwayFromZero);
+            double size = Math.Round((fi.Length / 1024.0), 2, MidpointRounding.AwayFromZero);
             //获取文件的大小  
             return size;
         }
@@ -332,7 +337,7 @@ namespace Common.system
             //创建一个文件对象  
             FileInfo fi = new FileInfo(filePath);
             //double size = fi.Length / 1024 / 1024;
-            double size = Math.Round(((double)fi.Length / 1024.0 / 1024.0), 2, MidpointRounding.AwayFromZero);
+            double size = Math.Round((fi.Length / 1024.0 / 1024.0), 2, MidpointRounding.AwayFromZero);
             //获取文件的大小  
             return size;
         }
@@ -353,9 +358,13 @@ namespace Common.system
             DirectoryInfo folder = new DirectoryInfo(directoryPath);
             FileInfo[] fileList;
             if (files == null)
+            {
                 fileList = folder.GetFiles();
+            }
             else
+            {
                 fileList = folder.GetFiles(files);
+            }
             //获取文件列表  
             return fileList;
         }
@@ -645,10 +654,10 @@ namespace Common.system
         /// <returns></returns>
         public static string ReadBigFileStr(string filePath, int Length)
         {
-            byte[] buffer =ReadBigFile(filePath, Length);
+            byte[] buffer = ReadBigFile(filePath, Length);
             return Encoding.Default.GetString(buffer);
         }
-       
+
         #endregion
 
         #region 从文件的绝对路径中获取文件名( 包含扩展名 )
@@ -818,7 +827,7 @@ namespace Common.system
             double DirectorySize = DirSize(folder);
             for (int i = 0; i < 2; i++)
             {
-                DirectorySize /= (double)1024;
+                DirectorySize /= 1024;
             }
             return DirectorySize;
         }

Common/system/HttpHelper.cs

@@ -53,7 +53,7 @@ namespace Common.system
             {
                 try
                 {
-                    var request = HttpHelper.GetHttpWebRequest(downloadUrl);
+                    HttpWebRequest request = HttpHelper.GetHttpWebRequest(downloadUrl);
                     HttpHelper.init_Request(ref request);
                     request.Accept = "text/json,*/*;q=0.5";
                     request.AddRange(from, to);
@@ -75,8 +75,8 @@ namespace Common.system
         }
         public static string Get(string url, IDictionary<string, string> param)
         {
-            var paramBuilder = new List<string>();
-            foreach (var item in param)
+            List<string> paramBuilder = new List<string>();
+            foreach (KeyValuePair<string, string> item in param)
             {
                 paramBuilder.Add(string.Format("{0}={1}", item.Key, item.Value));
             }
@@ -87,14 +87,14 @@ namespace Common.system
         {
             try
             {
-                var request = GetHttpWebRequest(url);
+                HttpWebRequest request = GetHttpWebRequest(url);
                 if (request != null)
                 {
                     string retval = null;
                     init_Request(ref request);
-                    using (var Response = request.GetResponse())
+                    using (WebResponse Response = request.GetResponse())
                     {
-                        using (var reader = new System.IO.StreamReader(Response.GetResponseStream(), System.Text.Encoding.UTF8))
+                        using (StreamReader reader = new System.IO.StreamReader(Response.GetResponseStream(), System.Text.Encoding.UTF8))
                         {
                             retval = reader.ReadToEnd();
                         }
@@ -121,15 +121,15 @@ namespace Common.system
                     request.ServicePoint.Expect100Continue = false;
                     request.ContentType = "application/json; charset=utf-8";
                     request.Timeout = 5000;
-                    var bytes = System.Text.UTF8Encoding.UTF8.GetBytes(data);
+                    byte[] bytes = System.Text.UTF8Encoding.UTF8.GetBytes(data);
                     request.ContentLength = bytes.Length;
-                    using (var stream = request.GetRequestStream())
+                    using (Stream stream = request.GetRequestStream())
                     {
                         stream.Write(bytes, 0, bytes.Length);
                     }
-                    using (var response = request.GetResponse())
+                    using (WebResponse response = request.GetResponse())
                     {
-                        using (var reader = new System.IO.StreamReader(response.GetResponseStream()))
+                        using (StreamReader reader = new System.IO.StreamReader(response.GetResponseStream()))
                         {
                             retval = reader.ReadToEnd();
                         }
@@ -199,7 +199,7 @@ namespace Common.system
                     string respstr = GetStreamReader(url, responseStream, requestStream, streamReader, webResponse, timeout, encode, postData, contentType);
                     return JsonHelper.JsonToObj<T>(respstr);
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                 }
                 finally
@@ -245,7 +245,7 @@ namespace Common.system
                 streamReader = new StreamReader(responseStream, Encoding.GetEncoding(encode));
                 return streamReader.ReadToEnd();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return null;
             }
@@ -370,9 +370,9 @@ namespace Common.system
 
             Stream memStream = new System.IO.MemoryStream();
 
-            var boundarybytes = System.Text.Encoding.ASCII.GetBytes("\r\n--" +
+            byte[] boundarybytes = System.Text.Encoding.ASCII.GetBytes("\r\n--" +
                                                                     boundary + "\r\n");
-            var endBoundaryBytes = System.Text.Encoding.ASCII.GetBytes("\r\n--" +
+            byte[] endBoundaryBytes = System.Text.Encoding.ASCII.GetBytes("\r\n--" +
                                                                         boundary + "--");
             WebHeaderCollection myWebHeaderCollection = request.Headers;
             request.CookieContainer = cc;
@@ -400,15 +400,15 @@ namespace Common.system
             for (int i = 0; i < files.Length; i++)
             {
                 memStream.Write(boundarybytes, 0, boundarybytes.Length);
-                var header = string.Format(headerTemplate, "file", files[i]);
-                var headerbytes = System.Text.Encoding.UTF8.GetBytes(header);
+                string header = string.Format(headerTemplate, "file", files[i]);
+                byte[] headerbytes = System.Text.Encoding.UTF8.GetBytes(header);
 
                 memStream.Write(headerbytes, 0, headerbytes.Length);
 
-                using (var fileStream = new FileStream(files[i], FileMode.Open, FileAccess.Read))
+                using (FileStream fileStream = new FileStream(files[i], FileMode.Open, FileAccess.Read))
                 {
-                    var buffer = new byte[1024];
-                    var bytesRead = 0;
+                    byte[] buffer = new byte[1024];
+                    int bytesRead = 0;
                     while ((bytesRead = fileStream.Read(buffer, 0, buffer.Length)) != 0)
                     {
                         memStream.Write(buffer, 0, bytesRead);
@@ -428,7 +428,7 @@ namespace Common.system
                 requestStream.Write(tempBuffer, 0, tempBuffer.Length);
             }
 
-            using (var response = request.GetResponse())
+            using (WebResponse response = request.GetResponse())
             {
                 Stream stream2 = response.GetResponseStream();
                 StreamReader reader2 = new StreamReader(stream2);
@@ -490,7 +490,7 @@ namespace Common.system
                 webStream.Close();
                 return true;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 //LogHelper.WriteErrLog("请求失败：" + ex.Message, ex);
                 return false;

Common/system/ImageHelper.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Configuration;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using System.Security.Policy;
 using System.Text;
 using System.Threading;
 using System.Windows;
@@ -33,7 +31,7 @@ namespace Common.system
                     FileStream fs = File.OpenRead(path); //OpenRead
                     int filelength = 0;
                     filelength = (int)fs.Length; //获得文件长度 
-                    Byte[] image = new Byte[filelength]; //建立一个字节数组 
+                    byte[] image = new byte[filelength]; //建立一个字节数组 
                     fs.Read(image, 0, filelength); //按字节流读取 
                     System.Drawing.Image result = System.Drawing.Image.FromStream(fs);
                     fs.Close();
@@ -41,7 +39,9 @@ namespace Common.system
                     return bit;
                 }
                 else
+                {
                     return null;
+                }
             }
             catch (Exception)
             {
@@ -62,14 +62,16 @@ namespace Common.system
                     FileStream fs = File.OpenRead(path); //OpenRead
                     int filelength = 0;
                     filelength = (int)fs.Length; //获得文件长度 
-                    Byte[] image = new Byte[filelength]; //建立一个字节数组 
+                    byte[] image = new byte[filelength]; //建立一个字节数组 
                     fs.Read(image, 0, filelength); //按字节流读取 
                     System.Drawing.Image result = System.Drawing.Image.FromStream(fs);
                     fs.Close();
                     return result;
                 }
                 else
+                {
                     return null;
+                }
             }
             catch (Exception)
             {
@@ -422,7 +424,9 @@ namespace Common.system
                     }
                 }
                 if (find)
+                {
                     break;
+                }
             }
             //寻找最左边的标线，从上（top位）到下，从左到右
             for (int i = 0; i < bmp.Width; i++)//列
@@ -439,7 +443,9 @@ namespace Common.system
                     }
                 }
                 if (find)
+                {
                     break;
+                }
             }
             //寻找最下边标线，从下到上，从左到右
             for (int i = bmp.Height - 1; i >= 0; i--)//行
@@ -456,7 +462,9 @@ namespace Common.system
                     }
                 }
                 if (find)
+                {
                     break;
+                }
             }
             //寻找最右边的标线，从上到下，从右往左
             for (int i = bmp.Width - 1; i >= 0; i--)//列
@@ -473,7 +481,9 @@ namespace Common.system
                     }
                 }
                 if (find)
+                {
                     break;
+                }
             }
 
             if (right - left <= 0)//zxyceshi
@@ -504,7 +514,9 @@ namespace Common.system
         {
             //纯透明也是白色,RGB都为255为纯白
             if (c.A < 10 || (c.R > 245 && c.G > 245 && c.B > 245))
+            {
                 return true;
+            }
 
             return false;
         }

Common/system/JsonHelper.cs

@@ -1,10 +1,7 @@
 using Newtonsoft.Json;
-using System;
+
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Common.system
 {

Common/system/KeyboardHookCommon.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Common.system
@@ -28,17 +24,19 @@ namespace Common.system
         /// </summary>
         public event KeyEventHandler KeyUpEvent;
 
-        public delegate int HookProc(int nCode, Int32 wParam, IntPtr lParam);
-        static int hKeyboardHook = 0; //声明键盘钩子处理的初始值
-                                      //值在Microsoft SDK的Winuser.h里查询
+        public delegate int HookProc(int nCode, int wParam, IntPtr lParam);
+
+        private static int hKeyboardHook = 0; //声明键盘钩子处理的初始值
+                                              //值在Microsoft SDK的Winuser.h里查询
         /// <summary>
         /// 线程键盘钩子监听鼠标消息设为2，全局键盘监听鼠标消息设为13
         /// </summary>
         public const int WH_KEYBOARD_LL = 13;
+
         /// <summary>
         /// 声明KeyboardHookProcedure作为HookProc类型
         /// </summary>
-        HookProc KeyboardHookProcedure;
+        private HookProc KeyboardHookProcedure;
 
         /// <summary>
         /// 自己创建窗口按键 
@@ -79,11 +77,11 @@ namespace Common.system
 
         //使用此功能，通过信息钩子继续下一个钩子
         [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
-        public static extern int CallNextHookEx(int idHook, int nCode, Int32 wParam, IntPtr lParam);
+        public static extern int CallNextHookEx(int idHook, int nCode, int wParam, IntPtr lParam);
 
         // 取得当前线程编号（线程钩子需要用到）
         [DllImport("kernel32.dll")]
-        static extern int GetCurrentThreadId();
+        private static extern int GetCurrentThreadId();
 
         //使用WINDOWS API函数代替获取当前实例的函数,防止钩子失效
         [DllImport("kernel32.dll")]
@@ -148,7 +146,10 @@ namespace Common.system
             try
             {
 
-                if (!(retKeyboard)) throw new Exception("卸载钩子失败！");
+                if (!(retKeyboard))
+                {
+                    throw new Exception("卸载钩子失败！");
+                }
             }
             catch (Exception)
             {
@@ -157,7 +158,7 @@ namespace Common.system
         }
         //接收SetWindowsHookEx返回值  
         private static int _hHookValue = 0;
-        private int KeyboardHookProc(int nCode, Int32 wParam, IntPtr lParam)
+        private int KeyboardHookProc(int nCode, int wParam, IntPtr lParam)
         {
             // 侦听键盘事件
             if ((nCode >= 0) && (KeyDownEvent != null || KeyUpEvent != null || KeyPressEvent != null))

Common/system/LatticeFileHelper.cs

@@ -2,10 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing.Printing;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace Common.system
 {
@@ -19,10 +16,11 @@ namespace Common.system
         /// 打印进程
         /// </summary>
         public static Process PrintProcess = null;
+
         /// <summary>
         /// 输出日志文件地址  每个文件2MB左右
         /// </summary>
-        static string LogPath = "";
+        private static string LogPath = "";
         /// <summary>
         /// 运行配置 首次打开必须运行
         /// </summary>
@@ -78,7 +76,7 @@ namespace Common.system
                 Thread.Sleep(100);
             }
             Process[] KillProcessArray = Process.GetProcessesByName("PrintTool");
-            foreach (var KillProcess in KillProcessArray)
+            foreach (Process KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
             }
@@ -110,7 +108,7 @@ namespace Common.system
             {
                 IsRunning = false;
                 Process[] ProcessArray = Process.GetProcessesByName("PrintTool");
-                foreach (var KillProcess in ProcessArray)
+                foreach (Process KillProcess in ProcessArray)
                 {
                     IsRunning = true;
                     Thread.Sleep(100);
@@ -138,7 +136,7 @@ namespace Common.system
                     PrintersList.Add(sPrint);
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
 
             }
@@ -177,7 +175,7 @@ namespace Common.system
                 Thread.Sleep(100);
             }
             Process[] KillProcessArray = Process.GetProcessesByName("PrintTool");
-            foreach (var KillProcess in KillProcessArray)
+            foreach (Process KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
             }
@@ -209,7 +207,7 @@ namespace Common.system
             {
                 IsRunning = false;
                 Process[] ProcessArray = Process.GetProcessesByName("PrintTool");
-                foreach (var KillProcess in ProcessArray)
+                foreach (Process KillProcess in ProcessArray)
                 {
                     IsRunning = true;
                     Thread.Sleep(100);
@@ -264,7 +262,7 @@ namespace Common.system
         /// <param name="Message"></param>
         private static void Output(string Message)
         {
-            if (!String.IsNullOrEmpty(Message))
+            if (!string.IsNullOrEmpty(Message))
             {
                 FileToolsCommon.AppendText(LogPath, Message + "\r\n");
             }

Common/system/PdfTrunImage.cs

@@ -1,8 +1,9 @@
-using System.Collections.Generic;
+using O2S.Components.PDFRender4NET;
+
+using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using O2S.Components.PDFRender4NET;
 
 namespace Common.system
 {
@@ -14,7 +15,7 @@ namespace Common.system
     /// http://www.hrangel.com.br/index.php/2006/12/04/converter-pdf-para-imagem-jpeg-em-c/
     /// </summary>
     /// <seealso cref="http://www.hrangel.com.br/index.php/2006/12/04/converter-pdf-para-imagem-jpeg-em-c/"/>
-   public class PdfTrunImage
+    public class PdfTrunImage
     {
         public enum Definition
         {
@@ -50,7 +51,7 @@ namespace Common.system
                     startPageNum = 1;
                 }
 
-                if (endPageNum==0||endPageNum > pdfFile.PageCount)
+                if (endPageNum == 0 || endPageNum > pdfFile.PageCount)
                 {
                     endPageNum = pdfFile.PageCount;
                 }

Common/system/PrimaryScreen.cs

@@ -11,40 +11,45 @@ namespace Common.system
     {
         #region Win32 API
         [DllImport("user32.dll")]
-        static extern IntPtr GetDC(IntPtr ptr);
+        private static extern IntPtr GetDC(IntPtr ptr);
         [DllImport("gdi32.dll")]
-        static extern int GetDeviceCaps(
+        private static extern int GetDeviceCaps(
        IntPtr hdc, // handle to DC
        int nIndex // index of capability
        );
         [DllImport("user32.dll", EntryPoint = "ReleaseDC")]
-        static extern IntPtr ReleaseDC(IntPtr hWnd, IntPtr hDc);
+        private static extern IntPtr ReleaseDC(IntPtr hWnd, IntPtr hDc);
         #endregion
         #region DeviceCaps常量
         /// <summary>
         /// 屏幕的宽度（像素）；
         /// </summary>
-        const int HORZRES = 8;
+        private const int HORZRES = 8;
+
         /// <summary>
         /// 屏幕的高度
         /// </summary>
-        const int VERTRES = 10;
+        private const int VERTRES = 10;
+
         /// <summary>
         /// 沿屏幕宽度每逻辑英寸的像素数，在多显示器系统中，该值对所显示器相同
         /// </summary>
-        const int LOGPIXELSX = 88;
+        private const int LOGPIXELSX = 88;
+
         /// <summary>
         /// 沿屏幕高度每逻辑英寸的像素数，在多显示器系统中，该值对所显示器相同；
         /// </summary>
-        const int LOGPIXELSY = 90;
+        private const int LOGPIXELSY = 90;
+
         /// <summary>
         /// Windows NT：可视桌面的以像素为单位的高度。
         /// </summary>
-        const int DESKTOPVERTRES = 117;
+        private const int DESKTOPVERTRES = 117;
+
         /// <summary>
         /// DESKTOPHORZRES：Windows NT：可视桌面的以像素为单位的宽度。如果设备支持一个可视桌面或双重显示则此值可能大于VERTRES；
         /// </summary>
-        const int DESKTOPHORZRES = 118;
+        private const int DESKTOPHORZRES = 118;
         #endregion
 
         #region 属性
@@ -117,9 +122,11 @@ namespace Common.system
             get
             {
                 IntPtr hdc = GetDC(IntPtr.Zero);
-                /*int t = */GetDeviceCaps(hdc, DESKTOPHORZRES);
-               /* int d = */GetDeviceCaps(hdc, HORZRES);
-                float ScaleX = (float)GetDeviceCaps(hdc, DESKTOPHORZRES) / (float)GetDeviceCaps(hdc, HORZRES);
+                /*int t = */
+                GetDeviceCaps(hdc, DESKTOPHORZRES);
+                /* int d = */
+                GetDeviceCaps(hdc, HORZRES);
+                float ScaleX = GetDeviceCaps(hdc, DESKTOPHORZRES) / (float)GetDeviceCaps(hdc, HORZRES);
                 ReleaseDC(IntPtr.Zero, hdc);
                 return ScaleX;
             }
@@ -132,7 +139,7 @@ namespace Common.system
             get
             {
                 IntPtr hdc = GetDC(IntPtr.Zero);
-                float ScaleY = (float)(float)GetDeviceCaps(hdc, DESKTOPVERTRES) / (float)GetDeviceCaps(hdc, VERTRES);
+                float ScaleY = (float)GetDeviceCaps(hdc, DESKTOPVERTRES) / GetDeviceCaps(hdc, VERTRES);
                 ReleaseDC(IntPtr.Zero, hdc);
                 return ScaleY;
             }
@@ -142,13 +149,7 @@ namespace Common.system
         /// 缩放后的大小
         /// </summary>
         /// <returns></returns>
-        public static SizeF ScaleScreenSize
-        {
-            get
-            {
-               return new SizeF(((float)DESKTOP.Width) / (DpiX / 96f), ((float)DESKTOP.Height) / (DpiY / 96f));
-            }
-        }
+        public static SizeF ScaleScreenSize => new SizeF(DESKTOP.Width / (DpiX / 96f), DESKTOP.Height / (DpiY / 96f));
         /// <summary>
         /// 获取缩放后的工作区域大小
         /// </summary>

Common/system/SplashScreen.cs

@@ -23,7 +23,10 @@ namespace Common.system
         public static void Show(Type splashFormType)
         {
             if (_SplashThread != null)
+            {
                 return;
+            }
+
             if (splashFormType == null)
             {
                 throw (new Exception());
@@ -33,9 +36,10 @@ namespace Common.system
             {
                 CreateInstance(splashFormType);
                 Application.Run(_SplashForm);
-            }));
-
-            _SplashThread.IsBackground = true;
+            }))
+            {
+                IsBackground = true
+            };
             _SplashThread.SetApartmentState(ApartmentState.STA);
             _SplashThread.Start();
         }
@@ -50,7 +54,10 @@ namespace Common.system
 
         public static void Close()
         {
-            if (_SplashThread == null || _SplashForm == null) return;
+            if (_SplashThread == null || _SplashForm == null)
+            {
+                return;
+            }
 
             try
             {

Common/system/XmlUtilHelper.cs

@@ -81,7 +81,9 @@ namespace Common.system
             {
                 object obj;
                 if (!System.IO.File.Exists(filename))
+                {
                     throw new Exception("指定文件不存在");
+                }
                 //Xml格式反序列化  
                 using (Stream stream = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read))
                 {

Common/system/ZJClippingBorder.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;

XHWK.Model/ComboBoxBean.cs

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

XHWK.Model/Model_App.cs

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

XHWK.Model/Model_Canvas.cs

@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XHWK.Model
+namespace XHWK.Model
 {
-    public class Model_Canvas:NotifyModel
+    public class Model_Canvas : NotifyModel
     {
         private string _name;
 

XHWK.Model/Model_DirectorList.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 XHWK.Model
 {

XHWK.Model/Model_DrawData.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Media;
+using System.Windows.Media;
 
 namespace XHWK.Model
 {
@@ -16,7 +10,7 @@ namespace XHWK.Model
         private int _PageNum;
         private string _pageCode;
         private string _pageImagePath;
-        private TranslateTransform _ImageLocation=new TranslateTransform(0,0);
+        private TranslateTransform _ImageLocation = new TranslateTransform(0, 0);
         //private ScaleTransform _ImageSize = new ScaleTransform(0, 0);
         private ScaleTransform _ImageSizes = new ScaleTransform(0, 0);
         private bool _IsImageLocation;

XHWK.Model/Model_Page.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;
 
 namespace XHWK.Model
 {
@@ -39,7 +34,7 @@ namespace XHWK.Model
             set { _currpage = value; OnPropertyChanged("currpage"); }
         }
 
-        public Model_Page() 
+        public Model_Page()
         {
             menuList = new ObservableCollection<Model_Canvas>();
         }

XHWK.Model/Model_ResourceAdd.cs

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

XHWK.Model/Model_ResourceAddTwo.cs

@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XHWK.Model
+namespace XHWK.Model
 {
-    public class Model_ResourceAddTwo 
+    public class Model_ResourceAddTwo
     {
-  public string videopath { get; set; }
+        public string videopath { get; set; }
         public string coverpath { get; set; }
         public int duration { get; set; }
-        public string mp4code { get; set; } 
+        public string mp4code { get; set; }
     }
 }

XHWK.Model/Model_Screenshot.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XHWK.Model
+namespace XHWK.Model
 {
     public class Model_Screenshot
     {
@@ -18,6 +12,6 @@ namespace XHWK.Model
         /// 图片下标
         /// </summary>
         public int Subscript { get => _subscript; set => _subscript = value; }
-      
+
     }
 }

XHWK.Model/Model_TsubjectbookList.cs

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

XHWK.Model/Model_Video.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Runtime.Remoting.Messaging;
-
-namespace XHWK.Model
+namespace XHWK.Model
 {
     /// <summary>
     /// 视频模型
@@ -15,7 +12,7 @@ namespace XHWK.Model
         private string _RSTime;
         private string _videoSize;
         private long _videoSizebyte;
-        private bool _IsUpload=false;
+        private bool _IsUpload = false;
         private string _FileGuid;//= System.Guid.NewGuid().ToString()
         private string _FileMD5;
         private string _Savefolder;

XHWK.Model/ResultVo.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XHWK.Model
+namespace XHWK.Model
 {
     public class ResultVo<T>
     {

XHWK.Model/ViewModel.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel;
 using System.Windows.Ink;
 
 namespace XHWK.Model
@@ -15,7 +10,9 @@ namespace XHWK.Model
         protected virtual void OnPropertyChanged(string propertyName = null)
         {
             if (PropertyChanged != null)
+            {
                 PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            }
         }
 
         private string meaInfo;
@@ -32,7 +29,7 @@ namespace XHWK.Model
         private StrokeCollection inkStrokes;
         public StrokeCollection InkStrokes
         {
-            get { return inkStrokes; }
+            get => inkStrokes;
             set
             {
                 inkStrokes = value;

XHWK.WKTool/App.config

@@ -19,18 +19,20 @@
     <!--记住密码-->
     <add key="isRemind" value="" />
     <!--API请求地址-->
-    <add key="APIRequestAddress" value="https://schoolapitest.xhkjedu.com"/>
+    <add key="APIRequestAddress" value="https://schoolapi.xhkjedu.com"/>
     <!--文件平台请求地址-->
-    <add key="FileRequestAddress" value="https://schoolfiletest.xhkjedu.com"/>
-    <!--<add key="FileRequestAddress" value="http://192.168.2.18:8908"/>-->
+    <add key="FileRequestAddress" value="https://schoolfile.xhkjedu.com"/>
     <!--展示文件服务器请求地址-->
-    <add key="schoolfileRequestAddress" value="https://schoolfiletest.xhkjedu.com"/>
-    <!--接口地址： https://schoolapitest.xhkjedu.com/
-    文件上传： https://schoolfiletest.xhkjedu.com/
-    展示文件:   https://schoolfiletest.xhkjedu.com/-->
+    <add key="SchoolfileRequestAddress" value="https://schoolfile.xhkjedu.com"/>
+    <!--认证请求地址-->
+    <add key="CertapiRequestAddress" value="http://certapi.xhkjedu.com"/>
     <!--摄像头位置 1.右上 2.左上 3.右下 4.左下-->
     <add key="CameraPosition" value="1"/>
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1"/>
+    <!--版本号-->
+    <add key="VersionCode" value="8"/>
+    <add key="VersionName" value="1.0.7"/>
+    
   </appSettings>
 </configuration>

XHWK.WKTool/App.cs

@@ -7,10 +7,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 using System.Security.Principal;
-using System.Security.RightsManagement;
 using System.Threading;
 using System.Windows;
-using System.Windows.Documents;
 using System.Windows.Threading;
 
 using TStudyDigitalPen.HID;
@@ -22,6 +20,27 @@ namespace XHWK.WKTool
     public partial class APP : Application
     {
         #region 全局变量
+        /// <summary>
+        /// 是否为测试版
+        /// </summary>
+        public static bool isDebug = true;
+        /// <summary>
+        /// 接口地址
+        /// </summary>
+        public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("APIRequestAddress");
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public static string uploadUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/" : FileToolsCommon.GetConfigValue("FileRequestAddress");
+        /// <summary>
+        /// 展示文件
+        /// </summary>
+        public static string showImageUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/static/" : FileToolsCommon.GetConfigValue("SchoolfileRequestAddress") + "/static/";
+        /// <summary>
+        /// 认证接口地址
+        /// </summary>
+        public static string certapiUrl = isDebug ? "http://certapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("CertapiRequestAddress");
+
         /// <summary>
         /// 用户信息
         /// </summary>
@@ -80,7 +99,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 教材列表
         /// </summary>
-        public static List<Model_TsubjectbookList> TsubjectbookList=null;
+        public static List<Model_TsubjectbookList> TsubjectbookList = null;
         /// <summary>
         /// 章节列表
         /// </summary>
@@ -183,12 +202,14 @@ namespace XHWK.WKTool
                 else
                 {
                     //创建启动对象
-                    System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();
-                    startInfo.UseShellExecute = true;
-                    startInfo.WorkingDirectory = Environment.CurrentDirectory;
-                    startInfo.FileName = Assembly.GetExecutingAssembly().Location;
-                    //设置启动动作,确保以管理员身份运行
-                    startInfo.Verb = "runas";
+                    System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo
+                    {
+                        UseShellExecute = true,
+                        WorkingDirectory = Environment.CurrentDirectory,
+                        FileName = Assembly.GetExecutingAssembly().Location,
+                        //设置启动动作,确保以管理员身份运行
+                        Verb = "runas"
+                    };
                     try
                     {
                         System.Diagnostics.Process.Start(startInfo);
@@ -243,7 +264,7 @@ namespace XHWK.WKTool
         public static void Killffmpeg()
         {
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            foreach (var KillProcess in KillProcessArray)
+            foreach (Process KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
             }

XHWK.WKTool/AppUpdateWin.xaml.cs

@@ -1,21 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+
 using XHWK.Model;
-using XHWK.WKTool.Config;
 using XHWK.WKTool.Helpers;
+
 using static XHWK.WKTool.Helpers.ZJDownloadUtil;
 
 namespace XHWK.WKTool
@@ -57,7 +48,7 @@ namespace XHWK.WKTool
 
         private void gengxinClick(object sender, RoutedEventArgs e)
         {
-            string fileUrl = ZConfig.showImageUrl + pageData.appModel.versionpath;
+            string fileUrl = APP.showImageUrl + pageData.appModel.versionpath;
 
             string temp = System.Environment.GetEnvironmentVariable("TEMP");
             DirectoryInfo info = new DirectoryInfo(temp);

XHWK.WKTool/Controls/MainImage.cs

@@ -1,6 +1,7 @@
-using ComeCapture.Helpers;
-using ComeCapture.Models;
+using ComeCapture.Models;
+
 using Common.system;
+
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -3,7 +3,6 @@
 using System;
 using System.Threading;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 
@@ -18,12 +17,13 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
         }
+
         /// <summary>
         /// 计时器
         /// </summary>
-        System.Timers.Timer timer;
-        int ImgNum = 21;
-        public void Initialize(bool ShowlblShortcut=false, int changeTime=2100)
+        private System.Timers.Timer timer;
+        private int ImgNum = 21;
+        public void Initialize(bool ShowlblShortcut = false, int changeTime = 2100)
         {
             if (ShowlblShortcut)
             {
@@ -55,9 +55,9 @@ namespace XHWK.WKTool
                                       DispatcherPriority.Send,
                                       new Action(() =>
                                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
-                          Hide();
-                      }));
+                                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
+                                          Hide();
+                                      }));
                         }
                     }
                     catch (Exception ex)
@@ -80,7 +80,7 @@ namespace XHWK.WKTool
             {
                 loadingImg(ImgNum);
                 ImgNum--;
-                LogHelper.WriteInfoLog("【"+ImgNum+"】");
+                LogHelper.WriteInfoLog("【" + ImgNum + "】");
             }
             else
             {
@@ -94,158 +94,180 @@ namespace XHWK.WKTool
                   }));
             }
         }
+
         /// <summary>
         /// 加载图片
         /// </summary>
         /// <param name="num"></param>
-        void loadingImg(int num)
+        private void loadingImg(int num)
         {
             switch (num)
             {
                 case 1:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => { 
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_5.png"));
                       }));
                     break;
                 case 2:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_4.png"));
                       }));
                     break;
                 case 3:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_3.png"));
                       }));
                     break;
                 case 4:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_2.png"));
                       }));
                     break;
                 case 5:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_1.png"));
                       }));
                     break;
                 case 6:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_7.png"));
                       }));
                     break;
                 case 7:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_6.png"));
                       }));
                     break;
                 case 8:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_5.png"));
                       }));
                     break;
                 case 9:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_4.png"));
                       }));
                     break;
                 case 10:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_3.png"));
                       }));
                     break;
                 case 11:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_2.png"));
                       }));
                     break;
                 case 12:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_1.png"));
                       }));
                     break;
                 case 13:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_9.png"));
                       }));
                     break;
                 case 14:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_8.png"));
                       }));
                     break;
                 case 15:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_7.png"));
                       }));
                     break;
                 case 16:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_6.png"));
                       }));
                     break;
                 case 17:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_5.png"));
                       }));
                     break;
                 case 18:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_4.png"));
                       }));
                     break;
                 case 19:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_3.png"));
                       }));
                     break;
                 case 20:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_2.png"));
                       }));
                     break;
                 case 21:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
-                      new Action(() => {
+                      new Action(() =>
+                      {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
                       }));
                     break;

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -1,13 +1,12 @@
 using Common.system;
 
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Input;
+
 using XHWK.Model;
-using XHWK.WKTool.Config;
 
 namespace XHWK.WKTool
 {
@@ -94,15 +93,17 @@ namespace XHWK.WKTool
                 return;
             }
             #endregion
-            string wkpath=FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim()+"/";
+            string wkpath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/";
             //读取微课数据
             APP.ReadWkData(wkpath);
-            if(APP.WKData==null)
+            if (APP.WKData == null)
             {
-                APP.WKData = new Model.Model_WKData();
-                APP.WKData.WkPath = wkpath;
-                APP.WKData.WkName = txbExplainName.Text;
-                APP.WKData.WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                APP.WKData = new Model.Model_WKData
+                {
+                    WkPath = wkpath,
+                    WkName = txbExplainName.Text,
+                    WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                };
             }
             //创建文件夹
             FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
@@ -138,11 +139,11 @@ namespace XHWK.WKTool
                 //APP.W_XHMicroLessonSystemWindow .Topmost = true;
             }
             APP.W_XHMicroLessonSystemWindow.Show();
-            this.Hide();
+            Hide();
         }
-        double screeHeight = SystemParameters.FullPrimaryScreenHeight;
 
-        double screeWidth = SystemParameters.FullPrimaryScreenWidth;
+        private double screeHeight = SystemParameters.FullPrimaryScreenHeight;
+        private double screeWidth = SystemParameters.FullPrimaryScreenWidth;
         /// <summary>
         /// 窗体移动
         /// </summary>
@@ -161,7 +162,7 @@ namespace XHWK.WKTool
         {
             new Thread(o =>
             {
-                string url = ZConfig.apiUrl + "/apprecord/get_new";
+                string url = APP.apiUrl + "/apprecord/get_new";
 
                 string result = HttpHelper.PostAndRespStr(url, "{}");
                 Model.ResultVo<Model_App> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_App>>(result);
@@ -169,14 +170,21 @@ namespace XHWK.WKTool
                 {
                     if (resultObj.obj != null)
                     {
-                        int versionCode = resultObj.obj.versioncode;
-                        int versionThis = ZConfig.versionCode;
-                        if (versionThis < versionCode)
+                        try
                         {
-                            Dispatcher.Invoke(new Action(() =>
+                            int versionCode = resultObj.obj.versioncode;
+                            int versionThis = int.Parse(FileToolsCommon.GetConfigValue("VersionCode"));
+                            if (versionThis < versionCode)
                             {
-                                appUpdateShow(resultObj.obj);
-                            }));
+                                Dispatcher.Invoke(new Action(() =>
+                                {
+                                    appUpdateShow(resultObj.obj);
+                                }));
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteErrLog("【检查更新】（getNewApp）版本号错误：" + ex.Message, ex);
                         }
                     }
                 }
@@ -188,9 +196,11 @@ namespace XHWK.WKTool
         /// <param name="app"></param>
         private void appUpdateShow(Model_App app)
         {
-            AppUpdateWin win = new AppUpdateWin(app);
-            win.Topmost = true;
-            win.Owner = this;
+            AppUpdateWin win = new AppUpdateWin(app)
+            {
+                Topmost = true,
+                Owner = this
+            };
             win.ShowDialog();
         }
         private void Window_Loaded(object sender, RoutedEventArgs e)

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -4,13 +4,8 @@ using Common.system;
 using Newtonsoft.Json.Linq;
 
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 using XHWK.Model;
 
@@ -23,9 +18,9 @@ namespace XHWK.WKTool.DAL
     /// </summary>
     public class DAL_Upload
     {
-        string APIRequestAddress = FileToolsCommon.GetConfigValue("APIRequestAddress");
-        string FileRequestAddress = FileToolsCommon.GetConfigValue("FileRequestAddress");
-        string schoolfileRequestAddress = FileToolsCommon.GetConfigValue("schoolfileRequestAddress");
+        //private string APIRequestAddress = APP.apiUrl;
+        private string FileRequestAddress = APP.uploadUrl;
+        //private string schoolfileRequestAddress = APP.showImageUrl;
         /// <summary>
         /// 文件是否允许上传
         /// </summary>
@@ -40,7 +35,7 @@ namespace XHWK.WKTool.DAL
             {
                 try
                 {
-                    JObject jo = HttpHelper.PostFunction(FileRequestAddress /*"http://192.168.2.18:8908"*/ + @"/chunkdb/isexist", @"application/x-www-form-urlencoded", @"md5=" + MD5, "");
+                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/isexist", @"application/x-www-form-urlencoded", @"md5=" + MD5, "");
                     //0成功，1失败
                     if (jo["code"].ToString() == "0")
                     {
@@ -87,7 +82,7 @@ namespace XHWK.WKTool.DAL
             {
                 try
                 {
-                    JObject jo = HttpHelper.PostFunction(FileRequestAddress /*"http://192.168.2.18:8908"*/ + @"/chunkdb/mergechunk", @"application/x-www-form-urlencoded", @"savefolder=" + Savefolder + "&identifier=" + FileCode, "");
+                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/mergechunk", @"application/x-www-form-urlencoded", @"savefolder=" + Savefolder + "&identifier=" + FileCode, "");
                     Model.ResultVo<Model_ResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString()); ;
                     APP.ResourceAddTwo = new Model_ResourceAddTwo();
                     //0成功，1失败
@@ -128,24 +123,29 @@ namespace XHWK.WKTool.DAL
                 foreach (Model_WKData Vdata in APP.WKDataList)
                 {
                     if (Vdata.VideoList == null)
+                    {
                         continue;
+                    }
+
                     foreach (Model_Video videoinfo in Vdata.VideoList)
                     {
-                        if(videoinfo.FileGuid== VideoGuid)
+                        if (videoinfo.FileGuid == VideoGuid)
                         {
                             VideoInfo = videoinfo;
                             break;
                         }
                     }
                     if (VideoInfo != null)
+                    {
                         break;
+                    }
                 }
-                if (VideoInfo==null)
+                if (VideoInfo == null)
                 {
                     ErrMessage = "未找到课程！";
                     return false;
                 }
-                string UploadUrl = FileRequestAddress /*"http://192.168.2.18:8908" */+ "/chunkdb/upchunk";//zxyceshi
+                string UploadUrl = FileRequestAddress + "/chunkdb/upchunk";//zxyceshi
                 if (VideoInfo.IsUpload)
                 {
                     ErrMessage = "视频已上传";
@@ -167,7 +167,7 @@ namespace XHWK.WKTool.DAL
         /// 上传视频
         /// </summary>
         /// <returns></returns>
-        public bool UploadVideoTwo(string VideoGuid, out string ErrMessage) 
+        public bool UploadVideoTwo(string VideoGuid, out string ErrMessage)
         {
             ErrMessage = "";
             try
@@ -176,7 +176,10 @@ namespace XHWK.WKTool.DAL
                 foreach (Model_WKData Vdata in APP.WKDataList)
                 {
                     if (Vdata.VideoList == null)
+                    {
                         continue;
+                    }
+
                     foreach (Model_Video videoinfo in Vdata.VideoList)
                     {
                         if (videoinfo.FileGuid == VideoGuid)
@@ -186,14 +189,16 @@ namespace XHWK.WKTool.DAL
                         }
                     }
                     if (VideoInfo != null)
+                    {
                         break;
+                    }
                 }
                 if (VideoInfo == null)
                 {
                     ErrMessage = "未找到课程！";
                     return false;
                 }
-                string UploadUrl = FileRequestAddress /*"http://192.168.2.18:8908" */+ "/chunkdb/upchunk";//zxyceshi
+                string UploadUrl = FileRequestAddress + "/chunkdb/upchunk";//zxyceshi
                 if (VideoInfo.IsUpload)
                 {
                     ErrMessage = "视频已上传";
@@ -255,12 +260,14 @@ namespace XHWK.WKTool.DAL
                             //取指定长度的流
                             byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(VideoInfo.VideoPath, len, (int)VideoInfo.SliceLen);
                             //参数
-                            NameValueCollection formFields = new NameValueCollection();
-                            formFields.Add("identifier", VideoInfo.FileGuid);
-                            formFields.Add("chunkNumber", (VideoInfo.Uploaded + 1).ToString());
-                            formFields.Add("filename", fileName);
-                            formFields.Add("totalchunk", VideoInfo.Block.ToString());
-                            formFields.Add("md5", VideoInfo.FileMD5);
+                            NameValueCollection formFields = new NameValueCollection
+                            {
+                                { "identifier", VideoInfo.FileGuid },
+                                { "chunkNumber", (VideoInfo.Uploaded + 1).ToString() },
+                                { "filename", fileName },
+                                { "totalchunk", VideoInfo.Block.ToString() },
+                                { "md5", VideoInfo.FileMD5 }
+                            };
                             VideoInfo.Uploaded++;
                             //formFields.Add();///教材
                             //if()//章节若没选不传

XHWK.WKTool/DAL/Interface.cs

@@ -1,20 +1,19 @@
 using Common.system;
+
 using Newtonsoft.Json.Linq;
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
 using XHWK.Model;
-using XHWK.WKTool.Config;
 
 namespace XHWK.WKTool.DAL
 {
     public class Interface
     {
-        string APIRequestAddress = FileToolsCommon.GetConfigValue("APIRequestAddress");
-        string FileRequestAddress = FileToolsCommon.GetConfigValue("FileRequestAddress");
-        string schoolfileRequestAddress = FileToolsCommon.GetConfigValue("schoolfileRequestAddress");
+        //private string APIRequestAddress = FileToolsCommon.GetConfigValue("APIRequestAddress");
+        //private string FileRequestAddress = FileToolsCommon.GetConfigValue("FileRequestAddress");
+        //private string schoolfileRequestAddress = FileToolsCommon.GetConfigValue("schoolfileRequestAddress");
         /// <summary>
         /// 登陆
         /// </summary>
@@ -22,7 +21,7 @@ namespace XHWK.WKTool.DAL
         /// <returns></returns>
         public int Login(string loginname, string loginpwd)
         {
-            string url = ZConfig.apiUrl + "/user/login";//地址 
+            string url = APP.apiUrl + "/user/login";//地址 
             Dictionary<string, object> dic = new Dictionary<string, object>
             {
                 { "loginname", loginname},
@@ -40,7 +39,7 @@ namespace XHWK.WKTool.DAL
             else
             {
                 APP.ServerMsg = "网络异常！";
-                APP.UserInfo =new Model_UserInfo();
+                APP.UserInfo = new Model_UserInfo();
                 return 1;
             }
         }
@@ -54,7 +53,7 @@ namespace XHWK.WKTool.DAL
             APP.TsubjectbookList = new List<Model_TsubjectbookList>();
             try
             {
-                string url = ZConfig.apiUrl + "/tsubjectbook/list";//地址
+                string url = APP.apiUrl + "/tsubjectbook/list";//地址
                 Dictionary<string, int> dic = new Dictionary<string, int>
                 {
                     { "teacherid",APP.UserInfo.Userid}
@@ -84,12 +83,12 @@ namespace XHWK.WKTool.DAL
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public int DirectorList(int lsbid,int directortype,int createid)
+        public int DirectorList(int lsbid, int directortype, int createid)
         {
             APP.DirectorList = new List<Model_DirectorList>();
             try
             {
-                string url = ZConfig.apiUrl + "/director/list";//地址
+                string url = APP.apiUrl + "/director/list";//地址
                 Dictionary<string, int> dic = new Dictionary<string, int>
                 {
                     { "lsbid", lsbid },
@@ -126,29 +125,31 @@ namespace XHWK.WKTool.DAL
             APP.DirectorList = new List<Model_DirectorList>();
             try
             {
-                string url = ZConfig.apiUrl + "/resource/add";//地址
-                Dictionary<string, object> dic = new Dictionary<string, object>();
-                //            converted: 0
-                //createid: 80
-                //directorid: 1009
-                //duration: 39
-                //imgUrl: ""
-                //level: 2
-                //lsbid: 40
-                //mp4code: "h264"
-                //resourcebelong: 3
-                //resourceclass: 2
-                //resourcecover: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.jpg"
-                //resourcename: "weather_pic"
-                //resourcesize: 6105268
-                //resourcetype: 0
-                //resourceurl: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.mp4"
-                //schoolid: 12
-                //suffix: "mp4"
-                //uid: 80
-                dic.Add("converted", model.converted);
-                dic.Add("createid", model.createid);
-                if(model.directorid!=999999)//章节上传可以不选
+                string url = APP.apiUrl + "/resource/add";//地址
+                Dictionary<string, object> dic = new Dictionary<string, object>
+                {
+                    //            converted: 0
+                    //createid: 80
+                    //directorid: 1009
+                    //duration: 39
+                    //imgUrl: ""
+                    //level: 2
+                    //lsbid: 40
+                    //mp4code: "h264"
+                    //resourcebelong: 3
+                    //resourceclass: 2
+                    //resourcecover: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.jpg"
+                    //resourcename: "weather_pic"
+                    //resourcesize: 6105268
+                    //resourcetype: 0
+                    //resourceurl: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.mp4"
+                    //schoolid: 12
+                    //suffix: "mp4"
+                    //uid: 80
+                    { "converted", model.converted },
+                    { "createid", model.createid }
+                };
+                if (model.directorid != 999999)//章节上传可以不选
                 {
                     dic.Add("directorid", model.directorid);
                 }

XHWK.WKTool/DAL/ResultVo.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XHWK.WKTool.DAL
+namespace XHWK.WKTool.DAL
 {
     internal class ResultVo<T>
     {

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -1,13 +1,9 @@
 using Common.system;
 
-using Org.BouncyCastle.Asn1.Crmf;
-
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Security.AccessControl;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -26,7 +22,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 视频模型
         /// </summary>
-        List<Model_Video> model_VideoList = null;
+        private List<Model_Video> model_VideoList = null;
         /// <summary>
         /// 数据列表
         /// </summary>
@@ -134,7 +130,10 @@ namespace XHWK.WKTool
                 foreach (Model_WKData Vdata in APP.WKDataList)
                 {
                     if (Vdata.VideoList == null)
+                    {
                         continue;
+                    }
+
                     foreach (Model_Video videoinfo in Vdata.VideoList)
                     {
                         try
@@ -170,7 +169,7 @@ namespace XHWK.WKTool
         private void btnDown_Click(object sender, RoutedEventArgs e)
         {
             APP.SaveWkData();
-            this.Hide();
+            Hide();
         }
         /// <summary>
         /// 窗口移动
@@ -240,7 +239,10 @@ namespace XHWK.WKTool
                     foreach (Model_WKData wKData in APP.WKDataList)
                     {
                         if (wKData.VideoList == null)
+                        {
                             continue;
+                        }
+
                         if (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[i].FileGuid))
                         {
                             try
@@ -357,7 +359,8 @@ namespace XHWK.WKTool
                 }
             }
         }
-        int MouseNumber = 0;
+
+        private int MouseNumber = 0;
         /// <summary>
         /// 鼠标按下
         /// </summary>
@@ -442,6 +445,7 @@ namespace XHWK.WKTool
             //        MouseNumber++;
             //    }
         }
+
         /// <summary>
         /// 修改文件名
         /// </summary>
@@ -449,7 +453,7 @@ namespace XHWK.WKTool
         /// <param name="NewName">新文件名带后缀 不带路径</param>
         /// <param name="Errmessage">错误信息</param>
         /// <returns></returns>
-        bool ModifyPathName(string FileGuid, string NewName, out string Errmessage)
+        private bool ModifyPathName(string FileGuid, string NewName, out string Errmessage)
         {
             Errmessage = "";
             Model_Video model_Video = APP.VideoList.Find(x => x.FileGuid == FileGuid);

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -2,6 +2,7 @@
 using ComeCapture.Controls;
 using ComeCapture.Helpers;
 using ComeCapture.Models;
+
 using Common.system;
 
 
@@ -15,7 +16,9 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+
 using XHWK.WKTool;
+
 using static XHWK.WKTool.XHMicroLessonSystemWindow;
 
 namespace ComeCapture
@@ -82,7 +85,9 @@ namespace ComeCapture
             }
             string imagePath = Path.Combine(tempPath, time + ".jpg");
             if (ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), null, true, out BitmapImage bitmap))
+            {
                 Background = new ImageBrush(bitmap);
+            }
         }
 
         public void initialization()
@@ -234,8 +239,8 @@ namespace ComeCapture
             //string imagePath = ImageHelper.GetImagePath(out string serverSavePath);
 
             //BitmapSource bitmap = ImageHelper.GetBitmapSource((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2, out JieTuBitmapPtr);
-           /* BitmapImage bitmap = */
-            ImageHelper.GetScreenshot(new Rectangle((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2), imagePath,true,out BitmapImage bitmapimg);
+            /* BitmapImage bitmap = */
+            ImageHelper.GetScreenshot(new Rectangle((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2), imagePath, true, out BitmapImage bitmapimg);
             _IsMouseDown = false;
             _IsCapture = false;
             ImageEditBar.Current.Visibility = Visibility.Collapsed;

XHWK.WKTool/LoadDialog.xaml.cs

@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace XHWK.WKTool
 {

XHWK.WKTool/LoginWindow.xaml.cs

@@ -1,9 +1,10 @@
 using Common.system;
+
 using System;
 using System.Configuration;
-using System.IO;
 using System.Text;
 using System.Windows;
+
 using XHWK.WKTool.DAL;
 
 namespace XHWK.WKTool
@@ -22,13 +23,13 @@ namespace XHWK.WKTool
             InitializeComponent();
             Initialize();
         }
-        public void Initialize() 
+        public void Initialize()
         {
 
             if (FileToolsCommon.IsExistFile(APP.DataPath + "accountNumber.txt"))
             {
                 string accountNumber = System.IO.File.ReadAllText(APP.DataPath + "accountNumber.txt", Encoding.Default);
-                if(!string.IsNullOrWhiteSpace(accountNumber))
+                if (!string.IsNullOrWhiteSpace(accountNumber))
                 {
                     txbAccountNumber.Text = accountNumber;
                     ckSaveName.IsChecked = true;
@@ -49,7 +50,7 @@ namespace XHWK.WKTool
         {
             txbAccountNumber.Text = string.Empty;
             pobPassword.Password = string.Empty;
-            this.Hide();
+            Hide();
         }
         /// <summary>
         /// 登陆事件
@@ -84,13 +85,13 @@ namespace XHWK.WKTool
                 password = pobPassword.Password.Replace(" ", "").Trim();
             }));
             int code = @interface.Login(accountNumber, password);
-            if(code==0)
+            if (code == 0)
             {
                 FileToolsCommon.CreateDirectory(APP.DataPath);
                 string applicationData = APP.DataPath + "accountNumber.txt";
-                if (ckSaveName.IsChecked==true)
+                if (ckSaveName.IsChecked == true)
                 {
-                    
+
                     string accountNumbers = txbAccountNumber.Text;
                     System.IO.File.WriteAllText(applicationData, accountNumbers, Encoding.Default);//存放账号
                 }
@@ -128,7 +129,7 @@ namespace XHWK.WKTool
                 //    }
                 //}
                 #endregion
-                this.Hide();
+                Hide();
             }
             else
             {

XHWK.WKTool/MessageWindow.xaml.cs

@@ -1,16 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
+using System.Windows;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace XHWK.WKTool
 {
@@ -25,7 +14,7 @@ namespace XHWK.WKTool
         /// <param name="MessageType">取消按钮  1不显示2显示</param>
         /// <param name="Title">标题</param>
         /// <param name="content">消息内容</param>
-        public MessageWindow(int MessageType,string Title,string Content)
+        public MessageWindow(int MessageType, string Title, string Content)
         {
             InitializeComponent();
             switch (MessageType)
@@ -42,7 +31,7 @@ namespace XHWK.WKTool
             lblTitle.Content = Title;
             if (!string.IsNullOrWhiteSpace(Content))
             {
-                if(Content.Length>143)
+                if (Content.Length > 143)
                 {
                     Content = Content.Substring(0, 140) + "...";
                 }
@@ -86,7 +75,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="Message">消息</param>
         /// <returns></returns>
-        public static MessageBoxResult Show(string Message,string Title)
+        public static MessageBoxResult Show(string Message, string Title)
         {
             MessageWindow message = new MessageWindow(1, Title, Message);
             message.ShowDialog();
@@ -98,14 +87,14 @@ namespace XHWK.WKTool
         /// <param name="Title">标题</param>
         /// <param name="Message">消息</param>
         /// <returns></returns>
-        public static MessageBoxResult Show(string Message,string Title, MessageBoxButton messageBox)
+        public static MessageBoxResult Show(string Message, string Title, MessageBoxButton messageBox)
         {
             if (string.IsNullOrWhiteSpace(Title))
             {
                 Title = "消息提示";
             }
-            MessageWindow message = new MessageWindow(2,Title,Message);
-            bool? res= message.ShowDialog();
+            MessageWindow message = new MessageWindow(2, Title, Message);
+            bool? res = message.ShowDialog();
             if ((bool)res)
             {
                 if (messageBox == MessageBoxButton.OKCancel)
@@ -151,7 +140,7 @@ namespace XHWK.WKTool
             if (e.LeftButton == MouseButtonState.Pressed)
             {
                 //this.DragMove();              
-                this.DragMove();
+                DragMove();
             }
         }
     }

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -1,18 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+
 using XHWK.Model;
 
 namespace XHWK.WKTool
@@ -23,17 +18,18 @@ namespace XHWK.WKTool
     public partial class PracticeWindow : Window
     {
         //声明一个 DrawingAttributes 类型的变量  
-        DrawingAttributes drawingAttributes;
+        private DrawingAttributes drawingAttributes;
 
         private ViewModel viewModel;
         /// <summary>
         /// 0 画笔 1 矩形 2 圆形 
         /// </summary>
         private int flg = 0;
+
         /// <summary>
         /// 当前画笔颜色
         /// </summary>
-        Color Colour=Colors.Red;
+        private Color Colour = Colors.Red;
         /// <summary>
         /// 当前画笔宽
         /// </summary>
@@ -96,7 +92,7 @@ namespace XHWK.WKTool
         {
             //flg = 0;
             drawingAttributes.Color = Colors.White;
-            Colour= Colors.White; 
+            Colour = Colors.White;
         }
         /// <summary>
         /// 画笔颜色事件 红色
@@ -197,7 +193,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 橡皮
         /// </summary>
-        public void Eraser() 
+        public void Eraser()
         {
             flg = 0;
             //this.type = ZPenType.Erase;
@@ -215,7 +211,7 @@ namespace XHWK.WKTool
             blackboard_canvas.UseCustomCursor = true;
             drawingAttributes.FitToCurve = true;
             drawingAttributes.IgnorePressure = false;
-        
+
             blackboard_canvas.Cursor = Cursors.Pen;
         }
         /// <summary>
@@ -271,11 +267,12 @@ namespace XHWK.WKTool
                 }
             }
         }
-        Stroke StrokeRound;
-        Stroke StrokeRectangle; 
+
+        private Stroke StrokeRound;
+        private Stroke StrokeRectangle;
         private void blackboard_canvas_MouseMove(object sender, MouseEventArgs e)
         {
-            if(flg!=0)
+            if (flg != 0)
             {
                 if (e.LeftButton == MouseButtonState.Pressed)
                 {
@@ -297,7 +294,7 @@ namespace XHWK.WKTool
                         {
                             DrawingAttributes = blackboard_canvas.DefaultDrawingAttributes.Clone()
                         };
-                        if(StrokeRectangle!=null)
+                        if (StrokeRectangle != null)
                         {
                             viewModel.InkStrokes.Remove(StrokeRectangle);
                         }
@@ -316,7 +313,7 @@ namespace XHWK.WKTool
                             DrawingAttributes = blackboard_canvas.DefaultDrawingAttributes.Clone()
                         };
                         //viewModel.InkStrokes.Clear();
-                        if(StrokeRound!=null)
+                        if (StrokeRound != null)
                         {
                             viewModel.InkStrokes.Remove(StrokeRound);
                         }
@@ -328,7 +325,7 @@ namespace XHWK.WKTool
         }
         private List<System.Windows.Point> GenerateEclipseGeometry(System.Windows.Point st, System.Windows.Point ed)
         {
-                double a = 0.5 * (ed.X - st.X);
+            double a = 0.5 * (ed.X - st.X);
             double b = 0.5 * (ed.Y - st.Y);
             List<System.Windows.Point> pointList = new List<System.Windows.Point>();
             for (double r = 0; r <= 2 * Math.PI; r = r + 0.01)
@@ -354,7 +351,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void Window_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
-            if (APP.W_ScreenRecordingToolbarWindow.flg==10)
+            if (APP.W_ScreenRecordingToolbarWindow.flg == 10)
             {
                 APP.W_ScreenRecordingToolbarWindow.flg = 0;
             }
@@ -362,7 +359,7 @@ namespace XHWK.WKTool
             {
                 APP.W_ScreenRecordingToolbarWindow.flg = 1;
             }
-            this.Hide();
+            Hide();
         }
 
         private void blackboard_canvas_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
@@ -375,7 +372,7 @@ namespace XHWK.WKTool
             {
                 APP.W_ScreenRecordingToolbarWindow.flg = 1;
             }
-            this.Hide();
+            Hide();
         }
 
         private void blackboard_canvas_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
@@ -388,7 +385,7 @@ namespace XHWK.WKTool
             {
                 APP.W_ScreenRecordingToolbarWindow.flg = 1;
             }
-            this.Hide();
+            Hide();
         }
     }
 }

XHWK.WKTool/PrintWindow.xaml.cs

@@ -1,19 +1,11 @@
 using Common.system;
+
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms;
 using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace XHWK.WKTool
 {
@@ -32,7 +24,7 @@ namespace XHWK.WKTool
             InitializeComponent();
             string defa = string.Empty;
             List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
-            if(defaList.Count>0)
+            if (defaList.Count > 0)
             {
                 data.Columns.Add("Value");
                 data.Columns.Add("Key");
@@ -52,7 +44,7 @@ namespace XHWK.WKTool
         }
         public void Initialize(string _imgPath)
         {
-         if(!string.IsNullOrWhiteSpace(_imgPath))
+            if (!string.IsNullOrWhiteSpace(_imgPath))
             {
                 imgPri.Source = new BitmapImage(new Uri(_imgPath));
             }
@@ -64,7 +56,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnPrint_Click(object sender, RoutedEventArgs e)
         {
-            if(string.IsNullOrWhiteSpace(cmbClass.Text))
+            if (string.IsNullOrWhiteSpace(cmbClass.Text))
             {
                 //MessageWindow.Show("打印机不能为空！");
                 MessageWindow.Show("打印机不能为空！", "", MessageBoxButton.OKCancel);
@@ -74,15 +66,13 @@ namespace XHWK.WKTool
             FileToolsCommon.CreateFile(imgPath);
             string pdf = imgPath + "\\101.pdf";
             string tpf = imgPath + "\\102.TPF";
-            int pr = 1;
             string msg = string.Empty;
             string outPut = string.Empty;
-            int pyte = 0; //0为方点 1为圆点
             //if(rbnSquarePoint.IsChecked==false)
             //{
             //    pyte = 1;
             //}
-            LatticeFileHelper.GeneratingPDF(pdf, tpf, out pr, out msg, out outPut/*, pyte*/);
+            LatticeFileHelper.GeneratingPDF(pdf, tpf, out int pr, out msg, out outPut/*, pyte*/);
             if (pr == 0)
             {
                 //outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
@@ -92,19 +82,18 @@ namespace XHWK.WKTool
                 //{
                 //    APP.PageDrawList[i].PageCode = page[i];
                 //}
-              
+
                 //string defa = string.Empty;
                 //List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
 
-                int printResult = 1;
                 string standardError = string.Empty;
                 string standardOutput = string.Empty;
                 int frequency = Convert.ToInt32(txbNumberOfCopies.Text);
                 //for (int i=0;i< frequency;i++)
                 //{
-                    LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out printResult, out standardError, out standardOutput);
+                LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
                 //}
-                if(printResult==0)// 0为成功
+                if (printResult == 0)// 0为成功
                 {
                     MessageWindow.Show("打印成功", "", MessageBoxButton.OKCancel);
                 }
@@ -134,7 +123,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnClose_Click(object sender, RoutedEventArgs e)
         {
-            this.Hide();
+            Hide();
         }
         /// <summary>
         /// 减
@@ -144,7 +133,7 @@ namespace XHWK.WKTool
         private void BtnLess_Click(object sender, RoutedEventArgs e)
         {
             int num = Convert.ToInt32(txbNumberOfCopies.Text);
-            if(num>1)
+            if (num > 1)
             {
                 num = num - 1;
                 txbNumberOfCopies.Text = num.ToString();

XHWK.WKTool/PromptWindow.xaml.cs

@@ -1,16 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
+using System.Windows;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace XHWK.WKTool
 {

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.7.0")]
+[assembly: AssemblyFileVersion("1.0.7.0")]

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -1,16 +1,14 @@
-using Aspose.Pdf.Text;
-using Common.system;
+using Common.system;
 
 using System;
-using System.Configuration;
 using System.IO;
 using System.Threading;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Ink;
-using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
+
 using XHWK.Model;
 
 namespace XHWK.WKTool
@@ -24,21 +22,25 @@ namespace XHWK.WKTool
         /// <summary>
         /// 视频保存名称
         /// </summary>
-        string VideoSavePathName;
+        private string VideoSavePathName;
+
         /// <summary>
         /// 是否首次录屏
         /// </summary>
-        bool IsFirstRS = true;
+        private bool IsFirstRS = true;
+
         /// <summary>
         /// 是否暂停
         /// </summary>
-        bool IsSuspend = true;
+        private bool IsSuspend = true;
+
         /// <summary>
         /// 视频信息
         /// </summary>
-        Model_Video VideoInfo = null;
+        private Model_Video VideoInfo = null;
+
         //声明一个 DrawingAttributes 类型的变量  
-        DrawingAttributes drawingAttributes;
+        private DrawingAttributes drawingAttributes;
         private DispatcherTimer t = null;
         /// <summary>
         /// 计时器状态
@@ -57,13 +59,12 @@ namespace XHWK.WKTool
         /// 计时用
         /// </summary>
         private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
-
-        KeyboardHookCommon k_hook;
+        private KeyboardHookCommon k_hook;
         /// <summary>
         /// 🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
         /// </summary>
-       public int flg = 0;
-        System.Timers.Timer timer = new System.Timers.Timer();
+        public int flg = 0;
+        private System.Timers.Timer timer = new System.Timers.Timer();
         #endregion
 
         #region 初始化
@@ -100,7 +101,7 @@ namespace XHWK.WKTool
             gridThickness.Visibility = Visibility.Hidden;
 
             ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
-            ImgEndRecordingScreen.Source= new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
+            ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
             BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
             imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
             btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
@@ -122,11 +123,12 @@ namespace XHWK.WKTool
             //ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
             //BtnRecordingScreen_Click(null, null);
         }
-        void TimerDealy(object o, EventArgs e)
+
+        private void TimerDealy(object o, EventArgs e)
         {
             Dispatcher.Invoke(() =>
             {
-                if (this.Left > 1630)
+                if (Left > 1630)
                 {
                     return;
                 }
@@ -134,17 +136,17 @@ namespace XHWK.WKTool
                 double mouse_x = Form.MousePosition.X;   //需要添加引用System.Drawing
                 double mouse_y = Form.MousePosition.Y;
 
-                bool is_in_collasped_range = (mouse_y > this.Left + this.Height) || (mouse_x < this.Left || mouse_x > this.Left + this.Width);//缩起的条件
-                bool is_in_visiable_range = (mouse_y < 1 && mouse_x >= this.Left && mouse_x <= this.Left + this.Width); //展开的条件         
+                bool is_in_collasped_range = (mouse_y > Left + Height) || (mouse_x < Left || mouse_x > Left + Width);//缩起的条件
+                bool is_in_visiable_range = (mouse_y < 1 && mouse_x >= Left && mouse_x <= Left + Width); //展开的条件         
 
-                if (this.Left < 1630 && this.Left >= 0 && is_in_collasped_range)
+                if (Left < 1630 && Left >= 0 && is_in_collasped_range)
                 {
                     System.Threading.Thread.Sleep(300);
-                    this.Left +=20 /*-this.ActualWidth - 3*/;
+                    Left += 20 /*-this.ActualWidth - 3*/;
                 }
-                else if (this.Left < 0 && is_in_visiable_range)
+                else if (Left < 0 && is_in_visiable_range)
                 {
-                    this.Left = 1;
+                    Left = 1;
                 }
             });
         }
@@ -226,7 +228,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 设置录屏文件地址
         /// </summary>
-        void SetUpVideoPathName()
+        private void SetUpVideoPathName()
         {
             //FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
             FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
@@ -293,9 +295,11 @@ namespace XHWK.WKTool
                     }
                     #endregion
 
-                    VideoInfo = new Model_Video();
-                    VideoInfo.VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"));
-                    VideoInfo.WkType = Enum_WKVidetype.RecordingScreen;
+                    VideoInfo = new Model_Video
+                    {
+                        VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType")),
+                        WkType = Enum_WKVidetype.RecordingScreen
+                    };
                     SetUpVideoPathName();
                     IsFirstRS = false;
                     k_hook.Start();//安装键盘钩子
@@ -442,7 +446,7 @@ namespace XHWK.WKTool
                     string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
                     FileToolsCommon.CreateDirectory(ThumbnailPath);
                     //缩略图存储位置
-                    string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".","") + ".JPG";
+                    string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".", "") + ".JPG";
                     new Thread(new ThreadStart(new Action(() =>
                     {
                         while (!FileToolsCommon.IsExistFile(VideoSavePathName))
@@ -510,7 +514,7 @@ namespace XHWK.WKTool
                     flg = 1;
                     APP.W_PracticeWindow.Hide();
                 }
-                else if(flg==10)
+                else if (flg == 10)
                 {
                     APP.W_PracticeWindow.Blue();
                     flg = 11;
@@ -519,12 +523,14 @@ namespace XHWK.WKTool
                 {
                     if (APP.W_PracticeWindow == null)
                     {
-                        APP.W_PracticeWindow = new PracticeWindow();
-                        //APP.W_PracticeWindow.Topmost = true;
-                        APP.W_PracticeWindow.Width = pwidth;
-                        APP.W_PracticeWindow.Height = pHeight;
-                        APP.W_PracticeWindow.Left = 0;
-                        APP.W_PracticeWindow.Top = 0;
+                        APP.W_PracticeWindow = new PracticeWindow
+                        {
+                            //APP.W_PracticeWindow.Topmost = true;
+                            Width = pwidth,
+                            Height = pHeight,
+                            Left = 0,
+                            Top = 0
+                        };
                         //practiceWin.Owner = this;
                     }
                     APP.W_PracticeWindow.Initialize(imagePath);
@@ -770,7 +776,7 @@ namespace XHWK.WKTool
                     flg = 0;
                     APP.W_PracticeWindow.Hide();
                 }
-                else if(flg==11)
+                else if (flg == 11)
                 {
                     flg = 10;
                     APP.W_PracticeWindow.Red();
@@ -779,12 +785,14 @@ namespace XHWK.WKTool
                 {
                     if (APP.W_PracticeWindow == null)
                     {
-                        APP.W_PracticeWindow = new PracticeWindow();
-                        //APP.W_PracticeWindow.Topmost = true;
-                        APP.W_PracticeWindow.Width = pwidth;
-                        APP.W_PracticeWindow.Height = pHeight;
-                        APP.W_PracticeWindow.Left = 0;
-                        APP.W_PracticeWindow.Top = 0;
+                        APP.W_PracticeWindow = new PracticeWindow
+                        {
+                            //APP.W_PracticeWindow.Topmost = true;
+                            Width = pwidth,
+                            Height = pHeight,
+                            Left = 0,
+                            Top = 0
+                        };
                         //practiceWin.Owner = this;
                     }
                     APP.W_PracticeWindow.Initialize(imagePath);
@@ -824,12 +832,14 @@ namespace XHWK.WKTool
                 {
                     if (APP.W_PracticeWindow == null)
                     {
-                        APP.W_PracticeWindow = new PracticeWindow();
-                        //APP.W_PracticeWindow.Topmost = true;
-                        APP.W_PracticeWindow.Width = pwidth;
-                        APP.W_PracticeWindow.Height = pHeight;
-                        APP.W_PracticeWindow.Left = 0;
-                        APP.W_PracticeWindow.Top = 0;
+                        APP.W_PracticeWindow = new PracticeWindow
+                        {
+                            //APP.W_PracticeWindow.Topmost = true;
+                            Width = pwidth,
+                            Height = pHeight,
+                            Left = 0,
+                            Top = 0
+                        };
                         //practiceWin.Owner = this;
                     }
                     APP.W_PracticeWindow.Initialize(imagePath);
@@ -864,7 +874,7 @@ namespace XHWK.WKTool
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
             }
             APP.W_XHMicroLessonSystemWindow.Show();
-            this.Hide();
+            Hide();
         }
     }
 }

XHWK.WKTool/UploadWindow.xaml.cs

@@ -1,18 +1,11 @@
 using Common.system;
+
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+
 using XHWK.Model;
 using XHWK.WKTool.DAL;
 
@@ -54,7 +47,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 初始化
         /// </summary>
-        public void Initialize(string _resourcename,long _resourcesize,string _suffix,string _guid) 
+        public void Initialize(string _resourcename, long _resourcesize, string _suffix, string _guid)
         {
             Resourcename = _resourcename;
             Resourcesize = _resourcesize;
@@ -94,11 +87,11 @@ namespace XHWK.WKTool
         private void Director()
         {
             int selectIndex = book_list.SelectedIndex;
-            if(selectIndex<0)
+            if (selectIndex < 0)
             {
                 selectIndex = 0;
             }
-            int code = @interface.DirectorList(APP.TsubjectbookList[selectIndex].Lsbid,2,APP.UserInfo.Userid);
+            int code = @interface.DirectorList(APP.TsubjectbookList[selectIndex].Lsbid, 2, APP.UserInfo.Userid);
             if (code == 0)
             {
                 pageData.zhangjieList.Clear();
@@ -181,7 +174,7 @@ namespace XHWK.WKTool
 
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
-            this.Hide();
+            Hide();
         }
         /// <summary>
         /// 上传到个人空间
@@ -216,23 +209,25 @@ namespace XHWK.WKTool
                     //schoolid: 12
                     //suffix: "mp4"
                     //uid: 80
-                    Model_ResourceAdd model_ResourceAdd = new Model_ResourceAdd();
-                    model_ResourceAdd.converted = 0;
-                    model_ResourceAdd.createid = APP.UserInfo.Userid;
-                    model_ResourceAdd.directorid = Convert.ToInt32(cmbTeachingMaterial.SelectedValue.ToString());
-                    model_ResourceAdd.duration = APP.ResourceAddTwo.duration;
-                    model_ResourceAdd.imgUrl = "";
-                    model_ResourceAdd.level = 2;
-                    model_ResourceAdd.lsbid = Convert.ToInt32(book_list.SelectedValue.ToString());
-                    model_ResourceAdd.mp4code = APP.ResourceAddTwo.mp4code;
-                    model_ResourceAdd.resourcebelong = 3;
-                    model_ResourceAdd.resourceclass = 2;
-                    model_ResourceAdd.resourcecover = APP.ResourceAddTwo.coverpath;
-                    model_ResourceAdd.resourcename = Resourcename;
-                    model_ResourceAdd.resourcesize = Resourcesize;//zxy 文件大小
-                    model_ResourceAdd.resourcetype = 0;
-                    model_ResourceAdd.resourceurl = APP.ResourceAddTwo.videopath;
-                    model_ResourceAdd.schoolid = APP.UserInfo.Schoolid;
+                    Model_ResourceAdd model_ResourceAdd = new Model_ResourceAdd
+                    {
+                        converted = 0,
+                        createid = APP.UserInfo.Userid,
+                        directorid = Convert.ToInt32(cmbTeachingMaterial.SelectedValue.ToString()),
+                        duration = APP.ResourceAddTwo.duration,
+                        imgUrl = "",
+                        level = 2,
+                        lsbid = Convert.ToInt32(book_list.SelectedValue.ToString()),
+                        mp4code = APP.ResourceAddTwo.mp4code,
+                        resourcebelong = 3,
+                        resourceclass = 2,
+                        resourcecover = APP.ResourceAddTwo.coverpath,
+                        resourcename = Resourcename,
+                        resourcesize = Resourcesize,//zxy 文件大小
+                        resourcetype = 0,
+                        resourceurl = APP.ResourceAddTwo.videopath,
+                        schoolid = APP.UserInfo.Schoolid
+                    };
                     if (Suffix.Equals("FLV"))
                     {
                         Suffix = "flv";

XHWK.WKTool/XHWK.WKTool.csproj

@@ -173,7 +173,6 @@
       <DependentUpon>CreateAMicroLessonWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ZConfig.cs" />
     <Page Include="AppUpdateWin.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

XHWK.WKTool/ZConfig.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XHWK.WKTool.Config
-{
-    internal class ZConfig
-    {
-        public static bool isDebug = true;
-
-        /// <summary>
-        /// 当前版本号
-        /// </summary>
-        public static int versionCode = 7;
-
-        public static string versionName = "1.0.6";
-
-        //接口地址
-        public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";
-
-        //图片地址
-        public static string uploadUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/" : "http://schoolfile.xhkjedu.com/";
-
-        public static string showImageUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/static/" : "http://schoolfile.xhkjedu.com/static/";
-
-        public static string secretKey = "nanhuakaizhangjianwangni";
-        public static string fileStorageAddress = "";
-
-        //认证接口地址
-        public static string certapiUrl = isDebug ? "http://certapitest.xhkjedu.com" : "http://certapi.xhkjedu.com";
-
-        /// <summary>
-        /// 数据存放目录
-        /// </summary>
-        public static string dataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Signature\\";
-
-        public static string basePath = AppDomain.CurrentDomain.BaseDirectory;
-
-        //缓存图片地址
-        public static string tempPath = basePath + "temp\\";
-
-        public static string nginxHtml = $"{basePath}nginx\\html\\";
-
-   
-        public static string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
-
-        public static string tongPingBasePath = $"{nginxHtml}tongping\\";
-    }
-}