zhao：优化内存去除无用占用

Common/system/DataProvider.cs

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

Common/system/FFMpeg.cs

@@ -1,12 +1,11 @@
 using AForge.Video.DirectShow;
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Windows.Forms;
 
 using VisioForge.Shared.NAudio.CoreAudioApi;
 using VisioForge.Shared.NAudio.Wave;
@@ -46,7 +45,7 @@ namespace Common.system
         /// 录制屏幕
         /// </summary>
         /// <param name="FilePath">文件存储路径</param>
-        public bool StartRecordingVideo(string FilePath,out string ErrMessage)
+        public bool StartRecordingVideo(string FilePath, out string ErrMessage)
         {
             while (myProcess != null)
             {
@@ -184,7 +183,7 @@ namespace Common.system
         /// 录制音频
         /// </summary>
         /// <param name="Mp3Path">MP3音频位置</param>
-        public bool StartRecordingAudio(string Mp3Path,out string ErrMessage)
+        public bool StartRecordingAudio(string Mp3Path, out string ErrMessage)
         {
             ErrMessage = null;
             while (myProcess != null)
@@ -263,7 +262,10 @@ namespace Common.system
                 }
             }
             if (OutputVideoLog)
+            {
                 LogHelper.WriteInfoLog("【录音】：" + myProcess.StartInfo.Arguments);
+            }
+
             FileToolsCommon.AppendText(LogPath, "【录音】：" + myProcess.StartInfo.Arguments + "\r\n");
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
@@ -284,9 +286,9 @@ namespace Common.system
                 }
                 else
                 {
-                    ErrMessage = ex.Message+" 请关闭杀毒软件或信任此软件后重试！";
+                    ErrMessage = ex.Message + " 请关闭杀毒软件或信任此软件后重试！";
                 }
-                LogHelper.WriteErrLog("【录音】（StartRecordingAudio）"+ErrMessage,ex);
+                LogHelper.WriteErrLog("【录音】（StartRecordingAudio）" + ErrMessage, ex);
                 myProcess.Dispose();
                 myProcess = null;
                 return false;
@@ -365,7 +367,7 @@ namespace Common.system
         /// <param name="Frequency">每秒帧率</param>
         /// <param name="VideoWidth">视频宽度</param>
         /// <param name="VideoHeight">视频高度</param>
-        public bool SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight,out string ErrMessage)
+        public bool SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight, out string ErrMessage)
         {
             //new Thread(new ThreadStart(new Action(() =>
             //{
@@ -427,7 +429,10 @@ namespace Common.system
                         break;
                 }
                 if (OutputVideoLog)
+                {
                     LogHelper.WriteInfoLog("【图片音频合成视频】：" + myProcess.StartInfo.Arguments);
+                }
+
                 FileToolsCommon.AppendText(LogPath, "【图片音频合成视频】：" + myProcess.StartInfo.Arguments + "\r\n");
                 myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
                 myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
@@ -549,7 +554,10 @@ namespace Common.system
                 myProcess.StartInfo.Arguments = "-f concat  -safe 0 -i " + Path + "temprs/filelist.d -c copy " + FilePath;
             }
             if (OutputVideoLog)
+            {
                 LogHelper.WriteInfoLog("【音视频合成】：" + myProcess.StartInfo.Arguments);
+            }
+
             FileToolsCommon.AppendText(LogPath, "【音视频合成】：" + myProcess.StartInfo.Arguments + "\r\n");
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
@@ -652,7 +660,7 @@ namespace Common.system
         /// <param name="ImagePath">图片地址</param>
         /// <param name="Width">图片大小</param>
         /// <param name="Height">图片大小</param>
-        public bool GenerateThumbnails(string VideoPath, string ImagePath,int Width=0,int Height=0)
+        public bool GenerateThumbnails(string VideoPath, string ImagePath, int Width = 0, int Height = 0)
         {
             while (myProcess != null)
             {
@@ -664,9 +672,9 @@ namespace Common.system
                 KillProcess.Kill();
             }
             string WHStr = "";
-            if(Width>0)
+            if (Width > 0)
             {
-                WHStr = " -s "+ Width + "x"+ Height;
+                WHStr = " -s " + Width + "x" + Height;
             }
             try
             {
@@ -674,10 +682,13 @@ namespace Common.system
                 LogPath = CreateffmpegLog();
                 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"+ WHStr + " -f image2 \"" + ImagePath + "\"";
+                myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2" + WHStr + " -f image2 \"" + ImagePath + "\"";
 
                 if (OutputVideoLog)
+                {
                     LogHelper.WriteInfoLog("【生成缩略图】：" + myProcess.StartInfo.Arguments);
+                }
+
                 FileToolsCommon.AppendText(LogPath, "【生成缩略图】：" + myProcess.StartInfo.Arguments + "\r\n");
                 myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
                 myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
@@ -739,8 +750,11 @@ namespace Common.system
                 myProcess.StartInfo.Arguments = "-i " + VideoPathName + " -acodec copy -vcodec libx264 -s " + Width + "*" + Height + " " + VideoSavePathName;
 
                 if (OutputVideoLog)
+                {
                     LogHelper.WriteInfoLog("【视频转码】：" + myProcess.StartInfo.Arguments);
-                FileToolsCommon.AppendText(LogPath,"【视频转码】：" + myProcess.StartInfo.Arguments + "\r\n");
+                }
+
+                FileToolsCommon.AppendText(LogPath, "【视频转码】：" + myProcess.StartInfo.Arguments + "\r\n");
                 myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
                 myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
                 myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -825,17 +839,18 @@ namespace Common.system
         {
             if (!string.IsNullOrEmpty(output.Data))
             {
-                FileToolsCommon.AppendText(LogPath, "【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff") +"】:");
-                FileToolsCommon.AppendText(LogPath, output.Data+"\r\n");
+                FileToolsCommon.AppendText(LogPath, "【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff") + "】:");
+                FileToolsCommon.AppendText(LogPath, output.Data + "\r\n");
             }
         }
         #region 麦克风声卡检测
         #region 获取麦克风
-        bool IsMicrophone = false;
+        private bool IsMicrophone = false;
+
         /// <summary>
         /// 使用FFmpeg获取的麦克风名
         /// </summary>
-        string MicrophoneNameInfo = "";
+        private string MicrophoneNameInfo = "";
         /// <summary>
         /// 获取麦克风名称
         /// </summary>
@@ -899,7 +914,10 @@ namespace Common.system
                     myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
                     myProcess.StartInfo.Arguments = " -list_devices true -f dshow -i dummy";
                     if (OutputVideoLog)
+                    {
                         LogHelper.WriteInfoLog("【获取设备信息】：" + myProcess.StartInfo.Arguments);
+                    }
+
                     FileToolsCommon.AppendText(LogPath, "【获取设备信息】：" + myProcess.StartInfo.Arguments + "\r\n");
                     myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
                     myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
@@ -976,7 +994,7 @@ namespace Common.system
             List<string> devicesList = new List<string>();
             try
             {
-                var videoDevices = new FilterInfoCollection(FilterCategory.AudioInputDevice);
+                FilterInfoCollection videoDevices = new FilterInfoCollection(FilterCategory.AudioInputDevice);
                 foreach (FilterInfo device in videoDevices)
                 {
                     devicesList.Add(device.Name);
@@ -1005,7 +1023,7 @@ namespace Common.system
             List<string> devicesList = new List<string>();
             try
             {
-                var videoDevices = new FilterInfoCollection(FilterCategory.AudioInputDevice);
+                FilterInfoCollection videoDevices = new FilterInfoCollection(FilterCategory.AudioInputDevice);
                 foreach (FilterInfo device in videoDevices)
                 {
                     devicesList.Add(device.Name);
@@ -1023,7 +1041,7 @@ namespace Common.system
         /// <returns></returns>
         public static string GetInDeviceName()
         {
-            var devices = new List<WaveInCapabilities>();
+            List<WaveInCapabilities> devices = new List<WaveInCapabilities>();
             int waveInDevices = WaveIn.DeviceCount;
             for (int i = 0; i < waveInDevices; i++)
             {
@@ -1050,8 +1068,8 @@ namespace Common.system
         public static string GetInDeviceFull()
         {
             List<string> devices = new List<string>();
-            var enumberator = new MMDeviceEnumerator();
-            var deviceCollection = enumberator.EnumerateAudioEndPoints(DataFlow.Capture, DeviceState.All);
+            MMDeviceEnumerator enumberator = new MMDeviceEnumerator();
+            MMDeviceCollection deviceCollection = enumberator.EnumerateAudioEndPoints(DataFlow.Capture, DeviceState.All);
             for (int waveInDevice = 0; waveInDevice < WaveIn.DeviceCount; waveInDevice++)
             {
                 WaveInCapabilities deviceInfo = WaveIn.GetCapabilities(waveInDevice);
@@ -1065,7 +1083,7 @@ namespace Common.system
                             break;
                         }
                     }
-                    catch (Exception ex)
+                    catch (Exception)
                     {
                         continue;
                     }
@@ -1089,8 +1107,8 @@ namespace Common.system
         public List<string> GetInDeviceListFull()
         {
             List<string> devices = new List<string>();
-            var enumberator = new MMDeviceEnumerator();
-            var deviceCollection = enumberator.EnumerateAudioEndPoints(DataFlow.Capture, DeviceState.All);
+            MMDeviceEnumerator enumberator = new MMDeviceEnumerator();
+            MMDeviceCollection deviceCollection = enumberator.EnumerateAudioEndPoints(DataFlow.Capture, DeviceState.All);
             for (int waveInDevice = 0; waveInDevice < WaveIn.DeviceCount; waveInDevice++)
             {
                 WaveInCapabilities deviceInfo = WaveIn.GetCapabilities(waveInDevice);
@@ -1104,7 +1122,7 @@ namespace Common.system
                             break;
                         }
                     }
-                    catch (Exception ex)
+                    catch (Exception)
                     {
                         continue;
                     }

Common/system/ImageHelper.cs

@@ -1,17 +1,13 @@
 using System;
 using System.Drawing;
-using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Text;
 using System.Threading;
 using System.Windows;
-using System.Windows.Documents;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-using VisioForge.Shared.Helpers;
-
 namespace Common.system
 {
     /// <summary>
@@ -94,8 +90,10 @@ namespace Common.system
             {
                 using (MemoryStream ms = new MemoryStream(File.ReadAllBytes(path)))
                 {
-                    bitmap = new BitmapImage();
-                    bitmap.DecodePixelHeight = 100;
+                    bitmap = new BitmapImage
+                    {
+                        DecodePixelHeight = 100
+                    };
                     bitmap.BeginInit();
                     bitmap.CacheOption = BitmapCacheOption.OnLoad;//设置缓存模式
                     bitmap.StreamSource = ms;//通过StreamSource加载图片
@@ -421,13 +419,13 @@ namespace Common.system
                         encoder.Save(memoryStream);
                         //System.Drawing.Image img = System.Drawing.Image.FromStream(memoryStream);
                         Bitmap bit = new Bitmap(memoryStream);
-                        if ((int)ImgWidth-2 < (int)bit.Width)
+                        if (ImgWidth - 2 < bit.Width)
                         {
                             try
                             {
                                 Graphics g = Graphics.FromImage(Img);
                                 //g.InterpolationMode = InterpolationMode.HighQualityBicubic;
-                                g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, (int)bit.Width, (int)bit.Height), GraphicsUnit.Pixel);
+                                g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, bit.Width, bit.Height), GraphicsUnit.Pixel);
                                 g.Dispose();
                             }
                             catch

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

XHWK.WKTool/App.cs

@@ -25,7 +25,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 是否为测试版
         /// </summary>
-        public static bool isDebug =FileToolsCommon.GetConfigValue("IsDebug")!="0";
+        public static bool isDebug = FileToolsCommon.GetConfigValue("IsDebug") != "0";
         /// <summary>
         /// 接口地址
         /// </summary>

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -26,7 +26,7 @@ namespace XHWK.WKTool
         public CreateAMicroLessonWindow()
         {
             InitializeComponent();
-            this.ResizeMode = ResizeMode.NoResize;
+            ResizeMode = ResizeMode.NoResize;
             if (!APP.CheckScreenCapturerRecorder())
             {
                 MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“OK-Next>-Next>Install”完成安装！");

XHWK.WKTool/DAL/Interface.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+
 using XHWK.Model;
 
 namespace XHWK.WKTool.DAL

XHWK.WKTool/Helpers/BackgroundWorkerHelper.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace XHWK.WKTool.Helpers
 {

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -112,7 +112,7 @@ namespace ComeCapture
         /// </summary>
         public void InitializeKeyDownEvent()
         {
-          
+
             k_hook.Start();//安装键盘钩子
         }
         /// <summary>
@@ -128,7 +128,7 @@ namespace ComeCapture
                 Current.OnCancel();
                 APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
                 APP.W_XHMicroLessonSystemWindow.WindowType();
-                this.Hide();
+                Hide();
             }
         }
 

XHWK.WKTool/KeyVerification.xaml.cs

@@ -4,7 +4,7 @@ using System.Management;
 using System.Text;
 using System.Threading;
 using System.Windows;
-using System.Windows.Forms;
+
 using XHWK.WKTool.DAL;
 
 namespace XHWK.WKTool
@@ -23,7 +23,7 @@ namespace XHWK.WKTool
         public KeyVerification()
         {
             InitializeComponent();
-            this.Topmost = true;
+            Topmost = true;
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
         }
 
@@ -69,7 +69,7 @@ namespace XHWK.WKTool
                     //win.Topmost = true;
                     win.Show();
 
-                    
+
                     Thread.Sleep(200);
                     Close();
                 }));

XHWK.WKTool/MessageWindow.xaml.cs

@@ -1,6 +1,5 @@
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Media;
 
 namespace XHWK.WKTool
 {

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 
 using XHWK.Model;
 
@@ -43,7 +41,7 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
         }
-        public void Initialize(string _imgPath=null)
+        public void Initialize(string _imgPath = null)
         {
             flg = 0;
             blackboard_canvas.Strokes.Clear();
@@ -408,7 +406,7 @@ namespace XHWK.WKTool
                 Thread.Sleep(500);
                 Dispatcher.Invoke(() =>
                 {
-                    this.Owner = null;
+                    Owner = null;
                     APP.W_PracticeWindow.Hide();
                 });
             }))).Start();

XHWK.WKTool/PrintWindow.xaml.cs

@@ -29,13 +29,13 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
             double proportion = 1036.0 / 1290.0;
-          double  Widths = (PrimaryScreen.ScaleWorkingAreaSize.Height) / proportion - (BorderThickness.Left + BorderThickness.Right);
-          double  Heights = PrimaryScreen.ScaleWorkingAreaSize.Height - (BorderThickness.Top + BorderThickness.Bottom);
+            double Widths = (PrimaryScreen.ScaleWorkingAreaSize.Height) / proportion - (BorderThickness.Left + BorderThickness.Right);
+            double Heights = PrimaryScreen.ScaleWorkingAreaSize.Height - (BorderThickness.Top + BorderThickness.Bottom);
             Width = Widths / 1.42;
             Height = Heights / 1.71;
-            GridContent.Width = Width+5;
+            GridContent.Width = Width + 5;
             GridContent.Height = Height;
-            this.ResizeMode = ResizeMode.NoResize;
+            ResizeMode = ResizeMode.NoResize;
             string defa = string.Empty;
             List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
             if (defaList.Count > 0)
@@ -56,9 +56,10 @@ namespace XHWK.WKTool
                 cmbClass.SelectedIndex = 0;
             }
         }
-        double wit = 0;
-        double hei = 0;
-        public void Initialize(string _imgPath, double _wit,double _hei)
+
+        private double wit = 0;
+        private double hei = 0;
+        public void Initialize(string _imgPath, double _wit, double _hei)
         {
             wit = _wit;
             hei = _hei;
@@ -97,7 +98,7 @@ namespace XHWK.WKTool
             //FileToolsCommon.CreateFile(imgPath);
             //string pdf = imgPath + "\\101.pdf";
             //PDF位置
-            string SourcePath=FileToolsCommon.GetFileAbsolutePath("/temp/101.pdf");
+            string SourcePath = FileToolsCommon.GetFileAbsolutePath("/temp/101.pdf");
             StrList.Add(SourcePath);
             //打印数量
             int PrinterNum = Convert.ToInt32(txbNumberOfCopies.Text);
@@ -113,7 +114,8 @@ namespace XHWK.WKTool
             times.Elapsed += Times_ElapsedClick;
             times.Start();
         }
-        int num = 0;
+
+        private int num = 0;
         /// <summary>
         /// 计时器
         /// </summary>
@@ -124,11 +126,11 @@ namespace XHWK.WKTool
             Dispatcher.Invoke(() =>
             {
                 pgbProcess.Value = num;
-                lbProcess.Content = num.ToString()+"%";
+                lbProcess.Content = num.ToString() + "%";
                 if (num < 99)
                 {
                     num++;
-                    times.Interval += (num/2);
+                    times.Interval += (num / 2);
                 }
                 else
                 {
@@ -140,10 +142,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 开始打印
         /// </summary>
-        void StartPrint(object obj)
+        private void StartPrint(object obj)
         {
-          
-                try
+
+            try
             {
                 iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0, 0, 0, 0);
                 //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
@@ -154,7 +156,7 @@ namespace XHWK.WKTool
                 string tempImgPath = imgPath;
                 FileToolsCommon.CreateDirectory(imgPath);
                 imgPath += "101.pdf";
-                while(File.Exists(imgPath))
+                while (File.Exists(imgPath))
                 {
                     imgPath = tempImgPath + ipdf.ToString() + ".pdf";
                     ipdf++;
@@ -180,10 +182,10 @@ namespace XHWK.WKTool
                     }
                     else
                     {
-                        RectangleF rectangleF = new RectangleF(0,0,0,0) ;
+                        RectangleF rectangleF = new RectangleF(0, 0, 0, 0);
                         Dispatcher.Invoke(() =>
                         {
-                             rectangleF = new RectangleF
+                            rectangleF = new RectangleF
                             {
                                 Width = (float)APP.PageDrawList[i].ImageSizes.CenterX,
                                 Height = (float)APP.PageDrawList[i].ImageSizes.CenterY,
@@ -191,23 +193,23 @@ namespace XHWK.WKTool
                                 Y = (float)APP.PageDrawList[i].ImageLocation.Y
                             };
                         });
-                   
+
 
 
                         string msgs = string.Empty;
 
-               
-                            bool isImg = MergerImg(APP.PageDrawList[i].PageImagePath, filePathOutPut, rectangleF, out msgs);
-                            if (isImg)
-                            {
-                                image = iTextSharp.text.Image.GetInstance(filePathOutPut);
-                            }
-                            else
-                            {
-                                image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
-                            }
-                   
-                     
+
+                        bool isImg = MergerImg(APP.PageDrawList[i].PageImagePath, filePathOutPut, rectangleF, out msgs);
+                        if (isImg)
+                        {
+                            image = iTextSharp.text.Image.GetInstance(filePathOutPut);
+                        }
+                        else
+                        {
+                            image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
+                        }
+
+
                     }
                     if (image.Height > iTextSharp.text.PageSize.A4.Height)
                     {
@@ -242,26 +244,26 @@ namespace XHWK.WKTool
                     MessageWindow.Show(ex.Message);
                     return;
                 });
-                LogHelper.WriteErrLog("打印转换PDF失败，原因：" + ex.Message,ex);
+                LogHelper.WriteErrLog("打印转换PDF失败，原因：" + ex.Message, ex);
             }
 
 
 
             List<string> objStr = (List<string>)obj;
-            string SourcePath= objStr[0];
-            int PrinterNum=int.Parse(objStr[1]);
-            string PrinterName= objStr[2];
+            string SourcePath = objStr[0];
+            int PrinterNum = int.Parse(objStr[1]);
+            string PrinterName = objStr[2];
             //TPF文件位置
             string TPFPath = FileToolsCommon.GetFileAbsolutePath("temp/");
             FileToolsCommon.CreateDirectory(TPFPath);
             TPFPath += "101.TPF";
             //生成点阵文件
             LatticeFileHelper.GeneratingPDF(SourcePath, TPFPath, out int pr, out string msg, out string outPut/*, pyte*/);
-            while(!FileToolsCommon.IsExistFile(TPFPath))
+            while (!FileToolsCommon.IsExistFile(TPFPath))
             {
                 Thread.Sleep(100);
             }
-            while(string.IsNullOrWhiteSpace(pr.ToString()))
+            while (string.IsNullOrWhiteSpace(pr.ToString()))
             {
                 Thread.Sleep(100);
             }
@@ -397,28 +399,28 @@ namespace XHWK.WKTool
                 int frequency = 1;
                 //Dispatcher.Invoke(() =>
                 //{
-                     frequency = Convert.ToInt32(txbNumberOfCopies.Text);
-                    LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
-                    if (printResult == 0)// 0为成功
+                frequency = Convert.ToInt32(txbNumberOfCopies.Text);
+                LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
+                if (printResult == 0)// 0为成功
+                {
+                    new Thread(new ThreadStart(new Action(() =>
                     {
-                        new Thread(new ThreadStart(new Action(() =>
+                        Dispatcher.Invoke(() =>
                         {
-                            Dispatcher.Invoke(() =>
-                            {
-                                I = 100;
-                                pgbProcess.Value = I * 100 / 100;
-                                lbProcess.Content = I.ToString() + "%";
-                                APP.myloading.Hide();
-                                I = 0;
-                            });
-                            Thread.Sleep(3000);
-                            Dispatcher.Invoke(() =>
-                            {
-                                tip_outer.Visibility = Visibility.Collapsed;
+                            I = 100;
+                            pgbProcess.Value = I * 100 / 100;
+                            lbProcess.Content = I.ToString() + "%";
+                            APP.myloading.Hide();
+                            I = 0;
+                        });
+                        Thread.Sleep(3000);
+                        Dispatcher.Invoke(() =>
+                        {
+                            tip_outer.Visibility = Visibility.Collapsed;
                                 //tip_outer.Visibility = Visibility.Collapsed;
                                 MessageWindow.Show("打印成功");
-                            });
-                        }))).Start();
+                        });
+                    }))).Start();
                 }
                 else
                 {
@@ -459,19 +461,19 @@ namespace XHWK.WKTool
         {
             Dispatcher.Invoke(() =>
             {
-            if (I <= 90)
-            {
-                try
+                if (I <= 90)
                 {
+                    try
+                    {
                         pgbProcess.Value = I * 100 / 100;
                         lbProcess.Content = I.ToString() + "%";
                         I++;
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteErrLog("【摄像】(Times_Elapsed)生成图片错误:" + ex.Message, ex);
+                    }
                 }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteErrLog("【摄像】(Times_Elapsed)生成图片错误:" + ex.Message, ex);
-                }
-            }
             });
         }
         /// <summary>

XHWK.WKTool/ProductVerification.xaml.cs

@@ -1,18 +1,10 @@
 using Common.system;
+
 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.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+
 using XHWK.Model;
 using XHWK.WKTool.DAL;
 
@@ -34,7 +26,7 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
-            this.Topmost = true;
+            Topmost = true;
             APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationDecryptServering, InvokeActivationDecryptServerCompate);
         }
         /// <summary>
@@ -57,7 +49,7 @@ namespace XHWK.WKTool
             {
                 APP.Signature = System.IO.File.ReadAllText(APP.dataPath + "signature.txt", Encoding.Default);
                 string decrypt = DataProvider.TripleDESDecrypt(APP.Signature, APP.secretKey);
-                decrypt = decrypt.Replace("\u0001", "").Replace("\u0007","").Trim();
+                decrypt = decrypt.Replace("\u0001", "").Replace("\u0007", "").Trim();
                 Model_Signatures msgBean = JsonHelper.JsonToObj<Model_Signatures>(decrypt);
                 long currentTimeTimestamp = DataProvider.TimestampTotalSeconds(); //当前时间 时间戳
                 if (msgBean.endtime > currentTimeTimestamp)//条件成立  解析成功 code 在有效期内
@@ -73,7 +65,7 @@ namespace XHWK.WKTool
                     }
                     Dispatcher.Invoke(new Action(() =>
                     {
-                        this.Hide();
+                        Hide();
                         CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
                         win.Show();
                         Close();
@@ -83,7 +75,7 @@ namespace XHWK.WKTool
                 {
                     Dispatcher.Invoke(new Action(() =>
                     {
-                        this.Hide();
+                        Hide();
                         KeyVerification wins = new KeyVerification
                         {
                             Topmost = true
@@ -98,7 +90,7 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("ProductVerification(解析失败)" + ex.Message, ex);
                 Dispatcher.Invoke(new Action(() =>
                 {
-                    this.Hide();
+                    Hide();
                     KeyVerification wins = new KeyVerification
                     {
                         Topmost = true

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -75,46 +75,46 @@ namespace XHWK.WKTool
         public ScreenRecordingToolbarWindow()
         {
             InitializeComponent();
-            this.ResizeMode = ResizeMode.NoResize;
+            ResizeMode = ResizeMode.NoResize;
         }
         /// <summary>
         /// 初始化
         /// </summary>
         public void Initialize()
         {
-                if (APP.W_PracticeWindow == null)
+            if (APP.W_PracticeWindow == null)
+            {
+                APP.W_PracticeWindow = new PracticeWindow
                 {
-                    APP.W_PracticeWindow = new PracticeWindow
-                    {
-                        //APP.W_PracticeWindow.Topmost = true;
-                        Width = pwidth,
-                        Height = pHeight,
-                        Left = 0,
-                        Top = 0
-                    };
-                    //practiceWin.Owner = this;
-                }
-                APP.W_PracticeWindow.Show();
-                new Thread(new ThreadStart(new Action(() =>
+                    //APP.W_PracticeWindow.Topmost = true;
+                    Width = pwidth,
+                    Height = pHeight,
+                    Left = 0,
+                    Top = 0
+                };
+                //practiceWin.Owner = this;
+            }
+            APP.W_PracticeWindow.Show();
+            new Thread(new ThreadStart(new Action(() =>
+            {
+                Thread.Sleep(100);
+                Dispatcher.Invoke(() =>
                 {
-                    Thread.Sleep(100);
-                    Dispatcher.Invoke(() =>
-                    {
-                        this.Owner = APP.W_PracticeWindow;
-                        this.Topmost = true;
-                    });
-                }))).Start();
-                APP.W_PracticeWindow.Hide();
-            
+                    Owner = APP.W_PracticeWindow;
+                    Topmost = true;
+                });
+            }))).Start();
+            APP.W_PracticeWindow.Hide();
+
             //timer = new System.Timers.Timer(200);
             //timer.Interval = 300;
             //timer.Elapsed += new System.Timers.ElapsedEventHandler(TimerDealy);
             //timer.Enabled = true; //启动计时器
 
             borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-                borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+            borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
             flg = 0;
-         
+
 
             k_hook = new KeyboardHookCommon();
             k_hook.KeyDownEvent += K_hook_KeyDownEvent;
@@ -272,10 +272,11 @@ namespace XHWK.WKTool
                 num++;
             }
         }
+
         /// <summary>
         /// 是否已经按下按钮
         /// </summary>
-        bool IsPressButton = false;
+        private bool IsPressButton = false;
         /// <summary>
         /// 开始或暂停录制
         /// </summary>
@@ -420,16 +421,16 @@ namespace XHWK.WKTool
                         {
                             Thread.Sleep(800);
                         }
-                        if(APP.FFmpeg.myProcess!=null)
+                        if (APP.FFmpeg.myProcess != null)
                         {
                             Thread.Sleep(100);
                         }
-                        bool SynRes=APP.FFmpeg.StartRecordingVideo(VideoSavePathName,out string ErrMessage);
+                        bool SynRes = APP.FFmpeg.StartRecordingVideo(VideoSavePathName, out string ErrMessage);
 
                         Thread.Sleep(1300);
                         Dispatcher.Invoke(() =>
                         {
-                            if(!SynRes)
+                            if (!SynRes)
                             {
                                 MessageWindow.Show(ErrMessage);
                                 //隐藏画笔工具栏
@@ -534,7 +535,7 @@ namespace XHWK.WKTool
             {
                 if (APP.W_PracticeWindow.Visibility == Visibility.Visible)
                 {
-                    this.Owner = null;
+                    Owner = null;
                     APP.W_PracticeWindow.ReturnPractice();
                 }
             }
@@ -577,8 +578,8 @@ namespace XHWK.WKTool
                                 Thread.Sleep(100);
                             }
                             FileToolsCommon.DeleteFile(ThumbnailPathName);
-                        //VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
-                        VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                            //VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
+                            VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                             VideoInfo.VideoPath = VideoSavePathName;
                             VideoInfo.ThumbnailPath = ThumbnailPathName;
                             APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName, 200, 130);
@@ -587,8 +588,8 @@ namespace XHWK.WKTool
                             VideoInfo.Uploaded = 0;
                             VideoInfo.Savefolder = APP.UserInfo.Schoolid + "/resource";
                             APP.VideoList.Add(VideoInfo);
-                        //保存数据
-                        APP.SaveWkData();
+                            //保存数据
+                            APP.SaveWkData();
                         }))).Start();
                         Click_stopRecordingScreen();
                     }
@@ -683,11 +684,11 @@ namespace XHWK.WKTool
                 {
                     //new Thread(new ThreadStart(new Action(() =>
                     //{
-                        Dispatcher.Invoke(() =>
-                        {
-                            borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
-                            borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-                        });
+                    Dispatcher.Invoke(() =>
+                    {
+                        borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
+                        borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    });
 
                     //}))).Start();
                     if (APP.W_PracticeWindow == null)
@@ -711,8 +712,8 @@ namespace XHWK.WKTool
                         Thread.Sleep(100);
                         Dispatcher.Invoke(() =>
                         {
-                            this.Owner = APP.W_PracticeWindow;
-                            this.Topmost = true;
+                            Owner = APP.W_PracticeWindow;
+                            Topmost = true;
                         });
                     }))).Start();
                 }
@@ -1016,12 +1017,12 @@ namespace XHWK.WKTool
                         Thread.Sleep(100);
                         Dispatcher.Invoke(() =>
                         {
-                            this.Owner = APP.W_PracticeWindow;
-                            this.Topmost = true;
+                            Owner = APP.W_PracticeWindow;
+                            Topmost = true;
                         });
                     }))).Start();
-                 
-                    
+
+
                 }
             }
             catch (Exception ex)
@@ -1038,7 +1039,7 @@ namespace XHWK.WKTool
         {
             if (flg > 9)
             {
-                this.Owner = null;
+                Owner = null;
                 APP.W_PracticeWindow.Hide();
             }
             else
@@ -1170,7 +1171,7 @@ namespace XHWK.WKTool
                 Thread.Sleep(500);
                 Dispatcher.Invoke(() =>
                 {
-                    this.Owner = null;
+                    Owner = null;
                     APP.W_PracticeWindow.Hide();
                 });
             }))).Start();

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -1,19 +1,12 @@
 using Common.system;
+
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-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.Navigation;
-using System.Windows.Shapes;
+
 using XHWK.Model;
 using XHWK.WKTool.DAL;
 
@@ -28,7 +21,7 @@ namespace XHWK.WKTool.UControl
         /// <summary>
         /// 视频模型
         /// </summary>
-        Model_Video VideoModel = new Model_Video();
+        private Model_Video VideoModel = new Model_Video();
         /// <summary>
         /// 刷新视频列表
         /// </summary>
@@ -45,11 +38,12 @@ namespace XHWK.WKTool.UControl
         /// 登陆事件
         /// </summary>
         public event UploadLogin Click_UploadLogin;
+
         /// <summary>
         /// 上传页面
         /// </summary>
-        UploadWindow W_UploadWindow = null;
-      
+        private UploadWindow W_UploadWindow = null;
+
         #endregion
 
         #region 初始化
@@ -88,7 +82,7 @@ namespace XHWK.WKTool.UControl
         /// <param name="e"></param>
         private void TextBlock_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            if(e.ClickCount==2)
+            if (e.ClickCount == 2)
             {
                 TxtModify.Text = TbName.ToolTip.ToString();
                 TbName.Visibility = Visibility.Hidden;
@@ -127,15 +121,15 @@ namespace XHWK.WKTool.UControl
         {
             ModifyVideoName();
         }
+
         /// <summary>
         /// 修改视频文件名
         /// </summary>
-        void ModifyVideoName()
+        private void ModifyVideoName()
         {
             if (TxtModify.Text != TbName.Text)
             {
-                string ErrMessage;
-                if (ModifyPathName(VideoModel.FileGuid, TxtModify.Text + "." + VideoModel.VideoType, out ErrMessage))
+                if (ModifyPathName(VideoModel.FileGuid, TxtModify.Text + "." + VideoModel.VideoType, out string ErrMessage))
                 {
                     //保存成功
                     TbName.Text = TxtModify.Text.Length > 11 ? TxtModify.Text.Substring(0, 11) + "..." : TxtModify.Text;
@@ -239,7 +233,7 @@ namespace XHWK.WKTool.UControl
                             ImgVideo.Source = null;
                             GC.Collect();
                             FileToolsCommon.DeleteFile(ThumbnailPath);
-                            this.Visibility = Visibility.Hidden;
+                            Visibility = Visibility.Hidden;
                             return;
                         }
                         catch (Exception ex)

XHWK.WKTool/UploadWindow.xaml.cs

@@ -9,7 +9,7 @@ using System.Windows.Input;
 
 using XHWK.Model;
 using XHWK.WKTool.DAL;
-using XHWK.WKTool.UControl;
+
 using static XHWK.WKTool.XHMicroLessonSystemWindow;
 
 namespace XHWK.WKTool
@@ -48,7 +48,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 当前视频的下标
         /// </summary>
-       private int i = 0;
+        private int i = 0;
         private System.Timers.Timer times;
         public UploadWindow()
         {
@@ -57,7 +57,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 初始化
         /// </summary>
-        public void Initialize(string _resourcename, long _resourcesize, string _suffix, string _guid,int _i)
+        public void Initialize(string _resourcename, long _resourcesize, string _suffix, string _guid, int _i)
         {
             i = _i;
             Resourcename = _resourcename;
@@ -196,21 +196,21 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
-                if(string.IsNullOrWhiteSpace(book_list.Text))
-                {
-                    MessageWindow.Show("教材不能为空！");
-                }
-                btnStart.IsEnabled = false;
+            if (string.IsNullOrWhiteSpace(book_list.Text))
+            {
+                MessageWindow.Show("教材不能为空！");
+            }
+            btnStart.IsEnabled = false;
             book_list.IsEnabled = false;
             cmbTeachingMaterial.IsEnabled = false;
-                Thread myThread = new Thread(StartUpload);
+            Thread myThread = new Thread(StartUpload);
 
-                num = 0;
-                tip_outer.Visibility = Visibility.Visible;
-                myThread.Start();
-                times = new System.Timers.Timer(100);
-                times.Elapsed += Times_ElapsedClick;
-                times.Start();
+            num = 0;
+            tip_outer.Visibility = Visibility.Visible;
+            myThread.Start();
+            times = new System.Timers.Timer(100);
+            times.Elapsed += Times_ElapsedClick;
+            times.Start();
         }
         private void StartUpload()
         {
@@ -242,7 +242,7 @@ namespace XHWK.WKTool
                     Model_ResourceAdd model_ResourceAdd = new Model_ResourceAdd();
                     Dispatcher.Invoke(() =>
                     {
-                         model_ResourceAdd = new Model_ResourceAdd
+                        model_ResourceAdd = new Model_ResourceAdd
                         {
                             converted = 0,
                             createid = APP.UserInfo.Userid,
@@ -262,7 +262,7 @@ namespace XHWK.WKTool
                             schoolid = APP.UserInfo.Schoolid
                         };
                     });
-                    
+
                     if (Suffix.Equals("FLV"))
                     {
                         Suffix = "flv";
@@ -338,7 +338,8 @@ namespace XHWK.WKTool
                 });
             }
         }
-        int num = 0;
+
+        private int num = 0;
         /// <summary>
         /// 计时器
         /// </summary>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -209,11 +209,11 @@ namespace XHWK.WKTool
             //wfhCamera.Visibility = Visibility.Hidden;
             ImgPDFPath = null;
             ImgPDFPath = new string[300];
-        } 
+        }
         /// <summary>
         /// 初始化快捷键
         /// </summary>
-        public void InitializeKeyDownEvent() 
+        public void InitializeKeyDownEvent()
         {
             k_hook.Start();//安装键盘钩子
         }
@@ -369,22 +369,22 @@ namespace XHWK.WKTool
                 #endregion
 
                 CameraHelper.UpdateCameraDevices();
-            if (CameraHelper.CameraDevices.Count > 0)
-            {
-                CameraHelper.SetCameraDevice(0);
-                RbnOpen = new List<string>();
-                times = new System.Timers.Timer(200)//初始值为300
+                if (CameraHelper.CameraDevices.Count > 0)
                 {
-                    AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
-                };//设置执行一次（false）还是一直执行(true)
-                times.Elapsed += new System.Timers.ElapsedEventHandler(Times_Elapsed);
-                times.Enabled = true; //启动计时器
+                    CameraHelper.SetCameraDevice(0);
+                    RbnOpen = new List<string>();
+                    times = new System.Timers.Timer(200)//初始值为300
+                    {
+                        AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
+                    };//设置执行一次（false）还是一直执行(true)
+                    times.Elapsed += new System.Timers.ElapsedEventHandler(Times_Elapsed);
+                    times.Enabled = true; //启动计时器
 
-                IsRbnOpen = true;
+                    IsRbnOpen = true;
 
-                string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
-                FileToolsCommon.CreateDirectory(imgPath);
-            }
+                    string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
+                    FileToolsCommon.CreateDirectory(imgPath);
+                }
             }
         }
 
@@ -465,7 +465,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void RbnTurnOff_Click(object sender, RoutedEventArgs e)
         {
-            if(IsRbnOpen)
+            if (IsRbnOpen)
             {
                 #region 防止连击
                 if (IsPressButton)
@@ -487,12 +487,12 @@ namespace XHWK.WKTool
                 }
                 #endregion
                 IsRbnOpen = false;
-            imgPlayerRight.Visibility = Visibility.Collapsed;
-            imgPlayerLeft.Visibility = Visibility.Collapsed;
-            imgPlayerRightUnder.Visibility = Visibility.Collapsed;
-            imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
-            CameraHelper.CloseDevice();
-            I = 9999;
+                imgPlayerRight.Visibility = Visibility.Collapsed;
+                imgPlayerLeft.Visibility = Visibility.Collapsed;
+                imgPlayerRightUnder.Visibility = Visibility.Collapsed;
+                imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
+                CameraHelper.CloseDevice();
+                I = 9999;
             }
         }
         #endregion
@@ -953,7 +953,7 @@ namespace XHWK.WKTool
             {
                 WindowState = WindowState.Minimized;
             }
-       
+
             if (APP.W_JieTuWindow != null)
             {
                 APP.W_JieTuWindow.initialization();
@@ -1411,7 +1411,7 @@ namespace XHWK.WKTool
 
                             LogHelper.WriteErrLog("【打开pdf】(OpenDialog pdf)" + ex.Message, ex);
                         }
-                      
+
                     }
                     else//word
                     {
@@ -2460,32 +2460,37 @@ namespace XHWK.WKTool
         /// <summary>
         /// 总页数
         /// </summary>
-        int TotalPage = 0;
+        private int TotalPage = 0;
+
         /// <summary>
         /// 当前页
         /// </summary>
-        int CurrentPage = 1;
+        private int CurrentPage = 1;
+
         /// <summary>
         /// 每页显示的视频数
         /// </summary>
-        int PageShowNum = 0;
+        private int PageShowNum = 0;
+
         /// <summary>
         /// 视频信息列表
         /// </summary>
-        List<Uc_VideoItem> VideoControlList = new List<Uc_VideoItem>();
+        private List<Uc_VideoItem> VideoControlList = new List<Uc_VideoItem>();
+
         /// <summary>
         /// 横向间隔
         /// </summary>
-        double IntervalX = 0;
+        private double IntervalX = 0;
+
         /// <summary>
         /// 纵向间隔
         /// </summary>
-        double IntervalY = 0;
+        private double IntervalY = 0;
         #endregion
         /// <summary>
         /// 初始化加载上传页面数据
         /// </summary>
-        void LoadUploadInitData()
+        private void LoadUploadInitData()
         {
             APP.myloading.Show();
             //加载视频列表
@@ -2570,8 +2575,10 @@ namespace XHWK.WKTool
                     {
                         continue;
                     }
-                    videoItem = new Uc_VideoItem(model_VideoList[DataIndex]);
-                    videoItem.Tag = model_VideoList[DataIndex].FileGuid;
+                    videoItem = new Uc_VideoItem(model_VideoList[DataIndex])
+                    {
+                        Tag = model_VideoList[DataIndex].FileGuid
+                    };
                     videoItem.Click_refreshVideoList += LoadUploadInitData;
                     videoItem.Click_UploadLogin += Login;
                     videoItem.Width = 250;
@@ -2686,14 +2693,16 @@ namespace XHWK.WKTool
         /// 录制计时
         /// </summary>
         private DateTime SRTime = DateTime.Now;
+
         /// <summary>
         /// 录制大小
         /// </summary>
-        int gridActWidth = 1276;
+        private int gridActWidth = 1276;
+
         /// <summary>
         /// 录制大小
         /// </summary>
-        int gridActHeight = 898;
+        private int gridActHeight = 898;
 
         #endregion
 
@@ -2787,7 +2796,7 @@ namespace XHWK.WKTool
 
         }
         #endregion
-        bool IsPressButton = false;
+        private bool IsPressButton = false;
         /// <summary>
         /// 录制窗口内容
         /// </summary>
@@ -3092,11 +3101,11 @@ namespace XHWK.WKTool
                     new Thread(new ThreadStart(new Action(() =>
                     {
                         Thread.Sleep(1000);
-                        IsRecordAudio = APP.FFmpeg.StartRecordingAudio(AudioPathName,out string ErrMessage);
+                        IsRecordAudio = APP.FFmpeg.StartRecordingAudio(AudioPathName, out string ErrMessage);
                         Thread.Sleep(1000);
                         Dispatcher.Invoke(() =>
                         {
-                            if(!IsRecordAudio)
+                            if (!IsRecordAudio)
                             {
                                 MessageWindow.Show(ErrMessage);
                             }
@@ -3155,10 +3164,11 @@ namespace XHWK.WKTool
                 }
             }
         }
+
         /// <summary>
         /// 记录上次截图时间
         /// </summary>
-        DateTime Recorddt = DateTime.Now;
+        private DateTime Recorddt = DateTime.Now;
         /// <summary>
         /// 录制保存图片计时器
         /// </summary>
@@ -3179,10 +3189,11 @@ namespace XHWK.WKTool
                 }
             }
         }
+
         /// <summary>
         /// 录制保存图片
         /// </summary>
-        void RecordSaveImage()
+        private void RecordSaveImage()
         {
             try
             {
@@ -3365,7 +3376,7 @@ namespace XHWK.WKTool
                                 AudioPathName = null;
                             }
                             //合成视频
-                            bool SynRes = APP.FFmpeg.SynthesisVideo(ImgPath, AudioPathName, VideoSynthesisPathName, 5, gridActWidth, gridActHeight,out string ErrMessage);
+                            bool SynRes = APP.FFmpeg.SynthesisVideo(ImgPath, AudioPathName, VideoSynthesisPathName, 5, gridActWidth, gridActHeight, out string ErrMessage);
                             //}))).Start();
                             //new Thread(new ThreadStart(new Action(() =>
                             //{
@@ -3374,7 +3385,7 @@ namespace XHWK.WKTool
                                 Dispatcher.Invoke(() =>
                                 {
                                     //MessageWindow.Show("视频录制失败，无法保存此视频！");
-                                    MessageWindow.Show("录制失败,"+ErrMessage);
+                                    MessageWindow.Show("录制失败," + ErrMessage);
                                     BtnRecord.IsEnabled = true;
                                     btnStop.IsEnabled = true;
                                     TxbRecordingWord.Text = "录制";