工具条提示文字

代码优化

XHWK.WKTool/App.config

@@ -5,7 +5,7 @@
   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="0" />
+    <add key="IsDebug" value="1" />
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -14,12 +14,12 @@ namespace XHWK.WKTool
     /// <summary>
     /// 创建微课
     /// </summary>
-    public partial class CreateAMicroLessonWindow : Window
+    public partial class CreateAMicroLessonWindow
     {
         #region 字段
 
-        private FolderBrowserDialog ofd;
-        private DialogResult result;
+        private FolderBrowserDialog _ofd;
+        private DialogResult _result;
 
         #endregion 字段
 
@@ -56,36 +56,36 @@ namespace XHWK.WKTool
         /// <summary>
         /// 图片宽度，每次切换的宽度
         /// </summary>
-        private double ImgWidth = 502.00;
+        private double _imgWidth = 502.00;
 
         /// <summary>
         /// 轮播时移动增加的宽度
         /// </summary>
-        private double ImgMove = 1;
+        private double _imgMove = 1;
 
         /// <summary>
         /// 当前展示的图片序号Index从0开始
         /// </summary>
-        private int ImgNumIndex = 0;
+        private int _imgNumIndex;
 
         /// <summary>
         /// 加载录播图
         /// </summary>
         private void LoadingCarouseImg()
         {
-            new Thread(new ThreadStart(new Action(() =>
+            new Thread(() =>
             {
                 Thread.Sleep(3000);
                 Dispatcher.Invoke(() =>
                 {
-                    ImgWidth = ImgCarouse1.ActualWidth;
-                    ImgMove = ImgWidth / 250.00;
+                    _imgWidth = ImgCarouse1.ActualWidth;
+                    _imgMove = _imgWidth / 250.00;
                     CarouseImg();
                     //timesCarouse = new System.Timers.Timer(2000);
                     //timesCarouse.Elapsed += TimesCarouse_Elapsed; ;
                     //timesCarouse.Start();
                 });
-            }))).Start();
+            }).Start();
         }
 
         /// <summary>
@@ -93,64 +93,54 @@ namespace XHWK.WKTool
         /// </summary>
         private void CarouseImg()
         {
-            new Thread(new ThreadStart(new Action(() =>
+            new Thread(() =>
             {
                 while (true)
                 {
-                    for (double i = ImgMove; i < ImgWidth; i += ImgMove)
+                    for (double i = _imgMove; i < _imgWidth; i += _imgMove)
                     {
+                        var i1 = i;
                         Dispatcher.Invoke(() =>
                         {
-                            if (Math.Abs(i + ImgMove) < ImgWidth)
+                            if (Math.Abs(
+                                    i1 + _imgMove) < _imgWidth)
                             {
                                 //图片移动轮播
-                                SplCarouse.Margin = new Thickness(SplCarouse.Margin.Left - ImgMove, 0, 0, 0);
+                                SplCarouse.Margin = new Thickness(SplCarouse.Margin.Left - _imgMove, 0, 0, 0);
                             }
                             else
                             {
-                                if (ImgNumIndex >= 2)
+                                if (_imgNumIndex >= 2)
                                 {
-                                    ImgNumIndex = 0;
+                                    _imgNumIndex = 0;
                                     SplCarouse.Margin = new Thickness(0, 0, 0, 0);
                                 }
                                 else
                                 {
-                                    ImgNumIndex++;
-                                    SplCarouse.Margin = new Thickness(-(ImgNumIndex * ImgWidth), 0, 0, 0);
+                                    _imgNumIndex++;
+                                    SplCarouse.Margin = new Thickness(-(_imgNumIndex * _imgWidth), 0, 0, 0);
                                 }
                             }
                         });
                         Thread.Sleep(3);
                     }
-                    bool IsBreak = false;
+
+                    bool isBreak = false;
                     Dispatcher.Invoke(() =>
                     {
                         if (this.Visibility != Visibility.Visible)
                         {
                             SplCarouse.Margin = new Thickness(0);
-                            IsBreak = true;
+                            isBreak = true;
                         }
                     });
                     Thread.Sleep(5000);
-                    if (IsBreak)
+                    if (isBreak)
                     {
                         break;
                     }
                 }
-            }))).Start();
-        }
-
-        /// <summary>
-        /// 轮播图切换
-        /// </summary>
-        /// <param name="sender">
-        /// </param>
-        /// <param name="e">
-        /// </param>
-        private void TimesCarouse_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
-        {
-            //SplCarouse
-            //ImgCarouse1
+            }).Start();
         }
 
         #endregion 轮播图
@@ -169,11 +159,7 @@ namespace XHWK.WKTool
             MessageBoxResult dr = MessageWindow.Show("确定退出系统？", "提示", MessageBoxButton.OKCancel);
             if (dr == MessageBoxResult.OK)
             {
-                System.Environment.Exit(0);
-            }
-            else
-            {
-                return;
+                Environment.Exit(0);
             }
         }
 
@@ -187,19 +173,19 @@ namespace XHWK.WKTool
         private void BtnBrowse_Click(object sender, RoutedEventArgs e)
         {
             //string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
-            ofd = new FolderBrowserDialog();
+            _ofd = new FolderBrowserDialog();
 
-            result = ofd.ShowDialog();
-            if (result == System.Windows.Forms.DialogResult.OK)
+            _result = _ofd.ShowDialog();
+            if (_result == System.Windows.Forms.DialogResult.OK)
             {
-                if (ofd.SelectedPath != "")
+                if (_ofd.SelectedPath != "")
                 {
-                    txbStoragePath.Text = ofd.SelectedPath;
+                    txbStoragePath.Text = _ofd.SelectedPath;
                 }
             }
         }
 
-        private bool IsPressButton = false;
+        private bool _isPressButton;
 
         /// <summary>
         /// 开始
@@ -212,18 +198,18 @@ namespace XHWK.WKTool
         {
             #region 防止连击
 
-            if (IsPressButton)
+            if (_isPressButton)
             {
                 return;
             }
             else
             {
-                IsPressButton = true;
-                new Thread(new ThreadStart(new Action(() =>
+                _isPressButton = true;
+                new Thread(() =>
                 {
                     Thread.Sleep(500);
-                    IsPressButton = false;
-                }))).Start();
+                    _isPressButton = false;
+                }).Start();
             }
 
             #endregion 防止连击
@@ -235,16 +221,18 @@ namespace XHWK.WKTool
                 MessageWindow.Show("讲解名称不可为空！");
                 return;
             }
+
             if (string.IsNullOrWhiteSpace(txbStoragePath.Text.Trim()))
             {
                 MessageWindow.Show("路径不可为空！");
                 return;
             }
+
             try
             {
                 FileToolsCommon.CreateDirectory(txbStoragePath.Text.Trim());
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 MessageWindow.Show("路径无法访问，解决方案：\r\n1,检查路径是否可访问。\r\n2,关闭杀毒软件或信任软件。");
                 return;
@@ -254,8 +242,8 @@ namespace XHWK.WKTool
 
             LblCreate.Visibility = Visibility.Visible;
             string wkpath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/";
-            string StoragePath = txbStoragePath.Text;
-            string WkName = txbExplainName.Text;
+            string storagePath = txbStoragePath.Text;
+            string wkName = txbExplainName.Text;
             await Task.Run(() =>
             {
                 try
@@ -267,7 +255,7 @@ namespace XHWK.WKTool
                         APP.WKData = new Model_WKData
                         {
                             WkPath = wkpath,
-                            WkName = WkName,
+                            WkName = wkName,
                             WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
                         };
                     }
@@ -285,7 +273,7 @@ namespace XHWK.WKTool
                     }
 
                     //存储文件
-                    FileToolsCommon.SetConfigValue("VideoSavePath", StoragePath);
+                    FileToolsCommon.SetConfigValue("VideoSavePath", storagePath);
 
                     APP.ReadDrawData();
                 }
@@ -299,6 +287,7 @@ namespace XHWK.WKTool
             {
                 APP.W_XHMicroLessonSystemWindow = new MainWindow();
             }
+
             APP.W_XHMicroLessonSystemWindow.Show();
             LblCreate.Visibility = Visibility.Hidden;
             Hide();
@@ -321,7 +310,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 检测APP更新
         /// </summary>
-        private void getNewApp()
+        private void GetNewApp()
         {
             new Thread(o =>
             {
@@ -333,10 +322,11 @@ namespace XHWK.WKTool
                     //软件是否更新，版本号小于0不更新
                     return;
                 }
+
                 string url = APP.apiUrl + "/sapi/apprecord/get_new";
 
                 string result = HttpHelper.PostAndRespStr(url, "{}");
-                Model.ResultVo<Model_App> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_App>>(result);
+                var resultObj = JsonHelper.JsonToObj<ResultVo<Model_App>>(result);
                 if (result != null && resultObj.code == 0)
                 {
                     if (resultObj.obj != null)
@@ -346,12 +336,12 @@ namespace XHWK.WKTool
                             int versionCode = resultObj.obj.versioncode;
                             if (versionThis < versionCode)
                             {
-                                Dispatcher.Invoke(new Action(() =>
+                                Dispatcher.Invoke(() =>
                                 {
                                     string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
                                     FileToolsCommon.CreateDirectory(pathTemp);
-                                    appUpdateShow(resultObj.obj);
-                                }));
+                                    AppUpdateShow(resultObj.obj);
+                                });
                             }
                         }
                         catch (Exception ex)
@@ -368,7 +358,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="app">
         /// </param>
-        private void appUpdateShow(Model_App app)
+        private void AppUpdateShow(Model_App app)
         {
             AppUpdateWin win = new AppUpdateWin(app)
             {
@@ -380,7 +370,7 @@ namespace XHWK.WKTool
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            getNewApp();
+            GetNewApp();
         }
 
         private void Window_Closed(object sender, EventArgs e)

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -14,43 +14,45 @@ namespace XHWK.WKTool.DAL
     /// <summary>
     /// 上传相关方法 创建人：赵耀 创建时间：2020年9月4日
     /// </summary>
-    public class DAL_Upload
+    public class DalUpload
     {
-        private string FileRequestAddress = APP.uploadUrl;
+        private readonly string _fileRequestAddress = APP.uploadUrl;
 
         //private string schoolfileRequestAddress = APP.showImageUrl;
         /// <summary>
         /// 文件是否允许上传
         /// </summary>
-        /// <param name="MD5">
+        /// <param name="md5">
         /// MD5
         /// </param>
-        /// <param name="Message">
+        /// <param name="message">
         /// 错误消息
         /// </param>
         /// <returns>
         /// </returns>
-        public bool IsAllowUploaded(string MD5, out string Message)
+        public bool IsAllowUploaded(string md5, out string message)
         {
             Exception ex = null;
-            Message = "";//请求重试5次 共5秒
+            message = ""; //请求重试5次 共5秒
             for (int num = 0; num < 5; num++)
             {
                 try
                 {
-                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/isexist", @"application/x-www-form-urlencoded", @"md5=" + MD5, "");
+                    JObject jo = HttpHelper.PostFunction(_fileRequestAddress + @"/chunkdb/isexist",
+                        @"application/x-www-form-urlencoded", @"md5=" + md5, "");
                     if (jo == null)
                     {
-                        Message = "无法访问文件服务器，请检查网络或文件服务器地址。";
+                        message = "无法访问文件服务器，请检查网络或文件服务器地址。";
                         return false;
                     }
 
                     //修改为0为之前上传成功，1为之前未上传成功
-                    if (jo["code"].ToString() == "0")
+                    if (jo["code"]?.ToString() == "0")
                     {
-                        Message = "";
+                        message = "";
 
-                        Model.ResultVo<Model_ResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString());
+                        Model.ResultVo<Model_ResourceAddTwo> resultObj =
+                            JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString());
 
                         APP.ResourceAddTwo = resultObj.obj;
                         //已存在 不允许上传
@@ -58,49 +60,52 @@ namespace XHWK.WKTool.DAL
                     }
                     else
                     {
-                        Message = "";
+                        message = "";
                         //不存在 允许上传
                         return true;
                     }
                 }
                 catch (Exception e)
                 {
-                    Message = "上传失败，无法访问到服务器：" + e.Message;
+                    message = "上传失败，无法访问到服务器：" + e.Message;
                     ex = e;
                     Thread.Sleep(1000);
                 }
             }
-            string ErrMessage = "【文件是否存在】(IsUploaded):请求失败。" + Message;
-            LogHelper.WriteErrLog(ErrMessage, ex);
+
+            string errMessage = "【文件是否存在】(IsUploaded):请求失败。" + message;
+            LogHelper.WriteErrLog(errMessage, ex);
             return false;
         }
 
         /// <summary>
         /// 上报文件合并指令
         /// </summary>
-        /// <param name="Savefolder">
+        /// <param name="savefolder">
         /// 保存文件位置 学校id/resource
         /// </param>
-        /// <param name="FileCode">
+        /// <param name="fileCode">
         /// 文件唯一编号 Guid
         /// </param>
-        /// <param name="Message">
+        /// <param name="message">
         /// 错误信息
         /// </param>
         /// <returns>
         /// </returns>
-        public bool ReportFileMerge(string Savefolder, string FileCode, out string Message)
+        public bool ReportFileMerge(string savefolder, string fileCode, out string message)
         {
             Exception ex = null;
-            Message = "";//请求重试5次 共5秒
+            message = ""; //请求重试5次 共5秒
             for (int num = 0; num < 5; num++)
             {
                 try
                 {
-                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/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,
+                        "");
                     if (jo == null)
                     {
-                        Message = "无法访问文件服务器，请检查网络或文件服务器地址。";
+                        message = "无法访问文件服务器，请检查网络或文件服务器地址。";
                         return false;
                     }
                     Model.ResultVo<Model_ResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString());
@@ -114,19 +119,20 @@ namespace XHWK.WKTool.DAL
                     else
                     {
                         //Message = "上传失败！";
-                        Message = jo["msg"].ToString();
+                        message = jo["msg"]?.ToString();
                         return false;
                     }
                 }
                 catch (Exception e)
                 {
-                    Message = e.Message;
+                    message = e.Message;
                     ex = e;
                     Thread.Sleep(1000);
                 }
             }
-            string ErrMessage = "【上报合并文件】(ReportFileMerge):请求失败。" + Message;
-            LogHelper.WriteErrLog(ErrMessage, ex);
+
+            string errMessage = "【上报合并文件】(ReportFileMerge):请求失败。" + message;
+            LogHelper.WriteErrLog(errMessage, ex);
             return false;
         }
 
@@ -135,41 +141,43 @@ namespace XHWK.WKTool.DAL
         /// </summary>
         /// <returns>
         /// </returns>
-        public bool UploadVideo(string VideoGuid, out string ErrMessage)
+        public bool UploadVideo(string videoGuid, out string errMessage)
         {
-            ErrMessage = "";
+            errMessage = "";
             try
             {
-                Model_Video VideoInfo = null;
-                foreach (Model_WKData Vdata in APP.WKDataList)
+                Model_Video videoInfo = null;
+                foreach (Model_WKData vdata in APP.WKDataList)
                 {
-                    if (Vdata.VideoList == null)
+                    if (vdata.VideoList == null)
                     {
                         continue;
                     }
 
-                    foreach (Model_Video videoinfo in Vdata.VideoList)
+                    foreach (Model_Video videoinfo in vdata.VideoList)
                     {
-                        if (videoinfo.FileGuid == VideoGuid)
+                        if (videoinfo.FileGuid == videoGuid)
                         {
-                            VideoInfo = videoinfo;
+                            videoInfo = videoinfo;
                             break;
                         }
                     }
-                    if (VideoInfo != null)
+
+                    if (videoInfo != null)
                     {
                         break;
                     }
                 }
-                if (VideoInfo == null)
+
+                if (videoInfo == null)
                 {
-                    ErrMessage = "未找到课程！";
+                    errMessage = "未找到课程！";
                     return false;
                 }
-                string UploadUrl = FileRequestAddress + "/chunkdb/upchunk";//zxyceshi
-                if (VideoInfo.IsUpload)
+
+                if (videoInfo.IsUpload)
                 {
-                    ErrMessage = "视频已上传";
+                    errMessage = "视频已上传";
                     return false;
                 }
                 else
@@ -189,78 +197,82 @@ namespace XHWK.WKTool.DAL
         /// </summary>
         /// <returns>
         /// </returns>
-        public bool UploadVideoTwo(string VideoGuid, out string ErrMessage)
+        public bool UploadVideoTwo(string videoGuid, out string errMessage)
         {
-            ErrMessage = "";
+            errMessage = "";
             try
             {
-                Model_Video VideoInfo = null;
-                foreach (Model_WKData Vdata in APP.WKDataList)
+                Model_Video videoInfo = null;
+                foreach (Model_WKData vdata in APP.WKDataList)
                 {
-                    if (Vdata.VideoList == null)
+                    if (vdata.VideoList == null)
                     {
                         continue;
                     }
 
-                    foreach (Model_Video videoinfo in Vdata.VideoList)
+                    foreach (Model_Video videoinfo in vdata.VideoList)
                     {
-                        if (videoinfo.FileGuid == VideoGuid)
+                        if (videoinfo.FileGuid == videoGuid)
                         {
-                            VideoInfo = videoinfo;
+                            videoInfo = videoinfo;
                             break;
                         }
                     }
-                    if (VideoInfo != null)
+
+                    if (videoInfo != null)
                     {
                         break;
                     }
                 }
-                if (VideoInfo == null)
+
+                if (videoInfo == null)
                 {
-                    ErrMessage = "未找到课程！";
+                    errMessage = "未找到课程！";
                     return false;
                 }
-                string UploadUrl = FileRequestAddress + "/chunkdb/upchunk";//zxyceshi
-                if (VideoInfo.IsUpload)
+
+                string uploadUrl = _fileRequestAddress + "/chunkdb/upchunk"; //zxyceshi
+                if (videoInfo.IsUpload)
                 {
-                    ErrMessage = "视频已上传";
+                    errMessage = "视频已上传";
                     return false;
                 }
                 else
                 {
-                    if (string.IsNullOrWhiteSpace(VideoInfo.FileMD5))
+                    if (string.IsNullOrWhiteSpace(videoInfo.FileMD5))
                     {
-                        VideoInfo.FileMD5 = AESHelper.AESEncrypt(FileToolsCommon.ReadBigFileStr(VideoInfo.VideoPath, 1024));
+                        videoInfo.FileMD5 =
+                            AESHelper.AESEncrypt(FileToolsCommon.ReadBigFileStr(videoInfo.VideoPath, 1024));
                     }
 
                     //视频长度
-                    long filelen = FileToolsCommon.GetFileSize(VideoInfo.VideoPath);
+                    long filelen = FileToolsCommon.GetFileSize(videoInfo.VideoPath);
                     //每片的长度
-                    double UploadSliceLenMB = double.Parse(FileToolsCommon.GetConfigValue("UploadSliceLen"));
-                    string fileName = FileToolsCommon.GetFileName(VideoInfo.VideoPath);
+                    double uploadSliceLenMb = double.Parse(FileToolsCommon.GetConfigValue("UploadSliceLen"));
+                    string fileName = FileToolsCommon.GetFileName(videoInfo.VideoPath);
                     //是否续传
-                    bool IsSequel = true;
                     //分块数为0时 从未上传过
-                    if (VideoInfo.Block > 0)
+                    if (videoInfo.Block > 0)
                     {
                         //是否已上传所有分块
-                        if (VideoInfo.Block > VideoInfo.Uploaded)
+                        if (videoInfo.Block > videoInfo.Uploaded)
                         {
                             //已上传，未上传完
-                            IsSequel = true;
                         }
                         else
                         {
                             //上传完,未合并
-                            IsSequel = false;
 
                             #region 合并文件
 
                             //合并文件
-                            bool isres = ReportFileMerge(APP.UserInfo.cloudcode + "/" + APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
+                            bool isres =
+                                ReportFileMerge(
+                                    APP.UserInfo.cloudcode + "/" + APP.UserInfo.Schoolid.ToString() + "/resource",
+                                    videoInfo.FileGuid, out errMessage);
                             if (isres)
                             {
-                                VideoInfo.IsUpload = true;
+                                videoInfo.IsUpload = true;
                                 return true;
                             }
                             else
@@ -274,48 +286,47 @@ namespace XHWK.WKTool.DAL
                     else
                     {
                         //是否允许上传
-                        if (IsAllowUploaded(VideoInfo.FileMD5, out ErrMessage))
+                        if (IsAllowUploaded(videoInfo.FileMD5, out errMessage))
                         {
-                            IsSequel = true;
-                            if (VideoInfo.SliceLen == 0)
+                            if (videoInfo.SliceLen == 0)
                             {
-                                VideoInfo.SliceLen = (long)(UploadSliceLenMB * 1024 * 1024);
-                                VideoInfo.Block = (int)(filelen / VideoInfo.SliceLen + (filelen % VideoInfo.SliceLen > 0 ? 1 : 0));
+                                videoInfo.SliceLen = (long)(uploadSliceLenMb * 1024 * 1024);
+                                videoInfo.Block = (int)(filelen / videoInfo.SliceLen +
+                                                        (filelen % videoInfo.SliceLen > 0 ? 1 : 0));
                             }
                         }
                         else
                         {
                             //文件在服务器上已存在  空间是否存在未知 若增加空间是否存在判断在此处添加
-                            IsSequel = false;
-                            VideoInfo.Block = 1;
-                            VideoInfo.Uploaded = 1;
+                            videoInfo.Block = 1;
+                            videoInfo.Uploaded = 1;
 
-                            VideoInfo.IsUpload = true;
+                            videoInfo.IsUpload = true;
                             return true;
                         }
                     }
 
                     ////临时修改 没有断点续传，每次上传都重新上传。
                     //VideoInfo.Uploaded = 0;
-                    if (IsSequel)
                     {
                         //已上传长度
-                        long len = VideoInfo.Uploaded * VideoInfo.SliceLen;
+                        long len;
 
                         //分块
                         do
                         {
-                            len = VideoInfo.Uploaded * VideoInfo.SliceLen;
+                            len = videoInfo.Uploaded * videoInfo.SliceLen;
                             //取指定长度的流
-                            byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(VideoInfo.VideoPath, len, (int)VideoInfo.SliceLen);
+                            byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(videoInfo.VideoPath, len,
+                                (int)videoInfo.SliceLen);
                             //参数
                             NameValueCollection formFields = new NameValueCollection
                             {
-                                { "identifier", VideoInfo.FileGuid },
-                                { "chunkNumber", (VideoInfo.Uploaded + 1).ToString() },
+                                { "identifier", videoInfo.FileGuid },
+                                { "chunkNumber", (videoInfo.Uploaded + 1).ToString() },
                                 { "filename", fileName },
-                                { "totalchunk", VideoInfo.Block.ToString() },
-                                { "md5", VideoInfo.FileMD5 }
+                                { "totalchunk", videoInfo.Block.ToString() },
+                                { "md5", videoInfo.FileMD5 }
                             };
                             //formFields.Add();///教材
                             //if()//章节若没选不传
@@ -323,23 +334,26 @@ namespace XHWK.WKTool.DAL
                             //    formFields.Add();
                             //}
 
-                            JObject jo = HttpHelper.UploadRequestflow(UploadUrl, byteArray, fileName, formFields);
+                            JObject jo = HttpHelper.UploadRequestflow(uploadUrl, byteArray, fileName, formFields);
                             //0成功，1失败
-                            if (jo["code"].ToString() != "0")
+                            if (jo["code"]?.ToString() != "0")
                             {
-                                ErrMessage = jo["msg"].ToString();
+                                errMessage = jo["msg"]?.ToString();
                                 return false;
                             }
                             else
                             {
-                                VideoInfo.Uploaded++;
+                                videoInfo.Uploaded++;
                             }
-                        } while (len + VideoInfo.SliceLen < filelen);
+                        } while (len + videoInfo.SliceLen < filelen);
 
                         #region 合并文件
 
                         //合并文件
-                        bool isres = ReportFileMerge(APP.UserInfo.cloudcode + "/" + APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
+                        bool isres =
+                            ReportFileMerge(
+                                APP.UserInfo.cloudcode + "/" + APP.UserInfo.Schoolid.ToString() + "/resource",
+                                videoInfo.FileGuid, out errMessage);
                         if (isres)
                         {
                             //VideoInfo.IsUpload = true;
@@ -352,18 +366,6 @@ namespace XHWK.WKTool.DAL
 
                         #endregion 合并文件
                     }
-                    else
-                    {
-                        if (string.IsNullOrWhiteSpace(ErrMessage))
-                        {
-                            //VideoInfo.IsUpload = true;
-                            return true;
-                        }
-                        else
-                        {
-                            return false;
-                        }
-                    }
                 }
             }
             catch (Exception ex)

XHWK.WKTool/KeyVerification.xaml

@@ -2,135 +2,102 @@
     x:Class="XHWK.WKTool.KeyVerification"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Views="clr-namespace:XHWK.WKTool.Helpers"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:XHWK.WKTool"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="KeyVerification"
     Width="400"
-    Height="230"
+    Height="200"
     AllowsTransparency="True"
     Background="Transparent"
+    BorderBrush="#4597FF"
+    BorderThickness="1"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
     WindowStyle="None"
     mc:Ignorable="d">
 
-    <Window.Resources>
-        <Style x:Key="oiliu" TargetType="ListBoxItem">
-            <!--  设置控件模板  -->
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ListBoxItem">
-                        <Border
-                            Margin="4,0,0,0"
-                            Padding="0"
-                            Background="{TemplateBinding Background}">
-                            <ContentPresenter
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                TextBlock.Foreground="{TemplateBinding Foreground}" />
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <DataTemplate x:Key="UserTpl">
-            <StackPanel
-                Width="70.5"
-                Height="auto"
-                Background="Transparent">
-                <TextBlock
-                    Padding="0,12,0,0"
-                    HorizontalAlignment="Left"
-                    FontSize="20"
-                    Foreground="#3C525B"
-                    Text="{Binding username}" />
-            </StackPanel>
-        </DataTemplate>
-    </Window.Resources>
-    <Views:ZJClippingBorder Background="White">
-        <Grid Margin="0,0,0,0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="50" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="75" />
-            </Grid.RowDefinitions>
-            <!--  头部  -->
-            <Grid
+    <Window.Resources />
+    <Grid Margin="0,0,0,0" Background="White">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="75" />
+        </Grid.RowDefinitions>
+        <!--  头部  -->
+        <Grid
+            Grid.Row="0"
+            Height="50"
+            Background="#4597FF"
+            MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+            <TextBlock
+                x:Name="TitleTb"
                 Grid.Row="0"
-                Height="50"
-                Background="#4597FF">
-                <TextBlock
-                    x:Name="title_tb"
-                    Grid.Row="0"
-                    Margin="15,0,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    FontSize="16"
-                    Foreground="White"
-                    Text="产品激活" />
-
-                <Button
-                    x:Name="btnDown"
-                    Grid.Row="0"
-                    Padding="10,0,10,0"
-                    HorizontalAlignment="Right"
-                    Click="close_click"
-                    Content="×"
-                    Cursor="Hand"
-                    FontSize="30"
-                    Foreground="#FFFFFF" />
-            </Grid>
-            <Grid Grid.Row="1" Margin="30,20,30,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <TextBlock
-                    Padding="0,0,0,0"
-                    VerticalAlignment="Center"
-                    FontSize="20"
-                    Text="密匙：" />
-                <TextBox
-                    x:Name="txbKey"
-                    Grid.Column="1"
-                    Height="46"
-                    VerticalAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    FontSize="18"
-                    Foreground="gray"
-                    Text="" />
-            </Grid>
+                Margin="15,0,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                FontSize="18"
+                Foreground="White"
+                Text="产品激活" />
 
             <Button
-                x:Name="btnEnd"
-                Grid.Row="2"
-                Height="48"
-                Margin="30,0,30,0"
-                Click="btnEnd_Click"
-                Content="验证"
+                x:Name="BtnDown"
+                Grid.Row="0"
+                Padding="10,0,10,0"
+                HorizontalAlignment="Right"
+                Click="close_click"
+                Content="×"
                 Cursor="Hand"
-                FontSize="18"
-                FontWeight="Bold"
-                Foreground="White"
-                IsDefault="True">
-                <Button.Template>
-                    <ControlTemplate TargetType="{x:Type Button}">
-                        <Border
-                            BorderBrush="{TemplateBinding Control.BorderBrush}"
-                            BorderThickness="0"
-                            CornerRadius="3">
-                            <Border.Background>#6098FF</Border.Background>
-                            <ContentPresenter
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding ContentControl.Content}" />
-                        </Border>
-                    </ControlTemplate>
-                </Button.Template>
-            </Button>
+                FontSize="30"
+                Foreground="#FFFFFF" />
+        </Grid>
+        <Grid Grid.Row="1" Margin="30,20,30,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Padding="0,0,0,0"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Text="密匙：" />
+            <TextBox
+                x:Name="TxbKey"
+                Grid.Column="1"
+                Height="36"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"
+                FontSize="16"
+                Foreground="gray"
+                Text="" />
         </Grid>
 
-    </Views:ZJClippingBorder>
+        <Button
+            x:Name="BtnEnd"
+            Grid.Row="2"
+            Width="138"
+            Height="36"
+            Margin="30,0,30,0"
+            Click="btnEnd_Click"
+            Content="验证"
+            Cursor="Hand"
+            FontSize="16"
+            FontWeight="Bold"
+            Foreground="White"
+            IsDefault="True">
+            <Button.Template>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border
+                        BorderBrush="{TemplateBinding Control.BorderBrush}"
+                        BorderThickness="0"
+                        CornerRadius="3">
+                        <Border.Background>#6098FF</Border.Background>
+                        <ContentPresenter
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding ContentControl.Content}" />
+                    </Border>
+                </ControlTemplate>
+            </Button.Template>
+        </Button>
+    </Grid>
 </Window>

XHWK.WKTool/KeyVerification.xaml.cs

@@ -4,9 +4,8 @@ using System.Management;
 using System.Text;
 using System.Threading;
 using System.Windows;
-
+using System.Windows.Input;
 using XHWK.WKTool.DAL;
-using XHWK.WKTool.Skin;
 
 namespace XHWK.WKTool
 {
@@ -16,11 +15,10 @@ namespace XHWK.WKTool
     /*
      输入code 调认证服务，成功跳登录 并且调用添加历史接口，失败继续输code
          */
-
-    public partial class KeyVerification : Window
+    public partial class KeyVerification
     {
-        private readonly XHApi registerController = new XHApi();
-        private int serverReturnCode = 0;
+        private readonly XHApi _registerController = new XHApi();
+        private int _serverReturnCode;
 
         public KeyVerification()
         {
@@ -28,27 +26,33 @@ namespace XHWK.WKTool
             Topmost = true;
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
 
-            Console.WriteLine("初始化KeyVerification");
+            Console.WriteLine(@"初始化KeyVerification");
+        }
+
+        private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
+        {
+            DragMove();
         }
 
         private void btnEnd_Click(object sender, RoutedEventArgs e)
         {
-            if (string.IsNullOrWhiteSpace(txbKey.Text))
+            if (string.IsNullOrWhiteSpace(TxbKey.Text))
             {
                 MessageWindow.Show("密匙未输入");
                 return;
             }
-            projectcode = txbKey.Text.Trim();
-            if (projectcode.Length > 8)
+
+            _projectcode = TxbKey.Text.Trim();
+            if (_projectcode.Length > 8)
             {
                 MessageWindow.Show("密匙输入过长");
-                txbKey.Text = projectcode.Substring(0, 8);
+                TxbKey.Text = _projectcode.Substring(0, 8);
                 return;
             }
             APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddServering, InvokeActivationAddServerCompate);
         }
 
-        private string projectcode = string.Empty;
+        private string _projectcode = string.Empty;
 
         /// <summary>
         /// 认证服务-调用
@@ -59,7 +63,7 @@ namespace XHWK.WKTool
         {
             string device = "pcwk";
             string mac = GetMacAddress();
-            serverReturnCode = registerController.ActivationAdd(mac, device, projectcode);
+            _serverReturnCode = _registerController.ActivationAdd(mac, device, _projectcode);
             return APP.ServerMsg;
         }
 
@@ -70,11 +74,12 @@ namespace XHWK.WKTool
         /// </returns>
         public void InvokeActivationAddServerCompate(object obj)
         {
-            if (serverReturnCode == 0)
+            if (_serverReturnCode == 0)
             {
                 MessageWindow.Show("产品激活成功");
-                APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering, InvokeActivationAddHistoryServerCompate);
-                Dispatcher.Invoke(new Action(() =>
+                APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering,
+                    InvokeActivationAddHistoryServerCompate);
+                Dispatcher.Invoke(() =>
                 {
                     Hide();
                     CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
@@ -83,7 +88,7 @@ namespace XHWK.WKTool
 
                     Thread.Sleep(200);
                     Close();
-                }));
+                });
             }
             else
             {
@@ -98,7 +103,7 @@ namespace XHWK.WKTool
         /// </returns>
         private object InvokeActivationAddHistoryServering()
         {
-            serverReturnCode = registerController.ActivationAddHistory();
+            _serverReturnCode = _registerController.ActivationAddHistory();
             return APP.ServerMsg;
         }
 
@@ -113,9 +118,10 @@ namespace XHWK.WKTool
             {
                 Directory.CreateDirectory(APP.DataPath);
             }
-            string ApplicationData = APP.DataPath + "signatureTime.txt";
-            string currentTime = DateTime.Now.ToLongDateString().ToString();//当前时间
-            System.IO.File.WriteAllText(ApplicationData, currentTime, Encoding.Default);//存放签名验证日期
+
+            string applicationData = APP.DataPath + "signatureTime.txt";
+            string currentTime = DateTime.Now.ToLongDateString(); //当前时间
+            File.WriteAllText(applicationData, currentTime, Encoding.Default); //存放签名验证日期
         }
 
         /// <summary>
@@ -131,15 +137,15 @@ namespace XHWK.WKTool
                 string strMac = string.Empty;
                 ManagementClass mc = new ManagementClass("Win32_NetworkAdapterConfiguration");
                 ManagementObjectCollection moc = mc.GetInstances();
-                foreach (ManagementObject mo in moc)
+                foreach (var o in moc)
                 {
-                    if ((bool)mo["IPEnabled"] == true)
+                    var mo = (ManagementObject)o;
+                    if ((bool)mo["IPEnabled"])
                     {
                         strMac = mo["MacAddress"].ToString();
                     }
                 }
-                moc = null;
-                mc = null;
+
                 return strMac;
             }
             catch
@@ -150,19 +156,13 @@ namespace XHWK.WKTool
 
         private void close_click(object sender, RoutedEventArgs e)
         {
-            closeAction();
+            CloseAction();
         }
 
-        private void closeAction()
+        private void CloseAction()
         {
             APP.myloading.Show();
-            new Thread(o =>
-            {
-                Dispatcher.Invoke(new Action(() =>
-                {
-                    System.Environment.Exit(0);
-                }));
-            }).Start();
+            new Thread(o => { Dispatcher.Invoke(() => { Environment.Exit(0); }); }).Start();
         }
     }
 }

XHWK.WKTool/MainWindow.xaml

@@ -9,7 +9,7 @@
     Height="700"
     AllowsTransparency="False"
     BorderBrush="#eee"
-    BorderThickness="0"
+    BorderThickness="1"
     Closed="Window_Closed"
     Loaded="Window_Loaded"
     MouseLeftButtonDown="Window_MouseLeftButtonDown_1"
@@ -20,7 +20,7 @@
     mc:Ignorable="d">
 
     <Window.Resources>
-        <Style x:Key="radBase" TargetType="RadioButton">
+        <Style x:Key="RadBase" TargetType="RadioButton">
             <Setter Property="IsChecked" Value="False" />
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="Foreground" Value="#555" />
@@ -1106,7 +1106,7 @@
                                     Cursor="Hand"
                                     FontSize="12"
                                     IsChecked="True"
-                                    Style="{StaticResource radBase}" />
+                                    Style="{StaticResource RadBase}" />
                                 <RadioButton
                                     x:Name="rbnIn"
                                     Margin="5,0,0,0"
@@ -1115,7 +1115,7 @@
                                     Content=" 中"
                                     Cursor="Hand"
                                     FontSize="12"
-                                    Style="{StaticResource radBase}" />
+                                    Style="{StaticResource RadBase}" />
                                 <RadioButton
                                     x:Name="rbnCrude"
                                     Margin="5,0,0,0"
@@ -1124,7 +1124,7 @@
                                     Content=" 粗"
                                     Cursor="Hand"
                                     FontSize="12"
-                                    Style="{StaticResource radBase}" />
+                                    Style="{StaticResource RadBase}" />
                             </StackPanel>
                             <StackPanel
                                 Grid.Column="2"
@@ -1145,7 +1145,7 @@
                                     Content=" 开"
                                     Cursor="Hand"
                                     FontSize="12"
-                                    Style="{StaticResource radBase}" />
+                                    Style="{StaticResource RadBase}" />
                                 <RadioButton
                                     x:Name="rbnTurnOff"
                                     Margin="5,0,10,0"
@@ -1155,7 +1155,7 @@
                                     Cursor="Hand"
                                     FontSize="12"
                                     IsChecked="True"
-                                    Style="{StaticResource radBase}" />
+                                    Style="{StaticResource RadBase}" />
                             </StackPanel>
                         </Grid>
                     </Grid>
@@ -1332,7 +1332,7 @@
                                                     FontSize="16"
                                                     Foreground="#333333"
                                                     IsChecked="True"
-                                                    Style="{StaticResource radBase}" />
+                                                    Style="{StaticResource RadBase}" />
                                                 <RadioButton
                                                     x:Name="rbnFLV"
                                                     Margin="15,0,0,0"
@@ -1341,7 +1341,7 @@
                                                     Cursor="Hand"
                                                     FontSize="16"
                                                     Foreground="#333333"
-                                                    Style="{StaticResource radBase}"
+                                                    Style="{StaticResource RadBase}"
                                                     Visibility="Collapsed" />
                                                 <RadioButton
                                                     x:Name="rbnAVI"
@@ -1350,7 +1350,7 @@
                                                     Cursor="Hand"
                                                     FontSize="16"
                                                     Foreground="#333333"
-                                                    Style="{StaticResource radBase}"
+                                                    Style="{StaticResource RadBase}"
                                                     Visibility="Collapsed" />
                                             </StackPanel>
                                         </Grid>
@@ -1390,7 +1390,7 @@
                                                     Foreground="#333333"
                                                     GroupName="RbtnCamera"
                                                     IsChecked="True"
-                                                    Style="{StaticResource radBase}" />
+                                                    Style="{StaticResource RadBase}" />
                                                 <RadioButton
                                                     x:Name="rbnRightUnder"
                                                     Margin="15,0"
@@ -1401,7 +1401,7 @@
                                                     FontSize="16"
                                                     Foreground="#333333"
                                                     GroupName="RbtnCamera"
-                                                    Style="{StaticResource radBase}" />
+                                                    Style="{StaticResource RadBase}" />
                                             </StackPanel>
                                         </Grid>
                                         <Grid Grid.Row="2" Grid.Column="3">
@@ -1420,7 +1420,7 @@
                                                     FontSize="16"
                                                     Foreground="#333333"
                                                     GroupName="RbtnCamera"
-                                                    Style="{StaticResource radBase}" />
+                                                    Style="{StaticResource RadBase}" />
                                                 <RadioButton
                                                     x:Name="rbnLeftUnder"
                                                     Margin="15,0"
@@ -1431,7 +1431,7 @@
                                                     FontSize="16"
                                                     Foreground="#333333"
                                                     GroupName="RbtnCamera"
-                                                    Style="{StaticResource radBase}" />
+                                                    Style="{StaticResource RadBase}" />
                                             </StackPanel>
                                         </Grid>
                                         <Grid Grid.Row="2" Grid.Column="0">
@@ -1456,7 +1456,7 @@
                                                     FontSize="16"
                                                     Foreground="#333333"
                                                     IsChecked="True"
-                                                    Style="{StaticResource radBase}" />
+                                                    Style="{StaticResource RadBase}" />
                                                 <RadioButton
                                                     x:Name="rbnvisi"
                                                     Margin="15,0,0,0"
@@ -1465,7 +1465,7 @@
                                                     Cursor="Hand"
                                                     FontSize="16"
                                                     Foreground="#333333"
-                                                    Style="{StaticResource radBase}" />
+                                                    Style="{StaticResource RadBase}" />
                                             </StackPanel>
                                         </Grid>
                                         <Grid Grid.Row="2" Grid.Column="2" />

XHWK.WKTool/MinToolbar.xaml

@@ -1,36 +1,39 @@
-<Window x:Class="XHWK.WKTool.MinToolbar"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:XHWK.WKTool"
-        mc:Ignorable="d"
-        Title="MinToolbar" Height="50" Width="20" AllowsTransparency="True" 
-        Topmost="True"
+<Window
+    x:Class="XHWK.WKTool.MinToolbar"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="MinToolbar"
+    Width="20"
+    Height="50"
+    Margin="0"
+    AllowsTransparency="True"
+    Left="0"
     ShowInTaskbar="False"
-    WindowStyle="None" Margin="0" Left="0" Top="0">
+    Top="0"
+    Topmost="True"
+    WindowStyle="None"
+    mc:Ignorable="d">
     <Window.Background>
         <SolidColorBrush Opacity="0" Color="#00000000" />
     </Window.Background>
     <Viewbox>
         <Grid>
             <Border Background="White" CornerRadius="3">
-                <!--<Grid x:Name="buttonMin" Height="25" Width="3"
-                        Margin="0.5"  
-                        MouseEnter="buttonMin_MouseEnter">
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                           
-                                <ContentPresenter
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
-                        </ControlTemplate>
-                    </Button.Template>
-                </Grid>-->
-                <Grid x:Name="buttonMin" Height="25" Width="3" Margin="0.5" MouseEnter="buttonMin_MouseEnter">
-                    <Border x:Name="BorderBlack" BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="0" CornerRadius="3" Background="#2d8cf0">
-                    </Border>
+
+                <Grid
+                    x:Name="ButtonMin"
+                    Width="3"
+                    Height="25"
+                    Margin="0.5"
+                    MouseEnter="buttonMin_MouseEnter">
+                    <Border
+                        x:Name="BorderBlack"
+                        Background="#2d8cf0"
+                        BorderBrush="{TemplateBinding Control.BorderBrush}"
+                        BorderThickness="0"
+                        CornerRadius="3" />
                 </Grid>
             </Border>
 

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -1,14 +1,11 @@
 using Common.system;
-
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-
 using XHWK.Model;
 
 namespace XHWK.WKTool
@@ -16,44 +13,46 @@ namespace XHWK.WKTool
     /// <summary>
     /// 录屏画板
     /// </summary>
-    public partial class PracticeWindow : Window
+    public partial class PracticeWindow
     {
         //声明一个 DrawingAttributes 类型的变量
-        private DrawingAttributes drawingAttributes;
+        private DrawingAttributes _drawingAttributes;
 
-        private DrawingAttributes drawing;
-        private ViewModel viewModel;
+        private DrawingAttributes _drawing;
+        private ViewModel _viewModel;
 
         /// <summary>
         /// 0 画笔 1 矩形 2 圆形
         /// </summary>
-        private int flg = 0;
+#pragma warning disable CS0414
+        private int _flg;
+#pragma warning restore CS0414
 
         /// <summary>
         /// 当前画笔颜色
         /// </summary>
-        private Color Colour = Colors.Red;
+        private Color _colour = Colors.Red;
 
         /// <summary>
         /// 当前画笔宽
         /// </summary>
-        private int Wit = 2;
+        private int _wit = 2;
 
         /// <summary>
         /// 当前画笔高
         /// </summary>
-        private int Hei = 2;
+        private int _hei = 2;
 
         public PracticeWindow()
         {
             InitializeComponent();
 
-            InitTQLPPen();
+            InitTqlpPen();
         }
 
-        public void Initialize(string _imgPath = null)
+        public void Initialize(string imgPath = null)
         {
-            flg = 0;
+            _flg = 0;
             blackboard_canvas.Strokes.Clear();
             blackboard_canvas.UseCustomCursor = true;
             //blackboard_canvas.EditingMode = InkCanvasEditingMode.EraseByStroke;
@@ -64,7 +63,7 @@ namespace XHWK.WKTool
             //}
 
             //创建 DrawingAttributes 类的一个实例
-            drawingAttributes = new DrawingAttributes();
+            _drawingAttributes = new DrawingAttributes();
 
             //drawingAttributes.StylusTip = StylusTip.Rectangle;
             //drawingAttributes.IsHighlighter = false;
@@ -72,7 +71,7 @@ namespace XHWK.WKTool
 
             ////将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用
             ////InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型
-            blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+            blackboard_canvas.DefaultDrawingAttributes = _drawingAttributes;
             Pen();
             //blackboard_canvas.Cursor = Cursors.Pen;
 
@@ -80,12 +79,12 @@ namespace XHWK.WKTool
 
             //blackboard_canvas.Cursor = cus;
 
-            viewModel = new ViewModel
+            _viewModel = new ViewModel
             {
                 InkStrokes = new StrokeCollection(),
             };
 
-            DataContext = viewModel;
+            DataContext = _viewModel;
             //APP.W_ScreenRecordingToolbarWindow.Owner = this;
             //APP.W_ScreenRecordingToolbarWindow.Topmost = true;
         }
@@ -93,114 +92,96 @@ namespace XHWK.WKTool
         /// <summary>
         /// 画笔颜色事件 白色
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         public void White()
         {
             //flg = 0;
-            drawingAttributes.Color = Colors.White;
-            Colour = Colors.White;
+            _drawingAttributes.Color = Colors.White;
+            _colour = Colors.White;
         }
 
         /// <summary>
         /// 画笔颜色事件 红色
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         public void Red()
         {
-            drawingAttributes.Color = Colors.Red;
-            Colour = Colors.Red;
+            _drawingAttributes.Color = Colors.Red;
+            _colour = Colors.Red;
         }
 
         /// <summary>
         /// 画笔颜色事件 黑色
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         public void Gray()
         {
             //flg = 0;
-            drawingAttributes.Color = Colors.Black;
-            Colour = Colors.Black;
+            _drawingAttributes.Color = Colors.Black;
+            _colour = Colors.Black;
         }
 
         /// <summary>
         /// 画笔颜色事件 青色
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         public void CyanBlue()
         {
             //flg = 0;
-            drawingAttributes.Color = Colors.LimeGreen;
-            Colour = Colors.LimeGreen;
+            _drawingAttributes.Color = Colors.LimeGreen;
+            _colour = Colors.LimeGreen;
         }
 
         /// <summary>
         /// 画笔颜色事件 黄色
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         public void Yellow()
         {
             //flg = 0;
-            drawingAttributes.Color = Colors.Gold;
-            Colour = Colors.Gold;
+            _drawingAttributes.Color = Colors.Gold;
+            _colour = Colors.Gold;
         }
 
         /// <summary>
         /// 画笔颜色事件 蓝色
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         public void Blue()
         {
             //flg = 0;
-            drawingAttributes.Color = Colors.DeepSkyBlue;
-            Colour = Colors.DeepSkyBlue;
+            _drawingAttributes.Color = Colors.DeepSkyBlue;
+            _colour = Colors.DeepSkyBlue;
         }
 
         /// <summary>
         /// 画笔粗细事件 细
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         public void Fine()
         {
             //flg = 0;
-            drawingAttributes.Width = 1;
-            drawingAttributes.Height = 1;
-            Wit = 1;
-            Hei = 1;
+            _drawingAttributes.Width = 1;
+            _drawingAttributes.Height = 1;
+            _wit = 1;
+            _hei = 1;
         }
 
         /// <summary>
         /// 画笔粗细事件 中
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         public void In()
         {
             //flg = 0;
-            drawingAttributes.Width = 3;
-            drawingAttributes.Height = 3;
-            Wit = 3;
-            Hei = 3;
+            _drawingAttributes.Width = 3;
+            _drawingAttributes.Height = 3;
+            _wit = 3;
+            _hei = 3;
         }
 
         /// <summary>
         /// 画笔粗细事件 粗
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         public void Crude()
         {
             //flg = 0;
-            drawingAttributes.Width = 5;
-            drawingAttributes.Height = 5;
-            Wit = 5;
-            Hei = 5;
+            _drawingAttributes.Width = 5;
+            _drawingAttributes.Height = 5;
+            _wit = 5;
+            _hei = 5;
         }
 
         /// <summary>
@@ -208,7 +189,7 @@ namespace XHWK.WKTool
         /// </summary>
         public void Eraser()
         {
-            flg = 0;
+            _flg = 0;
             //this.type = ZPenType.Erase;
             blackboard_canvas.UseCustomCursor = false;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
@@ -220,11 +201,11 @@ namespace XHWK.WKTool
         /// </summary>
         public void Pen()
         {
-            flg = 0;
+            _flg = 0;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.Ink;
             blackboard_canvas.UseCustomCursor = true;
-            drawingAttributes.FitToCurve = true;
-            drawingAttributes.IgnorePressure = false;
+            _drawingAttributes.FitToCurve = true;
+            _drawingAttributes.IgnorePressure = false;
 
             blackboard_canvas.Cursor = Cursors.Pen;
         }
@@ -234,18 +215,18 @@ namespace XHWK.WKTool
         /// </summary>
         public void Round()
         {
-            flg = 2;
-            drawingAttributes = new DrawingAttributes
+            _flg = 2;
+            _drawingAttributes = new DrawingAttributes
             {
-                Color = Colour,
-                Width = Wit,
-                Height = Hei,
+                Color = _colour,
+                Width = _wit,
+                Height = _hei,
                 StylusTip = StylusTip.Rectangle,
                 //FitToCurve = true,
                 IsHighlighter = false,
                 IgnorePressure = true,
             };
-            blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+            blackboard_canvas.DefaultDrawingAttributes = _drawingAttributes;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
             blackboard_canvas.Cursor = Cursors.Cross;
         }
@@ -255,133 +236,22 @@ namespace XHWK.WKTool
         /// </summary>
         public void Rectangle()
         {
-            flg = 1;
-            drawingAttributes = new DrawingAttributes
+            _flg = 1;
+            _drawingAttributes = new DrawingAttributes
             {
-                Color = Colour,
-                Width = Wit,
-                Height = Hei,
+                Color = _colour,
+                Width = _wit,
+                Height = _hei,
                 StylusTip = StylusTip.Rectangle,
                 //FitToCurve = true,
                 IsHighlighter = false,
                 IgnorePressure = true,
             };
-            blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+            blackboard_canvas.DefaultDrawingAttributes = _drawingAttributes;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
             blackboard_canvas.Cursor = Cursors.Cross;
         }
 
-        private System.Windows.Point iniP;
-
-        private void blackboard_canvas_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            if (flg != 0)
-            {
-                if (e.LeftButton == MouseButtonState.Pressed)
-                {
-                    iniP = e.GetPosition(blackboard_canvas);
-                }
-            }
-        }
-
-        private Stroke StrokeRound;
-        private Stroke StrokeRectangle;
-
-        private void blackboard_canvas_MouseMove(object sender, MouseEventArgs e)
-        {
-            if (flg != 0)
-            {
-                if (e.LeftButton == MouseButtonState.Pressed)
-                {
-                    // Draw square
-                    if (flg == 1)
-                    {
-                        System.Windows.Point endP = e.GetPosition(blackboard_canvas);
-                        List<System.Windows.Point> pointList = new List<System.Windows.Point>
-                    {
-                        new System.Windows.Point(iniP.X, iniP.Y),
-                        new System.Windows.Point(iniP.X, endP.Y),
-                        new System.Windows.Point(endP.X, endP.Y),
-                        new System.Windows.Point(endP.X, iniP.Y),
-                        new System.Windows.Point(iniP.X, iniP.Y),
-                    };
-                        //Stroke stroke1 = new Stroke(drawingAttributesRound);
-                        StylusPointCollection point = new StylusPointCollection(pointList);
-                        Stroke stroke = new Stroke(point)
-                        {
-                            DrawingAttributes = blackboard_canvas.DefaultDrawingAttributes.Clone()
-                        };
-                        if (StrokeRectangle != null)
-                        {
-                            viewModel.InkStrokes.Remove(StrokeRectangle);
-                        }
-                        StrokeRectangle = stroke;
-
-                        viewModel.InkStrokes.Add(stroke);
-                    }
-                    // Draw Eclipse
-                    else if (flg == 2)
-                    {
-                        System.Windows.Point endP = e.GetPosition(blackboard_canvas);
-                        List<System.Windows.Point> pointList = GenerateEclipseGeometry(iniP, endP);
-                        StylusPointCollection point = new StylusPointCollection(pointList);
-                        Stroke stroke = new Stroke(point)
-                        {
-                            DrawingAttributes = blackboard_canvas.DefaultDrawingAttributes.Clone()
-                        };
-                        //viewModel.InkStrokes.Clear();
-                        if (StrokeRound != null)
-                        {
-                            viewModel.InkStrokes.Remove(StrokeRound);
-                        }
-                        StrokeRound = stroke;
-                        viewModel.InkStrokes.Add(stroke);
-                    }
-                }
-            }
-        }
-
-        private List<System.Windows.Point> GenerateEclipseGeometry(System.Windows.Point st, System.Windows.Point ed)
-        {
-            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)
-            {
-                pointList.Add(new System.Windows.Point(0.5 * (st.X + ed.X) + a * Math.Cos(r), 0.5 * (st.Y + ed.Y) + b * Math.Sin(r)));
-            }
-            return pointList;
-        }
-
-        /// <summary>
-        /// 鼠标松开时
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void blackboard_canvas_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            StrokeRound = null;
-            StrokeRectangle = null;
-        }
-
-        /// <summary>
-        /// 鼠标右键
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Window_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (APP.W_ScreenRecordingToolbarWindow.flg == 10)
-            {
-                APP.W_ScreenRecordingToolbarWindow.flg = 0;
-            }
-            else
-            {
-                APP.W_ScreenRecordingToolbarWindow.flg = 1;
-            }
-            Hide();
-        }
-
         /// <summary>
         /// 鼠标中键点击
         /// </summary>
@@ -401,19 +271,6 @@ namespace XHWK.WKTool
             }
         }
 
-        private void blackboard_canvas_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (APP.W_ScreenRecordingToolbarWindow.flg == 10)
-            {
-                APP.W_ScreenRecordingToolbarWindow.flg = 0;
-            }
-            else
-            {
-                APP.W_ScreenRecordingToolbarWindow.flg = 1;
-            }
-            Hide();
-        }
-
         private void blackboard_canvas_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
             if (APP.W_ScreenRecordingToolbarWindow.flg == 10)
@@ -424,6 +281,7 @@ namespace XHWK.WKTool
             {
                 APP.W_ScreenRecordingToolbarWindow.flg = 1;
             }
+
             ReturnPractice();
             //模拟切到ppt
             SwitchPages();
@@ -436,20 +294,17 @@ namespace XHWK.WKTool
         public void ReturnPractice()
         {
             blackboard_canvas.Strokes.Clear();
-            new Thread(new ThreadStart(new Action(() =>
+            new Thread(() =>
             {
-                Dispatcher.Invoke(() =>
-                {
-                    APP.W_ScreenRecordingToolbarWindow.ModifyState();
-                });
-                flg = 0;
+                Dispatcher.Invoke(() => { APP.W_ScreenRecordingToolbarWindow.ModifyState(); });
+                _flg = 0;
                 Thread.Sleep(500);
                 Dispatcher.Invoke(() =>
                 {
                     Owner = null;
                     APP.W_PracticeWindow.Hide();
                 });
-            }))).Start();
+            }).Start();
         }
 
         #region 点阵笔相关
@@ -458,291 +313,17 @@ namespace XHWK.WKTool
 
         // 不同尺寸点阵纸点阵宽高尺寸计算方法为：纸张物理尺寸（毫米）/0.3 *8,详见 开发必读.pdf 文档
 
-        /// <summary>
-        /// A4点阵纸点阵宽度
-        /// </summary>
-        private const int A4_WIDTH = 5600;
-
-        /// <summary>
-        /// A4点阵纸点阵高度
-        /// </summary>
-        private const int A4_HEIGHT = 7920;
-
         ///// <summary>
         ///// 画板
         ///// </summary>
         //private Graphics graphics;
 
-        /// <summary>
-        /// 笔画坐标数组
-        /// </summary>
-        private List<System.Drawing.Point> stroke;
-
-        /// <summary>
-        /// 笔序列号
-        /// </summary>
-        private string penSerial;
-
-        /// <summary>
-        /// 笔是否在点
-        /// </summary>
-        private bool isPenDown;
-
         #endregion 值初始化
 
-        /// <summary>
-        /// 落笔
-        /// </summary>
-        /// <param name="time">时间戳，1970年1月1日到现在的总毫秒数</param>
-        /// <param name="penSerial">点阵笔序列号</param>
-        /// <param name="penType">点阵笔型号编号</param>
-        private void OnPenDown(ulong time, string penSerial, int penType)
-        {
-            if (CheckAccess())
-            {
-                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenDown);
-                Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
-            }
-            else
-            {
-                isPenDown = true;
-                APP.W_ScreenRecordingToolbarWindow.PenPractice();
-            }
-        }
-
-        /// <summary>
-        /// 抬笔
-        /// </summary>
-        /// <param name="time">时间戳，1970年1月1日到现在的总毫秒数</param>
-        /// <param name="penSerial">点阵笔序列号</param>
-        /// <param name="penType">点阵笔型号编号</param>
-        private void OnPenUp(ulong time, string penSerial, int penType)
-        {
-            if (CheckAccess())
-            {
-                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenUp);
-                Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
-            }
-            else
-            {
-                isPenDown = false;
-                APP.PenSerial = penSerial;
-
-                stroke.Clear();
-            }
-
-            if (strokes != null && strokes.StylusPoints.Count > 1)
-            {
-                isFirst = true;
-            }
-            stylusPoints = new StylusPointCollection();
-            stylusPoint = new StylusPoint();
-            strokes = null;
-        }
-
-        /// <summary>
-        /// 笔断开
-        /// </summary>
-        /// <param name="time">时间戳，1970年1月1日到现在的总毫秒数</param>
-        /// <param name="penSerial">点阵笔序列号</param>
-        /// <param name="penType">点阵笔型号编号</param>
-        private void OnPenDisconnect(ulong time, string penSerial, int penType)
-        {
-            if (CheckAccess())
-            {
-                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenDisconnect);
-                Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
-            }
-            else
-            {
-                APP.PenSerial = penSerial;
-                APP.PenStatus = false;
-                //UpdateDevStatus();
-                ////Dispatcher.Invoke(new Action(() =>
-                ////{
-                ////    txbNotConnected.Text = "未连接";
-                ////    txbNotConnecteds.Text = "未连接";
-                ////}));
-            }
-        }
-
-        /// <summary>
-        /// 笔连接
-        /// </summary>
-        /// <param name="time">时间戳，1970年1月1日到现在的总毫秒数</param>
-        /// <param name="penSerial">点阵笔序列号</param>
-        /// <param name="penType">点阵笔型号编号</param>
-        private void OnPenConnect(ulong time, string penSerial, int penType)
-        {
-            if (CheckAccess())
-            {
-                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenConnect);
-                Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
-            }
-            else
-            {
-                APP.PenSerial = penSerial;
-                APP.PenStatus = true;
-                this.penSerial = penSerial;
-            }
-        }
-
-        /// <summary>
-        /// 电池电量
-        /// </summary>
-        /// <param name="time"></param>
-        /// <param name="penSerial"></param>
-        /// <param name="penType"></param>
-        /// <param name="capacity"></param>
-        private void OnBatteryCapacity(ulong time, string penSerial, int penType, byte capacity)
-        {
-            if (CheckAccess())
-            {
-                Action<ulong, string, int, byte> action = new Action<ulong, string, int, byte>(OnBatteryCapacity);
-                Dispatcher.Invoke(action, new object[] { time, penSerial, penType, capacity });
-            }
-            else
-            {
-                //System.Windows.MessageWindow.Show("电池电量:" + capacity.ToString());
-            }
-        }
-
-        /// <summary>
-        /// 已用存储
-        /// </summary>
-        /// <param name="time"></param>
-        /// <param name="penSerial"></param>
-        /// <param name="penType"></param>
-        /// <param name="fillLevel"></param>
-        private void OnMemoryFillLevel(ulong time, string penSerial, int penType, byte fillLevel)
-        {
-            if (CheckAccess())
-            {
-                Action<ulong, string, int, byte> action = new Action<ulong, string, int, byte>(OnMemoryFillLevel);
-                Dispatcher.Invoke(action, new object[] { time, penSerial, penType, fillLevel });
-            }
-            else
-            {
-                //System.Windows.MessageWindow.Show("存储:" + fillLevel.ToString());
-            }
-        }
-
-        /// <summary>
-        /// 笔书写，收到坐标
-        /// </summary>
-        /// <param name="time">时间戳，1970年1月1日到现在的总毫秒数</param>
-        /// <param name="penSerial">点阵笔序列号</param>
-        /// <param name="penType">点阵笔型号编号</param>
-        /// <param name="pageSerial">点阵地址</param>
-        /// <param name="cx">x坐标</param>
-        /// <param name="cy">y坐标</param>
-        /// <param name="force">压力值</param>
-        private void OnPenCoordinate(ulong time, string penSerial, int penType, string pageSerial, int cx, int cy, byte force)
-        {
-            if (this.Visibility == Visibility.Visible)
-            {
-                if (CheckAccess())
-                {
-                    Action<ulong, string, int, string, int, int, byte> ac = new Action<ulong, string, int, string, int, int, byte>(OnPenCoordinate);
-                    Dispatcher.Invoke(ac, new object[] { time, pageSerial, penType, pageSerial, cx, cy, force });
-                }
-                else
-                {
-                    //判断是否是落笔后输出的坐标，在设置悬浮模式下，落笔前的悬浮坐标不绘制
-                    if (!isPenDown)
-                    {
-                        return;
-                    }
-                    stroke.Add(new System.Drawing.Point(cx, cy));
-
-                    double PropW = blackboard_canvas.ActualWidth / A4_HEIGHT;
-                    double PropH = blackboard_canvas.ActualHeight / A4_WIDTH;
-                    //点
-                    double testX = cy * PropW;
-                    double testY = (A4_WIDTH - cx) * PropH;
-                    //pageSerial //点阵IP地址  与打印的页面关联
-                    if (true)
-                    {
-                        Dispatcher.Invoke(new Action(() =>
-                        {
-                            float Pressure = force / 100f;
-                            ////添加笔画
-                            //myblackboard.changepages(testX, testY, false, Color, PenSize, APP.pageData.currpage - 1, Pressure);
-
-                            if (isFirst)
-                            {
-                                stylusPoint.X = testX;
-                                stylusPoint.Y = testY;
-                                //_color.A = (byte)(Pressure * 255f);
-                                //stylusPoint.PressureFactor = Pressure;
-
-                                //for(int i=0;i<100;i++)
-                                //{
-                                //    stylusPoint.X--;
-                                //    stylusPoint.Y--;
-                                //    stylusPoints.Add(stylusPoint);
-                                //}
-                                stylusPoints.Add(stylusPoint);
-                                if (stylusPoints.Count > 1)
-                                {
-                                    drawing = new DrawingAttributes
-                                    {
-                                        Color = Colour,
-                                        Width = Wit * 4.5,
-                                        Height = Wit * 4.5,
-                                        FitToCurve = true,
-                                        IgnorePressure = false
-                                    };
-
-                                    //blackboard_canvas.Strokes = new StrokeCollection();
-                                    strokes = new Stroke(stylusPoints);
-
-                                    strokes.DrawingAttributes = drawing;
-                                    //blackboard_canvas.Strokes.Add(strokes);
-
-                                    blackboard_canvas.Strokes.Add(strokes);
-                                    isFirst = false;
-                                }
-                            }
-                            else
-                            {
-                                if (blackboard_canvas.Strokes.Count > 0)
-                                {
-                                    stylusPoint.X = testX;
-                                    stylusPoint.Y = testY;
-                                    stylusPoints.Add(stylusPoint);
-                                    strokes = new Stroke(stylusPoints);
-                                    drawing = new DrawingAttributes
-                                    {
-                                        Color = Colour,
-                                        Width = Wit * 4.5,
-                                        Height = Wit * 4.5,
-                                        FitToCurve = true,
-                                        IgnorePressure = false
-                                    };
-                                    strokes.DrawingAttributes = drawing;
-
-                                    //viewModel.InkStrokes.Add(strokes);
-                                    blackboard_canvas.Strokes[blackboard_canvas.Strokes.Count - 1] = strokes;
-                                }
-                            }
-
-                            //设置鼠标位置
-                            if (testX > 0 && testY > 0)
-                            {
-                                //System.Windows.Point getP = scroMain.PointToScreen(new System.Windows.Point(testX, testY - scroMain.VerticalOffset));
-                                SetCursorPos((int)((float)testX * (PrimaryScreen.DpiX / 96f)), (int)((float)testY * (PrimaryScreen.DpiY / 96f)));
-                            }
-                        }));
-                    }
-                }
-            }
-        }
-
-        private bool isFirst = true;
-        private StylusPointCollection stylusPoints = new StylusPointCollection();
-        private StylusPoint stylusPoint = new StylusPoint();
-        private Stroke strokes;
+        private bool _isFirst = true;
+        private StylusPointCollection _stylusPoints = new StylusPointCollection();
+        private StylusPoint _stylusPoint;
+        private Stroke _strokes;
 
         /// <summary>
         /// 引用user32.dll动态链接库（windows api），
@@ -759,21 +340,21 @@ namespace XHWK.WKTool
         /// <summary>
         /// 是否在书写
         /// </summary>
-        private bool isTQLPenDown = false;
+        private bool _isTqlPenDown;
 
         /// <summary>
         /// TQL点阵笔宽高
         /// </summary>
-        //static float TQLA4_WIDTH = (float)1075 / (float)150 * (float)25.4 / (float)1.524; //OID4
-        //static float TQLA4_HEIGHT = (float)1512 / (float)150 * (float)25.4 / (float)1.524;
-        private static float TQLA4_WIDTH = (float)2480 / (float)300 * (float)25.4 / (float)1.524;
+//static float TQLA4_WIDTH = (float)1075 / (float)150 * (float)25.4 / (float)1.524; //OID4
+//static float TQLA4_HEIGHT = (float)1512 / (float)150 * (float)25.4 / (float)1.524;
+        private const float Tqla4Width = 2480 / (float)300 * (float)25.4 / (float)1.524;
 
-        private static float TQLA4_HEIGHT = (float)3509 / (float)300 * (float)25.4 / (float)1.524;
+        private const float Tqla4Height = 3509 / (float)300 * (float)25.4 / (float)1.524;
 
         /// <summary>
         /// 初始化
         /// </summary>
-        public void InitTQLPPen()
+        public void InitTqlpPen()
         {
             if (APP.TQLPenevents == null)
             {
@@ -788,33 +369,35 @@ namespace XHWK.WKTool
         /// <summary>
         /// 笔落下
         /// </summary>
-        public void TQLDown()
+        public void TqlDown()
         {
-            isTQLPenDown = true;
+            _isTqlPenDown = true;
             APP.W_ScreenRecordingToolbarWindow.PenPractice();
-            if (strokes != null && strokes.StylusPoints.Count > 1)
+            if (_strokes != null && _strokes.StylusPoints.Count > 1)
             {
-                isFirst = true;
+                _isFirst = true;
             }
-            stylusPoints = new StylusPointCollection();
-            stylusPoint = new StylusPoint();
-            strokes = null;
+
+            _stylusPoints = new StylusPointCollection();
+            _stylusPoint = new StylusPoint();
+            _strokes = null;
         }
 
         /// <summary>
         /// 笔抬起
         /// </summary>
-        public void TQLUp()
+        public void TqlUp()
         {
-            isTQLPenDown = false;
+            _isTqlPenDown = false;
 
-            if (strokes != null && strokes.StylusPoints.Count > 1)
+            if (_strokes != null && _strokes.StylusPoints.Count > 1)
             {
-                isFirst = true;
+                _isFirst = true;
             }
-            stylusPoints = new StylusPointCollection();
-            stylusPoint = new StylusPoint();
-            strokes = null;
+
+            _stylusPoints = new StylusPointCollection();
+            _stylusPoint = new StylusPoint();
+            _strokes = null;
         }
 
         /// <summary>
@@ -823,69 +406,69 @@ namespace XHWK.WKTool
         /// <param name="cx"></param>
         /// <param name="cy"></param>
         /// <param name="force"></param>
-        public void TQLPenWrite(double cx, double cy, int force)
+        public void TqlPenWrite(double cx, double cy, int force)
         {
             if (this.Visibility == Visibility.Visible)
             {
                 //判断是否是落笔后输出的坐标，在设置悬浮模式下，落笔前的悬浮坐标不绘制
-                if (!isTQLPenDown)
+                if (!_isTqlPenDown)
                 {
                     return;
                 }
-                double PropW = blackboard_canvas.ActualWidth / TQLA4_HEIGHT;
-                double PropH = blackboard_canvas.ActualHeight / TQLA4_WIDTH;
 
-                double tempX = cy * PropW;
-                double tempY = (TQLA4_WIDTH - cx) * PropH;
-                Dispatcher.Invoke(new Action(() =>
+                double propW = blackboard_canvas.ActualWidth / Tqla4Height;
+                double propH = blackboard_canvas.ActualHeight / Tqla4Width;
+
+                double tempX = cy * propW;
+                double tempY = (Tqla4Width - cx) * propH;
+                Dispatcher.Invoke(() =>
                 {
                     //0~1023,亦即有 1024 阶供应用软件后续应用之用，如笔锋笔触，暂无用
-                    float Pressure = (float)force / 1023f;
                     //添加笔画
-                    if (isFirst)
+                    if (_isFirst)
                     {
-                        stylusPoint.X = tempX;
-                        stylusPoint.Y = tempY;
-                        stylusPoints.Add(stylusPoint);
-                        if (stylusPoints.Count > 1)
+                        _stylusPoint.X = tempX;
+                        _stylusPoint.Y = tempY;
+                        _stylusPoints.Add(_stylusPoint);
+                        if (_stylusPoints.Count > 1)
                         {
-                            drawing = new DrawingAttributes
+                            _drawing = new DrawingAttributes
                             {
-                                Color = Colour,
-                                Width = Wit * 4.5,
-                                Height = Wit * 4.5,
+                                Color = _colour,
+                                Width = _wit * 4.5,
+                                Height = _wit * 4.5,
                                 FitToCurve = true,
                                 IgnorePressure = false
                             };
 
-                            strokes = new Stroke(stylusPoints);
+                            _strokes = new Stroke(_stylusPoints);
 
-                            strokes.DrawingAttributes = drawing;
+                            _strokes.DrawingAttributes = _drawing;
 
-                            blackboard_canvas.Strokes.Add(strokes);
-                            isFirst = false;
+                            blackboard_canvas.Strokes.Add(_strokes);
+                            _isFirst = false;
                         }
                     }
                     else
                     {
                         if (blackboard_canvas.Strokes.Count > 0)
                         {
-                            stylusPoint.X = tempX;
-                            stylusPoint.Y = tempY;
-                            stylusPoints.Add(stylusPoint);
-                            strokes = new Stroke(stylusPoints);
-                            drawing = new DrawingAttributes
+                            _stylusPoint.X = tempX;
+                            _stylusPoint.Y = tempY;
+                            _stylusPoints.Add(_stylusPoint);
+                            _strokes = new Stroke(_stylusPoints);
+                            _drawing = new DrawingAttributes
                             {
-                                Color = Colour,
-                                Width = Wit * 4.5,
-                                Height = Wit * 4.5,
+                                Color = _colour,
+                                Width = _wit * 4.5,
+                                Height = _wit * 4.5,
                                 FitToCurve = true,
                                 IgnorePressure = false
                             };
-                            strokes.DrawingAttributes = drawing;
+                            _strokes.DrawingAttributes = _drawing;
 
                             //viewModel.InkStrokes.Add(strokes);
-                            blackboard_canvas.Strokes[blackboard_canvas.Strokes.Count - 1] = strokes;
+                            blackboard_canvas.Strokes[blackboard_canvas.Strokes.Count - 1] = _strokes;
                         }
                     }
 
@@ -893,9 +476,10 @@ namespace XHWK.WKTool
                     if (tempX > 0 && tempY > 0)
                     {
                         //System.Windows.Point getP = scroMain.PointToScreen(new System.Windows.Point(testX, testY - scroMain.VerticalOffset));
-                        SetCursorPos((int)((float)tempX * (PrimaryScreen.DpiX / 96f)), (int)((float)tempY * (PrimaryScreen.DpiY / 96f)));
+                        SetCursorPos((int)((float)tempX * (PrimaryScreen.DpiX / 96f)),
+                            (int)((float)tempY * (PrimaryScreen.DpiY / 96f)));
                     }
-                }));
+                });
             }
         }
 

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -39,7 +39,6 @@
                     x:Name="BtnRecordingScreen"
                     Click="BtnRecordingScreen_Click"
                     Cursor="Hand"
-                    
                     ToolTip="开始"
                     Visibility="Visible">
                     <Button.Template>
@@ -63,7 +62,6 @@
                     x:Name="BtnRecordingScreenPause"
                     Click="BtnRecordingScreen_Click"
                     Cursor="Hand"
-                    
                     ToolTip="暂停"
                     Visibility="Collapsed">
                     <Button.Template>
@@ -110,7 +108,6 @@
                         x:Name="BtnStopRecordingScreen"
                         Click="BtnStopRecordingScreen_Click"
                         Cursor="Hand"
-                        
                         ToolTip="停止">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
@@ -178,7 +175,6 @@
                         x:Name="BtnPenBlue"
                         Click="BtnBrush_Click"
                         Cursor="Hand"
-                        
                         ToolTip="蓝笔">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
@@ -199,8 +195,7 @@
                         x:Name="BtnPenBlue_CL"
                         Click="BtnBrush_Click"
                         Cursor="Hand"
-                        
-                        ToolTip="批注"
+                        ToolTip="蓝笔"
                         Visibility="Collapsed">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
@@ -215,8 +210,7 @@
                         x:Name="BtnPenRed"
                         Click="BtnBlackPenTwo_Click"
                         Cursor="Hand"
-                        
-                        ToolTip="批注">
+                        ToolTip="红笔">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Image x:Name="BtnImages" Source="/SkinImages/SR/SR_PenRed.png" />
@@ -236,7 +230,6 @@
                         x:Name="BtnPenRed_CL"
                         Click="BtnBlackPenTwo_Click"
                         Cursor="Hand"
-                        
                         ToolTip="批注"
                         Visibility="Collapsed">
                         <Button.Template>
@@ -265,7 +258,6 @@
                         x:Name="BtnReturn"
                         Click="BtnReturn_Click"
                         Cursor="Hand"
-                        
                         ToolTip="返回">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -113,15 +113,12 @@ namespace XHWK.WKTool
                 //practiceWin.Owner = this;
             }
 
-            APP.W_PracticeWindow.InitTQLPPen();
+            APP.W_PracticeWindow.InitTqlpPen();
             APP.W_PracticeWindow.Show();
             new Thread(new ThreadStart(new Action(() =>
             {
                 Thread.Sleep(100);
-                Dispatcher.Invoke(() =>
-                {
-                    Topmost = true;
-                });
+                Dispatcher.Invoke(() => { Topmost = true; });
             }))).Start();
             APP.W_PracticeWindow.Hide();
 
@@ -140,8 +137,8 @@ namespace XHWK.WKTool
             BtnRecordingScreen.Visibility = Visibility.Visible;
             BtnRecordingScreenPause.Visibility = Visibility.Collapsed;
             BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
-            BtnPenBlue.IsEnabled = false;//蓝笔不可点击
-            BtnPenRed.IsEnabled = false;//红笔不可点击
+            BtnPenBlue.IsEnabled = false; //蓝笔不可点击
+            BtnPenRed.IsEnabled = false; //红笔不可点击
             BtnPenBlue.Visibility = Visibility.Visible;
             BtnPenRed.Visibility = Visibility.Visible;
             BtnPenBlue_CL.Visibility = Visibility.Collapsed;
@@ -156,6 +153,7 @@ namespace XHWK.WKTool
                 //开始，暂停
                 BtnRecordingScreen_Click(null, null);
             }
+
             if (e.KeyValue == (int)Keys.F6 && (int)Control.ModifierKeys == (int)Keys.Control)
             {
                 //结束
@@ -232,7 +230,7 @@ namespace XHWK.WKTool
         //桌面录制
         private ZVideoRecordHelper helper0 = null;
 
-        public IntPtr winHandle;// 当前窗体指针
+        public IntPtr winHandle; // 当前窗体指针
 
         /// <summary>
         /// 开始或暂停录制
@@ -295,18 +293,19 @@ namespace XHWK.WKTool
                 {
                     APP.W_CountdownWindow.Initialize(true, 3000);
                 }
+
                 APP.W_CountdownWindow.Show();
 
                 BtnRecordingScreen.Visibility = Visibility.Collapsed;
                 BtnRecordingScreenPause.Visibility = Visibility.Visible;
                 BtnStopRecordingScreen.IsEnabled = true; //停止录制按钮可点击
-                BtnPenBlue.IsEnabled = true;//蓝笔可点击
-                BtnPenRed.IsEnabled = true;//红笔可点击
+                BtnPenBlue.IsEnabled = true; //蓝笔可点击
+                BtnPenRed.IsEnabled = true; //红笔可点击
                 BtnPenBlue.Visibility = Visibility.Visible;
                 BtnPenRed.Visibility = Visibility.Visible;
                 BtnPenBlue_CL.Visibility = Visibility.Collapsed;
                 BtnPenRed_CL.Visibility = Visibility.Collapsed;
-                TxbTime.Visibility = Visibility.Visible;//时间显示
+                TxbTime.Visibility = Visibility.Visible; //时间显示
 
                 #region 隐藏工具栏
 
@@ -316,6 +315,7 @@ namespace XHWK.WKTool
                     {
                         APP.W_MinToolbar = new MinToolbar();
                     }
+
                     APP.W_MinToolbar.Topmost = true;
                     double MinToolTop = Top;
                     GridSrToobar.Visibility = Visibility.Hidden;
@@ -347,7 +347,7 @@ namespace XHWK.WKTool
                     helper1.StartRecordAudio();
                     helper2.StartRecordAudio();
                     helper0.StartRecordVideo();
-                    k_hook.Start();//安装键盘钩子
+                    k_hook.Start(); //安装键盘钩子
                 }
                 catch (Exception)
                 {
@@ -397,6 +397,7 @@ namespace XHWK.WKTool
             {
                 APP.W_XHMicroLessonSystemWindow = new MainWindow();
             }
+
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
 
             APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
@@ -407,6 +408,7 @@ namespace XHWK.WKTool
                 t.Stop();
                 t = null;
             }
+
             helper0.StopRecordVideo();
             helper1.StopRecordAudio();
             helper2.StopRecordAudio();
@@ -457,6 +459,7 @@ namespace XHWK.WKTool
             {
                 APP.W_XHMicroLessonSystemWindow = new MainWindow();
             }
+
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
 
             APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
@@ -476,7 +479,8 @@ namespace XHWK.WKTool
                 {
                     FFMpegConverter ffMpeg = new FFMpegConverter();
 
-                    FFMpegInput[] input = new FFMpegInput[] {
+                    FFMpegInput[] input = new FFMpegInput[]
+                    {
                         new FFMpegInput(TempVideoPathName),
                         new FFMpegInput(TempAudioPathName1),
                         new FFMpegInput(TempAudioPathName2),
@@ -498,7 +502,9 @@ 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";
 
                         VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                         VideoInfo.VideoPath = VideoSavePathName;
@@ -507,7 +513,8 @@ namespace XHWK.WKTool
                         VideoInfo.FileGuid = Guid.NewGuid().ToString();
                         VideoInfo.IsUpload = false;
                         VideoInfo.Uploaded = 0;
-                        if (!APP.VideoList.Exists(x => x.FileGuid == VideoInfo.FileGuid) || !APP.VideoList.Exists(x => x.VideoPath == VideoInfo.VideoPath))
+                        if (!APP.VideoList.Exists(x => x.FileGuid == VideoInfo.FileGuid) ||
+                            !APP.VideoList.Exists(x => x.VideoPath == VideoInfo.VideoPath))
                         {
                             APP.VideoList.Add(VideoInfo);
                             //保存数据
@@ -522,6 +529,7 @@ namespace XHWK.WKTool
                     FileToolsCommon.DeleteDirectory(temppath);
                 }))).Start();
             }
+
             Click_stopRecordingScreen();
             Hide();
 
@@ -534,7 +542,8 @@ namespace XHWK.WKTool
             Graphics graphics = Graphics.FromHwnd(IntPtr.Zero);
             float DIP = graphics.DpiX;
             //float DIPY = graphics.DpiY;
-            APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width;
+            APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) -
+                                                      APP.W_ScreenRecordingToolbarWindow.Width;
             GridSrToobar.Visibility = Visibility.Visible;
             APP.W_ScreenRecordingToolbarWindow.Topmost = true;
         }
@@ -585,7 +594,7 @@ namespace XHWK.WKTool
                             };
                         }
 
-                        APP.W_PracticeWindow.Initialize();// imagePath);
+                        APP.W_PracticeWindow.Initialize(); // imagePath);
                         flg = 11;
                         APP.W_PracticeWindow.Blue();
                         APP.W_PracticeWindow.Show();
@@ -595,15 +604,9 @@ namespace XHWK.WKTool
 
                     new Thread(new ThreadStart(new Action(() =>
                     {
-                        Dispatcher.Invoke(() =>
-                        {
-                            APP.W_PracticeWindow.Topmost = false;
-                        });
+                        Dispatcher.Invoke(() => { APP.W_PracticeWindow.Topmost = false; });
                         Thread.Sleep(500);
-                        Dispatcher.Invoke(() =>
-                        {
-                            Topmost = true;
-                        });
+                        Dispatcher.Invoke(() => { Topmost = true; });
                     }))).Start();
                 }
                 catch (Exception ex)
@@ -696,8 +699,8 @@ namespace XHWK.WKTool
                         //practiceWin.Owner = this;
                     }
 
-                    APP.W_PracticeWindow.InitTQLPPen();
-                    APP.W_PracticeWindow.Initialize();// imagePath);
+                    APP.W_PracticeWindow.InitTqlpPen();
+                    APP.W_PracticeWindow.Initialize(); // imagePath);
                     flg = 11;
                     APP.W_PracticeWindow.Blue();
                     APP.W_PracticeWindow.Show();
@@ -740,46 +743,6 @@ namespace XHWK.WKTool
             return Convert.ToInt64(ts.TotalMilliseconds).ToString();
         }
 
-        /// <summary>
-        /// 橡皮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnEraser_Click(object sender, RoutedEventArgs e)
-        {
-            APP.W_PracticeWindow.Eraser();
-        }
-
-        /// <summary>
-        /// 🖊
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnPen_Click(object sender, RoutedEventArgs e)
-        {
-            APP.W_PracticeWindow.Pen();
-        }
-
-        /// <summary>
-        /// ⚪
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnRound_Click(object sender, RoutedEventArgs e)
-        {
-            APP.W_PracticeWindow.Round();
-        }
-
-        /// <summary>
-        /// 矩形
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnRectangle_Click(object sender, RoutedEventArgs e)
-        {
-            APP.W_PracticeWindow.Rectangle();
-        }
-
         #endregion 画笔相关
 
         #endregion 事件
@@ -872,8 +835,8 @@ namespace XHWK.WKTool
                         };
                     }
 
-                    APP.W_PracticeWindow.InitTQLPPen();
-                    APP.W_PracticeWindow.Initialize();//imagePath);
+                    APP.W_PracticeWindow.InitTqlpPen();
+                    APP.W_PracticeWindow.Initialize(); //imagePath);
                     flg = 10;
                     APP.W_PracticeWindow.Red();
                     APP.W_PracticeWindow.Show();
@@ -909,8 +872,10 @@ namespace XHWK.WKTool
                 {
                     return;
                 }
+
                 BtnStopRecordingScreen_Click(null, null);
             }
+
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
             //APP.W_XHMicroLessonSystemWindow.InitPen();
             APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
@@ -952,6 +917,7 @@ namespace XHWK.WKTool
                     {
                         APP.W_MinToolbar = new MinToolbar();
                     }
+
                     APP.W_MinToolbar.Topmost = true;
                     double MinToolTop = Top;
 
@@ -961,7 +927,8 @@ namespace XHWK.WKTool
                         Dispatcher.Invoke(() =>
                         {
                             MouseEventCommon.GetCursorPos(out MouseEventCommon.POINT pointRecord);
-                            if (pointRecord.X >= this.Left && pointRecord.X < this.Left + this.ActualWidth && pointRecord.Y >= this.Top && pointRecord.Y < this.Top + this.ActualHeight)
+                            if (pointRecord.X >= this.Left && pointRecord.X < this.Left + this.ActualWidth &&
+                                pointRecord.Y >= this.Top && pointRecord.Y < this.Top + this.ActualHeight)
                             {
                                 //LblMessage.Content = "在区域内：("+ pointRecord.X+","+pointRecord.Y+") ("+ Left + ","+Top+")";
                             }

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -326,7 +326,7 @@ namespace XHWK.WKTool.UControl
                 //BtnUpload.IsEnabled = false;
                 //BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
                 //BtnUpload.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#999999"));
-                DAL_Upload dAL_Upload = new DAL_Upload();
+                DalUpload dAL_Upload = new DalUpload();
 
                 if (dAL_Upload.UploadVideo(VideoModel.FileGuid, out string ErrMessage))
                 {

XHWK.WKTool/UploadWindow.xaml.cs

@@ -280,7 +280,7 @@ namespace XHWK.WKTool
         {
             try
             {
-                DAL_Upload dAL_Upload = new DAL_Upload();
+                DalUpload dAL_Upload = new DalUpload();
                 if (dAL_Upload.UploadVideoTwo(Guid, out string ErrMessage))
                 {
                     //        converted: 0

XHWK.WKTool/Utils/ZAudioRecordHelper.cs

@@ -155,10 +155,7 @@ namespace XHWK.WKTool.Utils
                     mWaveIn = new WaveInEvent();
                     mWriter = new WaveFileWriter(mAudioFile, mWaveIn.WaveFormat);
                     //开始录音，写数据
-                    mWaveIn.DataAvailable += (s, a) =>
-                    {
-                        mWriter.Write(a.Buffer, 0, a.BytesRecorded);
-                    };
+                    mWaveIn.DataAvailable += (s, a) => { mWriter.Write(a.Buffer, 0, a.BytesRecorded); };
 
                     //结束录音
                     mWaveIn.RecordingStopped += (s, a) =>
@@ -187,10 +184,7 @@ namespace XHWK.WKTool.Utils
                     mCapture = new WasapiLoopbackCapture();
                     mWriter = new WaveFileWriter(mAudioFile, mCapture.WaveFormat);
 
-                    mCapture.DataAvailable += (s, a) =>
-                    {
-                        mWriter.Write(a.Buffer, 0, a.BytesRecorded);
-                    };
+                    mCapture.DataAvailable += (s, a) => { mWriter.Write(a.Buffer, 0, a.BytesRecorded); };
                     //结束录音
                     mCapture.RecordingStopped += (s, a) =>
                     {
@@ -211,13 +205,14 @@ namespace XHWK.WKTool.Utils
                     });
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 if (mWriter != null)
                 {
                     mWriter.Dispose();
                     mWriter = null;
                 }
+
                 return false;
             }
 

XHWK.WKTool/Utils/ZVideoRecordHelper.cs

@@ -58,11 +58,11 @@ namespace XHWK.WKTool.Utils
                 }
 
                 System.Drawing.Rectangle rec = new System.Drawing.Rectangle(0, 0, _width, _height);
-                videoStreamer = new ScreenCaptureStream(rec, 1000 / _rate);//帧间隔需要和帧率关联，不然录的10秒视频文件不是10s
+                videoStreamer = new ScreenCaptureStream(rec, 1000 / _rate); //帧间隔需要和帧率关联，不然录的10秒视频文件不是10s
                 videoStreamer.NewFrame += VideoNewFrame;
                 videoStreamer.Start();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
             }
         }

XHWK.WKTool/Utils/pen/TQLPen/PenEvents.cs

@@ -354,17 +354,17 @@ namespace XHWK.WKTool
                 }
                 else if (dot.type == DotType.PEN_DOWN)
                 {
-                    APP.W_PracticeWindow.TQLDown();
+                    APP.W_PracticeWindow.TqlDown();
                 }
                 else if (dot.type == DotType.PEN_UP)
                 {
-                    APP.W_PracticeWindow.TQLUp();
+                    APP.W_PracticeWindow.TqlUp();
                 }
                 else if (dot.type == DotType.PEN_MOVE)
                 {
                     double CX = (double)dot.x + (double)dot.fx / 100.00;
                     double CY = (double)dot.y + (double)dot.fy / 100.00;
-                    APP.W_PracticeWindow.TQLPenWrite(CX, CY, dot.force);
+                    APP.W_PracticeWindow.TqlPenWrite(CX, CY, dot.force);
                     //form.AddLog("x:" + (dot.x + dot.fx / 100f).ToString() + ", " + "y:" + (dot.y + dot.fy / 100f).ToString());
                 }
             }
@@ -376,7 +376,6 @@ namespace XHWK.WKTool
             //}
 
 
-
             //if (dot.type == DotType.PEN_HOVER) return;
             //if (this.S != dot.sectionId || this.O != dot.ownerId || this.B != dot.noteId || this.P != dot.pageId)
             //{