打印变更

UI优化

XHWK.WKTool/App.cs

@@ -24,167 +24,210 @@ namespace XHWK.WKTool
     public partial class APP : Application
     {
         #region 全局变量
+
         #region 更新需改动
+
         /// <summary>
         /// 是否为测试版
         /// </summary>
         public static bool isDebug = FileToolsCommon.GetConfigValue("IsDebug") != "0";
+
         /// <summary>
         /// 参数是否加密
         /// </summary>
         public static bool IsParameterEncryption = FileToolsCommon.GetConfigValue("IsParameterEncryption") != "0";
-        #endregion
+
+        #endregion 更新需改动
 
         #region 接口地址
+
         /// <summary>
         /// 是否为校外接口
         /// </summary>
         public static bool IsOutsideSchool = FileToolsCommon.GetConfigValue("IsOutsideSchool") == "1";
+
         /// <summary>
         /// 服务地址
         /// </summary>
         public static Model_ServiceAddress ServiceAddress = null;
+
         /// <summary>
         /// 接口地址
         /// </summary>
         public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("APIRequestAddress");
+
         /// <summary>
         /// 图片地址
         /// </summary>
         public static string uploadUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/" : FileToolsCommon.GetConfigValue("FileRequestAddress");
+
         /// <summary>
         /// 展示文件
         /// </summary>
         public static string showImageUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/static/" : FileToolsCommon.GetConfigValue("SchoolfileRequestAddress") + "/static/";
+
         /// <summary>
         /// 认证接口地址
         /// </summary>
         public static string certapiUrl = isDebug ? "http://certapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("CertapiRequestAddress");
-        #endregion
+
+        #endregion 接口地址
 
         #region 配置项
+
         /// <summary>
         /// 是否输出测试记录日志
         /// </summary>
         public static bool IsOutputInfoLog = FileToolsCommon.GetConfigValue("IsOutputInfoLog") != "0";
+
         /// <summary>
         /// 是否隐藏录屏工具栏
         /// </summary>
         public static bool IsHideSRTool = FileToolsCommon.GetConfigValue("IsHideSRTool") != "0";
+
         /// <summary>
         /// 皮肤样式 0白 1蓝 2黑色
         /// </summary>
         public static string SkinStyle = FileToolsCommon.GetConfigValue("SkinStyle");
+
         /// <summary>
         /// 数据存放目录
         /// </summary>
         public static string DataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\XHMicroLesson\\";
+
         /// <summary>
         /// 摄像头位置
         /// </summary>
         public static string CameraPosition = string.Empty;
+
         /// <summary>
         /// 摄像头名
         /// </summary>
         public static string CameraName = "";
+
         /// <summary>
         /// 麦克风名
         /// </summary>
         public static string MicrophoneName = "";
-        #endregion
+
+        #endregion 配置项
 
         #region 记录数据
+
         /// <summary>
         /// 全局页面数据变量
         /// </summary>
         public static readonly Model_Page PageContextData = new Model.Model_Page();
+
         /// <summary>
         /// 录屏工具
         /// </summary>
         public static FFMpeg FFmpeg = new FFMpeg();
+
         /// <summary>
         /// 后台线程帮助类
         /// </summary>
         public static BackgroundWorkerHelper BackgroundWorkerHelper => BackgroundWorkerHelper.GetInstance();
+
         /// <summary>
         /// 签名
         /// </summary>
         public static string Signature = "";
+
         public static string secretKey = "nanhuakaizhangjianwangni";
+
         /// <summary>
         /// 用户信息
         /// </summary>
         public static Model_UserInfo UserInfo = null;
+
         /// <summary>
         /// 接口返回消息
         /// </summary>
         public static string ServerMsg = string.Empty;
+
         /// <summary>
         /// 登录状态 false 未登录 true已登录
         /// </summary>
         public static bool IsLoginType = false;
+
         /// <summary>
         /// 截图地址
         /// </summary>
         public static string ImgPath = string.Empty;
+
         /// <summary>
         /// 教材列表
         /// </summary>
         public static List<Model_TsubjectbookList> TsubjectbookList = null;
+
         /// <summary>
         /// 章节列表
         /// </summary>
         public static List<Model_DirectorList> DirectorList = null;
+
         /// <summary>
         /// 上传个人空间 入参
         /// </summary>
         public static Model_ResourceAddTwo ResourceAddTwo = null;
+
         /// <summary>
         /// 是否正在上传
         /// </summary>
         public static bool IsUpLoad = false;
-        #endregion
+
+        #endregion 记录数据
 
         #region 微课数据记录
+
         /// <summary>
         /// 用户微课列表模型
         /// </summary>
         public static List<Model_WKData> WKDataList = null;
+
         /// <summary>
         /// 微课模型
         /// </summary>
         public static Model_WKData WKData = null;
+
         /// <summary>
         /// 微课视频列表
         /// </summary>
         public static List<Model_Video> VideoList = null;
+
         /// <summary>
         /// 画板模型
         /// </summary>
         public static List<Model_DrawData> PageDrawList = null;
 
-        #endregion
+        #endregion 微课数据记录
 
         #region 点阵笔
+
         /// <summary>
         /// 点阵笔
         /// </summary>
         public static DigitalPenHID digitalPen;
+
         /// <summary>
         /// 笔序号
         /// </summary>
         public static string PenSerial;
+
         /// <summary>
         /// 笔状态，是否已连接
         /// </summary>
         public static bool PenStatus = false;
+
         /// <summary>
         /// 手写板状态，是否已连接
         /// </summary>
         public static bool BoardStatus = false;
-        #endregion
+
+        #endregion 点阵笔
 
         #region 腾千里手写笔
+
         ///// <summary>
         ///// 铺码服务请求
         ///// </summary>
@@ -193,89 +236,99 @@ namespace XHWK.WKTool
         /// 腾千里手写笔事件
         /// </summary>
         public static PenEvents TQLPenevents;
+
         /// <summary>
         /// 腾千里手写笔是否已连接
         /// </summary>
         public static bool TQLPenStatus = false;
 
         #region 打印
+
         public static bool gbGenerateBGWithVImage = false;
         public static bool gbGenerateVImage = false;
         public static bool gbGenerateBGWithoutVImage = false;
         public static bool gbGenerateBGWithImage = false;
         public static bool gbGenPageSet = false;
-        public static int[] gPointType = new int[4];
-        public static int[] gPointDPI = new int[4];
+        public static int[] gPointType = new int[5];
+        public static int[] gPointDPI = new int[5];
         public static string gTMXElementFileName;
         public static string gNewProjectDirectory;
         public static bool gbElementFileExist { get; set; }
-        #endregion
 
-        #endregion
+        #endregion 打印
+
+        #endregion 腾千里手写笔
 
         #region 页面
+
         /// <summary>
         /// 主页面
         /// </summary>
         public static XHMicroLessonSystemWindow W_XHMicroLessonSystemWindow = null;
+
         /// <summary>
         /// 创建微课页面
         /// </summary>
         public static CreateAMicroLessonWindow W_CreateAMicroLessonWindow = null;
+
         /// <summary>
         /// 开始录像
         /// </summary>
         public static CountdownWindow W_CountdownWindow = null;
+
         /// <summary>
         /// 录像工具栏
         /// </summary>
         public static ScreenRecordingToolbarWindow W_ScreenRecordingToolbarWindow = null;
+
         /// <summary>
         /// 登录
         /// </summary>
         public static LoginWindow W_LoginWindow = null;
+
         /// <summary>
         /// 截图
         /// </summary>
         public static JieTuWindow W_JieTuWindow = null;
+
         /// <summary>
         /// 批注
         /// </summary>
         public static PracticeWindow W_PracticeWindow = null;
-        /// <summary>
-        /// 我的视频
-        /// </summary>
-        public static FileDirectoryWindow fileDirectoryWindow = null;
-        /// <summary>
-        /// 打印
-        /// </summary>
-        public static PrintWindow W_PrintWindow = null;
+
         /// <summary>
         /// 提示窗口
         /// </summary>
         public static PromptWindow W_PromptWindow = null;
+
         /// <summary>
         /// loding页面
         /// </summary>
         public static LoadDialog myloading;
+
         /// <summary>
         /// 上传页面
         /// </summary>
         public static UploadWindow W_UploadWindow = null;
+
         /// <summary>
         /// 最小化工具栏
         /// </summary>
         public static MinToolbar W_MinToolbar = null;
+
         /// <summary>
         /// 视频剪辑
         /// </summary>
         public static VideoClipWindow W_VideoClipWindow = null;
+
         /// <summary>
         /// 设备检测
         /// </summary>
         public static DeviceWindow W_DeviceWindow = null;
-        #endregion
-        #endregion
+
+        #endregion 页面
+
+        #endregion 全局变量
 
         [STAThread]
         private static void Main()
@@ -290,7 +343,9 @@ namespace XHWK.WKTool
                 UserInfo = new Model_UserInfo();
                 WKDataList = new List<Model_WKData>();
                 VideoList = new List<Model_Video>();
+
                 #region 强制以管理员方式运行 修改人：赵耀 修改时间：2020年9月7日
+
                 WindowsIdentity identity = WindowsIdentity.GetCurrent();
                 WindowsPrincipal principal = new WindowsPrincipal(identity);
                 //判断当前登录用户是否为管理员
@@ -327,7 +382,9 @@ namespace XHWK.WKTool
                 //    Environment.Exit(0);
 
                 //}
-                #endregion
+
+                #endregion 强制以管理员方式运行 修改人：赵耀 修改时间：2020年9月7日
+
                 try
                 {
                     if (Directory.Exists(AppDomain.CurrentDomain.BaseDirectory + "Temp"))//清除临时文件
@@ -374,7 +431,6 @@ namespace XHWK.WKTool
                         //退出
                         //Current.Shutdown();
                         Environment.Exit(0);
-
                     }
                 }
                 else
@@ -408,20 +464,18 @@ namespace XHWK.WKTool
                         //退出
                         //Current.Shutdown();
                         Environment.Exit(0);
-
                     }
-
                 }
             }
             catch (Exception ex)
             {
-
                 string ErrMessage = "【进程】(Main):进程意外关闭。 " + ex.Message;
                 LogHelper.WriteErrLog(ErrMessage, ex);
             }
         }
 
         #region 杀死已存在的进程
+
         /// <summary>
         /// 结束已运行的程序
         /// </summary>
@@ -446,6 +500,7 @@ namespace XHWK.WKTool
                 }
             }
         }
+
         /// <summary>
         /// 杀死正在运行的ffmpeg
         /// </summary>
@@ -457,7 +512,8 @@ namespace XHWK.WKTool
                 KillProcess.Kill();
             }
         }
-        #endregion
+
+        #endregion 杀死已存在的进程
 
         /// <summary>
         /// 错误处理
@@ -472,6 +528,7 @@ namespace XHWK.WKTool
         }
 
         #region 数据保存和读取
+
         /// <summary>
         /// 保存微课信息
         /// </summary>
@@ -503,8 +560,9 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【微课数据保存】（SaveWkData）保存失败：" + ex.Message, ex);
             }
         }
+
         /// <summary>
-        /// 读取微课信息 
+        /// 读取微课信息
         /// </summary>
         public static void ReadWkData(string WkPath)
         {
@@ -540,6 +598,7 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【微课数据读取】（ReadWkData）读取失败：" + ex.Message, ex);
             }
         }
+
         /// <summary>
         /// 保存画板数据
         /// </summary>
@@ -566,6 +625,7 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【画板数据保存】（SaveDraw）保存失败：" + ex.Message, ex);
             }
         }
+
         /// <summary>
         /// 读取文件
         /// </summary>
@@ -586,9 +646,11 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【画板数据读取】(ReadDraw)读取失败：" + ex.Message, ex);
             }
         }
-        #endregion
+
+        #endregion 数据保存和读取
 
         #region 服务地址数据
+
         /// <summary>
         /// 服务地址存储到本地
         /// </summary>
@@ -612,6 +674,7 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【服务地址存储】（SaveServiceAddressData）保存失败：" + ex.Message, ex);
             }
         }
+
         /// <summary>
         /// 从本地读取服务地址
         /// </summary>
@@ -635,6 +698,7 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【服务地址读取】（ReadServiceAddressData）读取失败：" + ex.Message, ex);
             }
         }
+
         /// <summary>
         /// 切换校内外网
         /// </summary>
@@ -651,9 +715,11 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【服务地址切换】（SwitchAddress）服务复制切换失败，请求地址为空！", ex);
             }
         }
-        #endregion
+
+        #endregion 服务地址数据
 
         #region 检测安装Screen Capturer Recorder
+
         /// <summary>
         /// 检测是否安装了Screen Capturer Recorder
         /// </summary>
@@ -670,6 +736,7 @@ namespace XHWK.WKTool
                 return false;
             }
         }
+
         /// <summary>
         /// 安装Screen Capturer Recorder
         /// </summary>
@@ -727,6 +794,7 @@ namespace XHWK.WKTool
                 return false;
             }
         }
+
         /// <summary>
         /// 安装失败信息
         /// </summary>
@@ -738,7 +806,7 @@ namespace XHWK.WKTool
             //MessageWindow.Show(e.Data);
         }
 
-        #endregion
+        #endregion 检测安装Screen Capturer Recorder
 
         #region 内存处理 -创建人：赵耀 -创建时间：2020年8月12日
 

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -11,6 +11,7 @@ using System.Windows.Media;
 
 using XHWK.Model;
 using XHWK.WKTool.DAL;
+using XHWK.WKTool.Models;
 
 namespace XHWK.WKTool
 {
@@ -23,18 +24,22 @@ namespace XHWK.WKTool
         /// 视频模型
         /// </summary>
         private List<Model_Video> model_VideoList = null;
+
         /// <summary>
         /// 数据列表
         /// </summary>
         internal FileDirectoryData pageData = new FileDirectoryData();
+
         /// <summary>
         /// 下标
         /// </summary>
         private int Subscript = 0;
+
         /// <summary>
         /// 是否是修改状态
         /// </summary>
         private bool IsModify = false;
+
         /// <summary>
         /// 文件目录
         /// </summary>
@@ -43,6 +48,7 @@ namespace XHWK.WKTool
             InitializeComponent();
             Initialize();
         }
+
         /// <summary>
         /// 初始化
         /// </summary>
@@ -111,14 +117,13 @@ namespace XHWK.WKTool
                     }); ;
                 }
 
-
-
                 i++;
             }
             txbSum.Text = pageData.menuList.Count.ToString();
             APP.myloading.Hide();
             DataContext = pageData;
         }
+
         /// <summary>
         /// 加载视频列表
         /// </summary>
@@ -161,6 +166,7 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【加载视频列表】（LoadingVideoList）" + ex.Message, ex);
             }
         }
+
         /// <summary>
         /// 关闭
         /// </summary>
@@ -171,6 +177,7 @@ namespace XHWK.WKTool
             APP.SaveWkData();
             Hide();
         }
+
         /// <summary>
         /// 窗口移动
         /// </summary>
@@ -180,6 +187,7 @@ namespace XHWK.WKTool
         {
             DragMove();
         }
+
         /// <summary>
         /// 上传
         /// </summary>
@@ -208,11 +216,10 @@ namespace XHWK.WKTool
                     {
                         MessageWindow.Show(ErrMessage);
                     }
-
-
                 }
             }
         }
+
         /// <summary>
         /// 删除
         /// </summary>
@@ -220,14 +227,12 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnDelete_Click(object sender, RoutedEventArgs e)
         {
-
             pageData.menuList[Subscript].IsEnabled = false;
             List<Button> buttons = FindChilds<Button>(listView1, "btnDelete");
             for (int i = 0; i < buttons.Count; i++)
             {
                 if (buttons[i] == sender)
                 {
-
                     //if (APP.W_PromptWindow == null)
                     //{
                     //    APP.W_PromptWindow = new PromptWindow();
@@ -263,6 +268,7 @@ namespace XHWK.WKTool
                 }
             }
         }
+
         /// <summary>
         /// 播放
         /// </summary>
@@ -337,6 +343,7 @@ namespace XHWK.WKTool
 
             return list;
         }
+
         /// <summary>
         /// 修改
         /// </summary>
@@ -395,55 +402,25 @@ namespace XHWK.WKTool
 
         private void Window_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
-            //    if (IsModify)
-            //    {
-            //        if (MouseNumber > 0 && pageData.menuList.Count > Subscript)
-            //        {
-            //        MouseNumber = 0;
-            //            pageData.menuList[Subscript].IsEnabled = false;
-            //            try
-            //            {
-            //                if (!pageData.menuList[Subscript].Name.Equals(pageData.menuList[Subscript].VideoName))
-            //                {
-            //                    MouseNumber = 0;
-            //                    string tempPath = pageData.menuList[Subscript].FilePath + pageData.menuList[Subscript].VideoName + "." + pageData.menuList[Subscript].VideoType;
-            //                    if (FileToolsCommon.IsExistFile(tempPath))
-            //                    {
-            //                        MessageWindow.Show("文件名已存在！");
-            //                        return;
-            //                    }
-            //                    foreach (Model_WKData wKData in APP.WKDataList)
-            //                    {
-            //                        if (wKData.VideoList == null)
-            //                            continue;
-            //                        if (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[Subscript].FileGuid))
-            //                        {
-            //                            try
-            //                            {
-            //                                //FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid).VideoPath);
-            //                                //FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid).ThumbnailPath);
-            //                                //wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid));
-            //                                //Initialize();
-            //                                //return;
-            //                            }
-            //                            catch (Exception ex)
-            //                            {
-            //                                MessageWindow.Show("无法删除视频！" + ex.Message);
-            //                                return;
-            //                            }
-            //                        }
-            //                    }
-            //                    FileToolsCommon.Copy(pageData.menuList[Subscript].Path, tempPath);
-            //                }
-            //            }
-            //            catch (Exception ex)
-            //            {
-            //                MessageWindow.Show("无法修改视频名称！" + ex.Message);
-            //                return;
-            //            }
-            //        }
-            //        MouseNumber++;
-            //    }
+            // if (IsModify) { if (MouseNumber > 0 && pageData.menuList.Count > Subscript) {
+            // MouseNumber = 0; pageData.menuList[Subscript].IsEnabled = false; try { if
+            // (!pageData.menuList[Subscript].Name.Equals(pageData.menuList[Subscript].VideoName)) {
+            // MouseNumber = 0; string tempPath = pageData.menuList[Subscript].FilePath +
+            // pageData.menuList[Subscript].VideoName + "." +
+            // pageData.menuList[Subscript].VideoType; if (FileToolsCommon.IsExistFile(tempPath)) {
+            // MessageWindow.Show("文件名已存在！"); return; } foreach (Model_WKData wKData in
+            // APP.WKDataList) { if (wKData.VideoList == null) continue; if
+            // (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[Subscript].FileGuid)) {
+            // try { //FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid ==
+            // pageData.menuList[Subscript].FileGuid).VideoPath);
+            // //FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid ==
+            // pageData.menuList[Subscript].FileGuid).ThumbnailPath);
+            // //wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid ==
+            // pageData.menuList[Subscript].FileGuid)); //Initialize(); //return; } catch (Exception
+            // ex) { MessageWindow.Show("无法删除视频！" + ex.Message); return; } } }
+            // FileToolsCommon.Copy(pageData.menuList[Subscript].Path, tempPath); } } catch
+            // (Exception ex) { MessageWindow.Show("无法修改视频名称！" + ex.Message); return; } }
+            // MouseNumber++; }
         }
 
         /// <summary>
@@ -483,168 +460,5 @@ namespace XHWK.WKTool
                 return true;
             }
         }
-
-    }
-
-    public class FileDirectoryData : NotifyModel
-    {
-        public ObservableCollection<FileDirectoryModel> menuList { get; set; }
-
-        public FileDirectoryData()
-        {
-            menuList = new ObservableCollection<FileDirectoryModel>();
-        }
-    }
-
-    public class FileDirectoryModel : NotifyModel
-    {
-        private int _serialNumber;
-        /// <summary>
-        /// 序号
-        /// </summary>
-        public int SerialNumber
-        {
-            get => _serialNumber;
-            set
-            {
-                _serialNumber = value;
-                OnPropertyChanged("SerialNumber");
-            }
-        }
-        private string _videoName;
-        /// <summary>
-        /// 视频名称
-        /// </summary>
-        public string VideoName
-        {
-            get => _videoName;
-            set
-            {
-                _videoName = value;
-                OnPropertyChanged("VideoName");
-            }
-        }
-        private int _videoDuration;
-        /// <summary>
-        /// 视频时长
-        /// </summary>
-        public int VideoDuration
-        {
-            get => _videoDuration;
-            set
-            {
-                _videoDuration = value;
-                OnPropertyChanged("VideoDuration");
-            }
-        }
-        private string _videoSize;
-        /// <summary>
-        /// 视频大小
-        /// </summary>
-        public string VideoSize
-        {
-            get => _videoSize;
-            set
-            {
-                _videoSize = value;
-                OnPropertyChanged("VideoSize");
-            }
-        }
-        private long _videoSizes;
-        /// <summary>
-        /// 视频大小
-        /// </summary>
-        public long VideoSizes
-        {
-            get => _videoSizes;
-            set
-            {
-                _videoSizes = value;
-                OnPropertyChanged("VideoSizes");
-            }
-        }
-        private string _videoTime;
-        /// <summary>
-        /// 日期
-        /// </summary>
-        public string VideoTime
-        {
-            get => _videoTime;
-            set
-            {
-                _videoTime = value;
-                OnPropertyChanged("VideoTime");
-            }
-        }
-        private string _colour;
-        /// <summary>
-        /// 颜色
-        /// </summary>
-        public string Colour
-        {
-            get => _colour;
-            set
-            {
-                _colour = value;
-                OnPropertyChanged("Colour");
-            }
-        }
-        private bool _isEnabled;
-        /// <summary>
-        /// 是否可编辑
-        /// </summary>
-        public bool IsEnabled
-        {
-            get => _isEnabled;
-            set
-            {
-                _isEnabled = value;
-                OnPropertyChanged("IsEnabled");
-            }
-        }
-        public string Path { get; set; }
-        private string _visi;
-        /// <summary>
-        /// 显示
-        /// </summary>
-        public string Visi
-        {
-            get => _visi;
-            set
-            {
-                _visi = value;
-                OnPropertyChanged("Visi");
-            }
-        }
-        private string _coll;
-        /// <summary>
-        /// 显示
-        /// </summary>
-        public string Coll
-        {
-            get => _coll;
-            set
-            {
-                _coll = value;
-                OnPropertyChanged("Coll");
-            }
-        }
-        /// <summary>
-        /// 唯一编号
-        /// </summary>
-        public string FileGuid { get; set; }
-        /// <summary>
-        /// 视频类型
-        /// </summary>
-        public string VideoType { get; set; }
-        /// <summary>
-        /// 初始名称
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// 文件路径
-        /// </summary>
-        public string FilePath { get; set; }
-
     }
-}
+}

XHWK.WKTool/LoginWindow.xaml.cs

@@ -4,6 +4,7 @@ using System;
 using System.Configuration;
 using System.Text;
 using System.Text.RegularExpressions;
+
 //using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Input;
@@ -21,17 +22,21 @@ namespace XHWK.WKTool
         /// 调用接口
         /// </summary>
         private readonly Interface @interface = new Interface();
+
         public LoginWindow()
         {
             InitializeComponent();
 
             #region 获取服务接口地址 --2021年7月9日赵耀
+
             if (APP.ServiceAddress == null)
             {
                 MessageWindow.Show("首次使用需设置服务地址。");
                 BtnServiceAddress_Click(null, null);
             }
-            #endregion
+
+            #endregion 获取服务接口地址 --2021年7月9日赵耀
+
             //if (APP.SkinStyle == "1")
             //{
             //    GridTitle.Visibility = Visibility.Visible;
@@ -49,6 +54,7 @@ namespace XHWK.WKTool
             //}
             Initialize();
         }
+
         public void Initialize()
         {
             if (FileToolsCommon.IsExistFile(APP.DataPath + "accountNumber.txt"))
@@ -67,6 +73,7 @@ namespace XHWK.WKTool
             //    txbAccountNumber.Text = GetSettingString("userName");
             //}
         }
+
         /// <summary>
         /// 关闭事件
         /// </summary>
@@ -78,6 +85,7 @@ namespace XHWK.WKTool
             pobPassword.Password = string.Empty;
             Hide();
         }
+
         /// <summary>
         /// 登录事件
         /// </summary>
@@ -86,13 +94,16 @@ namespace XHWK.WKTool
         private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
             #region 获取服务接口地址 --2021年7月9日赵耀
+
             if (APP.ServiceAddress == null)
             {
                 MessageWindow.Show("首次使用需设置服务地址。");
                 BtnServiceAddress_Click(null, null);
                 return;
             }
-            #endregion
+
+            #endregion 获取服务接口地址 --2021年7月9日赵耀
+
             if (string.IsNullOrEmpty(txbAccountNumber.Text))
             {
                 MessageWindow.Show("账号未输入");
@@ -116,6 +127,7 @@ namespace XHWK.WKTool
             APP.myloading.Show();
             Login();
         }
+
         /// <summary>
         /// 登录
         /// </summary>
@@ -135,7 +147,6 @@ namespace XHWK.WKTool
                 string applicationData = APP.DataPath + "accountNumber.txt";
                 if (ckSaveName.IsChecked == true)
                 {
-
                     string accountNumbers = txbAccountNumber.Text;
                     System.IO.File.WriteAllText(applicationData, accountNumbers, Encoding.Default);//存放账号
                 }
@@ -150,37 +161,17 @@ namespace XHWK.WKTool
                 APP.IsLoginType = true;
                 txbAccountNumber.Text = string.Empty;
                 pobPassword.Password = string.Empty;
+
                 #region 下载头像
+
                 string HeadpicPath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + ".png");
                 if (!string.IsNullOrWhiteSpace(APP.UserInfo.Headpic))
                 {
                     //FileToolsCommon.
                     @interface.DownloadAvatar(APP.UserInfo.Headpic, HeadpicPath);
                 }
-                #endregion
-                #region 登录后 根据用户名设置微课路径 废弃
-                //APP.WKData.WkPath += APP.UserInfo.Username + "/";
-                ////判断微课是否存在，存在则询问
-                //if (APP.WKDataList != null)
-                //{
-                //    if(APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
-                //    {
-                //        MessageBoxResult dr = MessageWindow.Show("此微课已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
-                //        if (dr == MessageBoxResult.OK)
-                //        {
-                //            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
-                //            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-                //            APP.WKDataList.RemoveAll(x => x.WkName == APP.WKData.WkName);
-                //        }
-                //        else
-                //        {
-                //            APP.W_CreateAMicroLessonWindow.Owner = this;
-                //            //APP.W_CreateAMicroLessonWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-                //            APP.W_CreateAMicroLessonWindow.ShowDialog();
-                //        }
-                //    }
-                //}
-                #endregion
+
+                #endregion 下载头像
 
                 Hide();
             }
@@ -191,6 +182,7 @@ namespace XHWK.WKTool
                 MessageWindow.Show(APP.ServerMsg);
             }
         }
+
         /// <summary>
         /// 记住账号
         /// </summary>
@@ -198,15 +190,8 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void CkSaveName_Click(object sender, RoutedEventArgs e)
         {
-            //if (ckSaveName.IsChecked == false)
-            //{
-            //    UpdateSettingString("isRemind", ckSaveName.IsChecked.ToString());
-            //}
-            //else
-            //{
-            //    UpdateSettingString("isRemind", ckSaveName.IsChecked.ToString());
-            //}
         }
+
         /// <summary>
         /// 读取客户设置
         /// </summary>
@@ -224,6 +209,7 @@ namespace XHWK.WKTool
                 return null;
             }
         }
+
         /// <summary>
         /// 更新设置
         /// </summary>
@@ -241,6 +227,7 @@ namespace XHWK.WKTool
             config.Save(ConfigurationSaveMode.Modified);
             ConfigurationManager.RefreshSection("appSettings");
         }
+
         /// <summary>
         /// 限制输入特殊字符
         /// </summary>
@@ -264,7 +251,6 @@ namespace XHWK.WKTool
                 {
                     e.Handled = true;
                 }
-
             }
             catch (Exception)
             {
@@ -277,6 +263,7 @@ namespace XHWK.WKTool
         }
 
         #region 服务地址
+
         /// <summary>
         /// 打开服务地址
         /// </summary>
@@ -287,6 +274,7 @@ namespace XHWK.WKTool
             GridLoginPage.Visibility = Visibility.Collapsed;
             GridServiceAddress.Visibility = Visibility.Visible;
         }
+
         /// <summary>
         /// 取消
         /// </summary>
@@ -297,6 +285,7 @@ namespace XHWK.WKTool
             GridLoginPage.Visibility = Visibility.Visible;
             GridServiceAddress.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 服务地址设置
         /// </summary>
@@ -305,6 +294,7 @@ namespace XHWK.WKTool
         private void BtnSetServiceAddress_Click(object sender, RoutedEventArgs e)
         {
             #region 获取服务地址 -- 2021年7月8日赵耀
+
             if (!string.IsNullOrWhiteSpace(TbxServiceAddress.Text))
             {
                 if (@interface.GetServiceAddress(TbxServiceAddress.Text, out string Message))
@@ -321,10 +311,12 @@ namespace XHWK.WKTool
                     return;
                 }
             }
-            #endregion
+
+            #endregion 获取服务地址 -- 2021年7月8日赵耀
         }
 
         #region 切换校内外
+
         /// <summary>
         /// 校外
         /// </summary>
@@ -339,6 +331,7 @@ namespace XHWK.WKTool
                 APP.SwitchAddress();
             }
         }
+
         /// <summary>
         /// 校内
         /// </summary>
@@ -353,7 +346,9 @@ namespace XHWK.WKTool
                 APP.SwitchAddress();
             }
         }
-        #endregion
-        #endregion
+
+        #endregion 切换校内外
+
+        #endregion 服务地址
     }
-}
+}

XHWK.WKTool/Models/FileDirectoryData.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using XHWK.Model;
+
+namespace XHWK.WKTool.Models
+{
+    public class FileDirectoryData : NotifyModel
+    {
+        public ObservableCollection<FileDirectoryModel> menuList { get; set; }
+
+        public FileDirectoryData()
+        {
+            menuList = new ObservableCollection<FileDirectoryModel>();
+        }
+    }
+}

XHWK.WKTool/Models/FileDirectoryModel.cs

@@ -0,0 +1,184 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using XHWK.Model;
+
+namespace XHWK.WKTool.Models
+{
+    public class FileDirectoryModel : NotifyModel
+    {
+        private int _serialNumber;
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int SerialNumber
+        {
+            get => _serialNumber;
+            set
+            {
+                _serialNumber = value;
+                OnPropertyChanged("SerialNumber");
+            }
+        }
+
+        private string _videoName;
+
+        /// <summary>
+        /// 视频名称
+        /// </summary>
+        public string VideoName
+        {
+            get => _videoName;
+            set
+            {
+                _videoName = value;
+                OnPropertyChanged("VideoName");
+            }
+        }
+
+        private int _videoDuration;
+
+        /// <summary>
+        /// 视频时长
+        /// </summary>
+        public int VideoDuration
+        {
+            get => _videoDuration;
+            set
+            {
+                _videoDuration = value;
+                OnPropertyChanged("VideoDuration");
+            }
+        }
+
+        private string _videoSize;
+
+        /// <summary>
+        /// 视频大小
+        /// </summary>
+        public string VideoSize
+        {
+            get => _videoSize;
+            set
+            {
+                _videoSize = value;
+                OnPropertyChanged("VideoSize");
+            }
+        }
+
+        private long _videoSizes;
+
+        /// <summary>
+        /// 视频大小
+        /// </summary>
+        public long VideoSizes
+        {
+            get => _videoSizes;
+            set
+            {
+                _videoSizes = value;
+                OnPropertyChanged("VideoSizes");
+            }
+        }
+
+        private string _videoTime;
+
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public string VideoTime
+        {
+            get => _videoTime;
+            set
+            {
+                _videoTime = value;
+                OnPropertyChanged("VideoTime");
+            }
+        }
+
+        private string _colour;
+
+        /// <summary>
+        /// 颜色
+        /// </summary>
+        public string Colour
+        {
+            get => _colour;
+            set
+            {
+                _colour = value;
+                OnPropertyChanged("Colour");
+            }
+        }
+
+        private bool _isEnabled;
+
+        /// <summary>
+        /// 是否可编辑
+        /// </summary>
+        public bool IsEnabled
+        {
+            get => _isEnabled;
+            set
+            {
+                _isEnabled = value;
+                OnPropertyChanged("IsEnabled");
+            }
+        }
+
+        public string Path { get; set; }
+        private string _visi;
+
+        /// <summary>
+        /// 显示
+        /// </summary>
+        public string Visi
+        {
+            get => _visi;
+            set
+            {
+                _visi = value;
+                OnPropertyChanged("Visi");
+            }
+        }
+
+        private string _coll;
+
+        /// <summary>
+        /// 显示
+        /// </summary>
+        public string Coll
+        {
+            get => _coll;
+            set
+            {
+                _coll = value;
+                OnPropertyChanged("Coll");
+            }
+        }
+
+        /// <summary>
+        /// 唯一编号
+        /// </summary>
+        public string FileGuid { get; set; }
+
+        /// <summary>
+        /// 视频类型
+        /// </summary>
+        public string VideoType { get; set; }
+
+        /// <summary>
+        /// 初始名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string FilePath { get; set; }
+    }
+}

XHWK.WKTool/Models/PrintModel.cs

@@ -0,0 +1,20 @@
+namespace XHWK.WKTool.Models
+{
+    internal class PrintModel
+    {
+        /// <summary>
+        /// 打印文件路径
+        /// </summary>
+        public string filepath { get; set; }
+
+        /// <summary>
+        /// 打印数量
+        /// </summary>
+        public int num { get; set; }
+
+        /// <summary>
+        /// 打印机名称
+        /// </summary>
+        public string printname { get; set; }
+    }
+}

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -21,6 +21,7 @@ namespace XHWK.WKTool
     public partial class ScreenRecordingToolbarWindow : Window
     {
         #region 初始变量
+
         /// <summary>
         /// 视频保存名称
         /// </summary>
@@ -41,9 +42,11 @@ namespace XHWK.WKTool
         /// </summary>
         private Model_Video VideoInfo = null;
 
-        //声明一个 DrawingAttributes 类型的变量  
+        //声明一个 DrawingAttributes 类型的变量
         private DrawingAttributes drawingAttributes;
+
         private DispatcherTimer t = null;
+
         /// <summary>
         /// 计时器状态
         /// </summary>
@@ -53,20 +56,25 @@ namespace XHWK.WKTool
             Pause,
             End
         }
+
         /// <summary>
         /// 状态
         /// </summary>
         private State _state = State.End;
 
         private KeyboardHookCommon k_hook;
+
         /// <summary>
         /// 🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
         /// </summary>
         public int flg = 0;
+
         private System.Timers.Timer timer = new System.Timers.Timer();
-        #endregion
+
+        #endregion 初始变量
 
         #region 初始化
+
         /// <summary>
         /// 录屏工具栏
         /// </summary>
@@ -75,6 +83,7 @@ namespace XHWK.WKTool
             InitializeComponent();
             ResizeMode = ResizeMode.NoResize;
         }
+
         /// <summary>
         /// 初始化
         /// </summary>
@@ -111,14 +120,13 @@ namespace XHWK.WKTool
             //borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
             flg = 0;
 
-
             k_hook = new KeyboardHookCommon();
             k_hook.KeyDownEvent += K_hook_KeyDownEvent;
 
-            //创建 DrawingAttributes 类的一个实例  
+            //创建 DrawingAttributes 类的一个实例
             drawingAttributes = new DrawingAttributes();
-            //将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
-            //InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
+            //将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用
+            //InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型
             blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
             drawingAttributes.FitToCurve = true;
             //隐藏画笔工具栏
@@ -160,7 +168,7 @@ namespace XHWK.WKTool
                 double mouse_y = Form.MousePosition.Y;
 
                 bool is_in_collasped_range = (mouse_y > Left + Height) || (mouse_x < Left || mouse_x > Left + Width);//缩起的条件
-                bool is_in_visiable_range = (mouse_y < 1 && mouse_x >= Left && mouse_x <= Left + Width); //展开的条件         
+                bool is_in_visiable_range = (mouse_y < 1 && mouse_x >= Left && mouse_x <= Left + Width); //展开的条件
 
                 if (Left < 1630 && Left >= 0 && is_in_collasped_range)
                 {
@@ -173,6 +181,7 @@ namespace XHWK.WKTool
                 }
             });
         }
+
         private void K_hook_KeyDownEvent(object sender, System.Windows.Forms.KeyEventArgs e)
         {
             if (e.KeyValue == (int)System.Windows.Forms.Keys.F5 && (int)Control.ModifierKeys == (int)Keys.Control)
@@ -185,16 +194,19 @@ namespace XHWK.WKTool
                 //结束
                 BtnStopRecordingScreen_Click(null, null);
             }
-
         }
-        #endregion
+
+        #endregion 初始化
 
         #region 事件
+
         /// <summary>
         /// 记录上次执行时间
         /// </summary>
         private DateTime Recorddt = DateTime.Now;
-        DateTime SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+
+        private DateTime SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+
         /// <summary>
         /// 时钟回调
         /// </summary>
@@ -207,7 +219,7 @@ namespace XHWK.WKTool
                 case State.Start:
                     {
                         DateTime dt = DateTime.Now;
-                        TimeSpan ts = dt.Subtract(Recorddt);//时间差   
+                        TimeSpan ts = dt.Subtract(Recorddt);//时间差
                         double tsmi = ts.TotalMilliseconds;
                         if (tsmi > 1000.0)
                         {
@@ -259,6 +271,7 @@ namespace XHWK.WKTool
             Recorddt = DateTime.Now;
             _state = State.Start;
         }
+
         /// <summary>
         /// 暂停
         /// </summary>
@@ -266,6 +279,7 @@ namespace XHWK.WKTool
         {
             _state = State.Pause;
         }
+
         /// <summary>
         /// 结束
         /// </summary>
@@ -277,6 +291,7 @@ namespace XHWK.WKTool
         }
 
         #region 录屏
+
         /// <summary>
         /// 设置录屏文件地址
         /// </summary>
@@ -298,6 +313,7 @@ namespace XHWK.WKTool
         /// 是否已经按下按钮
         /// </summary>
         private bool IsPressButton = false;
+
         /// <summary>
         /// 开始或暂停录制
         /// </summary>
@@ -306,6 +322,7 @@ namespace XHWK.WKTool
         private void BtnRecordingScreen_Click(object sender, RoutedEventArgs e)
         {
             #region 防止连击
+
             if (IsPressButton)
             {
                 return;
@@ -319,12 +336,15 @@ namespace XHWK.WKTool
                     IsPressButton = false;
                 }))).Start();
             }
-            #endregion
+
+            #endregion 防止连击
+
             if (IsSuspend)
             {
                 if (IsFirstRS)
                 {
                     #region 检测麦克风扬声器是否可用
+
                     string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
                     FileToolsCommon.CreateDirectory(AudioPath);
                     string audioSpeakerPath = AudioPath + "adoS" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
@@ -336,7 +356,6 @@ namespace XHWK.WKTool
                     }
                     catch (Exception)
                     {
-
                     }
                     //扬声器
                     if (APP.FFmpeg.StartRecordSpeakerAudio(audioSpeakerPath))
@@ -367,7 +386,8 @@ namespace XHWK.WKTool
                             return;
                         }
                     }
-                    #endregion
+
+                    #endregion 检测麦克风扬声器是否可用
 
                     VideoInfo = new Model_Video
                     {
@@ -404,6 +424,7 @@ namespace XHWK.WKTool
                 TxbTime.Visibility = Visibility.Visible;//时间显示
 
                 #region 隐藏工具栏
+
                 if (APP.IsHideSRTool)
                 {
                     if (APP.W_MinToolbar == null)
@@ -413,31 +434,19 @@ namespace XHWK.WKTool
                     APP.W_MinToolbar.Topmost = true;
                     double MinToolTop = Top;
                     GridSrToobar.Visibility = Visibility.Hidden;
-                    //if (APP.SkinStyle == "1")
-                    //{
-                    //    ColorType = 0;
-                    //    MinToolTop = this.Top + ((this.ActualHeight - btnReturn.ActualHeight) / 2);//(VbxBlue.ActualHeight -) 
-                    //}
-                    //else if (APP.SkinStyle == "2")
-                    //{
-                    //MinToolTop = this.Top + ((this.ActualHeight - VbxBlack.ActualHeight) / 2);
-                    //}
-                    APP.W_MinToolbar.Initialize(MinToolTop,ActualHeight);
+
+                    APP.W_MinToolbar.Initialize(MinToolTop, ActualHeight);
                     APP.W_MinToolbar.Show();
                 }
-                #endregion
+
+                #endregion 隐藏工具栏
+
                 try
                 {
                     #region 4秒内不可点击
+
                     new Thread(new ThreadStart(new Action(() =>
                     {
-                        //Dispatcher.Invoke(() =>
-                        //{
-                        //    ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
-                        //    BtnRecordingScreen.IsEnabled = false;
-                        //    BtnStopRecordingScreen.IsEnabled = false;
-                        //});
-                        //Thread.Sleep(4000);
                         Dispatcher.Invoke(() =>
                         {
                             BtnRecordingScreen.IsEnabled = true;
@@ -445,7 +454,9 @@ namespace XHWK.WKTool
                             BtnRecordingScreenPause.IsEnabled = true;
                         });
                     }))).Start();
-                    #endregion
+
+                    #endregion 4秒内不可点击
+
                     new Thread(new ThreadStart(new Action(() =>
                     {
                         if (IsFirstRS)
@@ -457,7 +468,7 @@ namespace XHWK.WKTool
                             Thread.Sleep(100);
                         }
                         System.Drawing.Size DesktopSize = PrimaryScreen.DESKTOP;
-                        bool IsRecordingSound = FileToolsCommon.GetConfigValue("IsRecordingSound") == "1"; 
+                        bool IsRecordingSound = FileToolsCommon.GetConfigValue("IsRecordingSound") == "1";
                         bool IsRecordingMicrophone = FileToolsCommon.GetConfigValue("IsRecordingMicrophone") == "1";
                         bool SynRes = APP.FFmpeg.StartRecordingVideo(VideoSavePathName, DesktopSize, IsRecordingSound, IsRecordingMicrophone, out string ErrMessage, APP.MicrophoneName);
 
@@ -467,11 +478,7 @@ namespace XHWK.WKTool
                             if (!SynRes)
                             {
                                 MessageWindow.Show(ErrMessage);
-                                //隐藏画笔工具栏
-                                //BtnToolbarDown_Click(null, null);
-                                //gridToolbar.Visibility = Visibility.Hidden;
-                                //gridColour.Visibility = Visibility.Hidden;
-                                //gridThickness.Visibility = Visibility.Hidden;
+
                                 BtnRecordingScreen.Visibility = Visibility.Visible;
                                 BtnRecordingScreenPause.Visibility = Visibility.Collapsed;
                                 BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
@@ -508,6 +515,7 @@ namespace XHWK.WKTool
                 //btnBlackPenTwo.IsEnabled = false;//红笔不可点击
 
                 #region 2秒内不可点击
+
                 new Thread(new ThreadStart(new Action(() =>
                 {
                     //Dispatcher.Invoke(() =>
@@ -523,7 +531,9 @@ namespace XHWK.WKTool
                         BtnStopRecordingScreen.IsEnabled = true;
                     });
                 }))).Start();
-                #endregion
+
+                #endregion 2秒内不可点击
+
                 try
                 {
                     APP.FFmpeg.SuspendFFmpeg();
@@ -534,6 +544,7 @@ namespace XHWK.WKTool
                 }
             }
         }
+
         /// <summary>
         /// 停止录像
         /// </summary>
@@ -542,6 +553,7 @@ namespace XHWK.WKTool
         private void BtnStopRecordingScreen_Click(object sender, RoutedEventArgs e)
         {
             #region 防止连击
+
             if (IsPressButton)
             {
                 return;
@@ -555,7 +567,9 @@ namespace XHWK.WKTool
                     IsPressButton = false;
                 }))).Start();
             }
-            #endregion
+
+            #endregion 防止连击
+
             BtnRecordingScreen.ToolTip = "开始";
             k_hook.Stop();
             IsSuspend = true;
@@ -656,6 +670,7 @@ namespace XHWK.WKTool
             }
             Hide();
         }
+
         public void MaxToobar()
         {
             Graphics graphics = Graphics.FromHwnd(IntPtr.Zero);
@@ -665,9 +680,11 @@ namespace XHWK.WKTool
             GridSrToobar.Visibility = Visibility.Visible;
             APP.W_ScreenRecordingToolbarWindow.Topmost = true;
         }
-        #endregion
+
+        #endregion 录屏
 
         #region 画笔相关
+
         /// <summary>
         /// 画笔工具栏关闭事件
         /// </summary>
@@ -680,6 +697,7 @@ namespace XHWK.WKTool
             gridThickness.Visibility = Visibility.Hidden;
             APP.W_PracticeWindow.Hide();
         }
+
         /// <summary>
         /// 笔调用批注
         /// </summary>
@@ -690,6 +708,7 @@ namespace XHWK.WKTool
                 if (flg != 11 && flg != 10)
                 {
                     #region 防止连击
+
                     if (IsPressButton)
                     {
                         return;
@@ -703,7 +722,9 @@ namespace XHWK.WKTool
                             IsPressButton = false;
                         }))).Start();
                     }
-                    #endregion
+
+                    #endregion 防止连击
+
                     string time = GetTimeStamp();
                     string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
                     if (!Directory.Exists(tempPath))
@@ -737,7 +758,6 @@ namespace XHWK.WKTool
                             APP.W_PracticeWindow.Focus();
                         });
 
-
                         new Thread(new ThreadStart(new Action(() =>
                         {
                             Dispatcher.Invoke(() =>
@@ -759,6 +779,7 @@ namespace XHWK.WKTool
                 }
             }
         }
+
         /// <summary>
         /// 画笔点击事件
         /// </summary>
@@ -766,11 +787,13 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBrush_Click(object sender, RoutedEventArgs e)
         {
-            if(BtnPenBlue.Visibility!= Visibility.Visible)
+            if (BtnPenBlue.Visibility != Visibility.Visible)
             {
                 return;
             }
+
             #region 防止连击
+
             if (IsPressButton)
             {
                 return;
@@ -784,7 +807,9 @@ namespace XHWK.WKTool
                     IsPressButton = false;
                 }))).Start();
             }
-            #endregion
+
+            #endregion 防止连击
+
             BtnPenBlue.Visibility = Visibility.Collapsed;
             BtnPenRed.Visibility = Visibility.Visible;
             BtnPenBlue_CL.Visibility = Visibility.Visible;
@@ -797,9 +822,11 @@ namespace XHWK.WKTool
             }
 
             #region 录屏批注取消画笔
+
             //string imagePath = Path.Combine(tempPath, time + ".jpg");
             //ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
-            #endregion
+
+            #endregion 录屏批注取消画笔
 
             try
             {
@@ -870,16 +897,18 @@ namespace XHWK.WKTool
             }
 
             //imgCanvas.Source = new BitmapImage(new Uri(imagePath));
-
         }
+
         /// <summary>
         /// 屏幕宽
         /// </summary>
         internal double pwidth = SystemParameters.PrimaryScreenWidth;
+
         /// <summary>
         /// 屏幕高
         /// </summary>
         internal double pHeight = SystemParameters.PrimaryScreenHeight;
+
         /// <summary>
         /// 获取时间戳
         /// </summary>
@@ -889,6 +918,7 @@ namespace XHWK.WKTool
             TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
             return Convert.ToInt64(ts.TotalMilliseconds).ToString();
         }
+
         /// <summary>
         /// 画笔粗细事件
         /// </summary>
@@ -899,6 +929,7 @@ namespace XHWK.WKTool
             gridThickness.Visibility = Visibility.Visible;
             gridColour.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 画笔颜色事件
         /// </summary>
@@ -909,6 +940,7 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Visible;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 白色
         /// </summary>
@@ -921,6 +953,7 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Collapsed;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 红色
         /// </summary>
@@ -933,6 +966,7 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Collapsed;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 黄色
         /// </summary>
@@ -945,6 +979,7 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Collapsed;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 青色
         /// </summary>
@@ -957,6 +992,7 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Collapsed;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 灰色
         /// </summary>
@@ -969,6 +1005,7 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Collapsed;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 蓝色
         /// </summary>
@@ -981,6 +1018,7 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Collapsed;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 画笔 细
         /// </summary>
@@ -992,6 +1030,7 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Collapsed;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 画笔 中
         /// </summary>
@@ -1003,6 +1042,7 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Collapsed;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 画笔粗
         /// </summary>
@@ -1014,6 +1054,7 @@ namespace XHWK.WKTool
             gridColour.Visibility = Visibility.Collapsed;
             gridThickness.Visibility = Visibility.Collapsed;
         }
+
         /// <summary>
         /// 橡皮
         /// </summary>
@@ -1023,6 +1064,7 @@ namespace XHWK.WKTool
         {
             APP.W_PracticeWindow.Eraser();
         }
+
         /// <summary>
         /// 🖊
         /// </summary>
@@ -1032,6 +1074,7 @@ namespace XHWK.WKTool
         {
             APP.W_PracticeWindow.Pen();
         }
+
         /// <summary>
         /// ⚪
         /// </summary>
@@ -1041,6 +1084,7 @@ namespace XHWK.WKTool
         {
             APP.W_PracticeWindow.Round();
         }
+
         /// <summary>
         /// 矩形
         /// </summary>
@@ -1050,17 +1094,21 @@ namespace XHWK.WKTool
         {
             APP.W_PracticeWindow.Rectangle();
         }
-        #endregion
-        #endregion
+
+        #endregion 画笔相关
+
+        #endregion 事件
 
         /// <summary>
         /// 停止录屏
         /// </summary>
         public delegate void StopRecordingScreen();
+
         /// <summary>
         /// 停止录屏
         /// </summary>
         public event StopRecordingScreen Click_stopRecordingScreen;
+
         /// <summary>
         /// 黑笔
         /// </summary>
@@ -1068,8 +1116,8 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBlackPen_Click(object sender, RoutedEventArgs e)
         {
-
         }
+
         /// <summary>
         /// 移动工具栏
         /// </summary>
@@ -1079,10 +1127,11 @@ namespace XHWK.WKTool
         {
             DragMove();
         }
+
         /// <summary>
         /// 红笔
         /// </summary>
-        /// <param name="sender"></param> 
+        /// <param name="sender"></param>
         /// <param name="e"></param>
         private void BtnBlackPenTwo_Click(object sender, RoutedEventArgs e)
         {
@@ -1090,7 +1139,9 @@ namespace XHWK.WKTool
             {
                 return;
             }
+
             #region 防止连击
+
             if (IsPressButton)
             {
                 return;
@@ -1104,7 +1155,9 @@ namespace XHWK.WKTool
                     IsPressButton = false;
                 }))).Start();
             }
-            #endregion
+
+            #endregion 防止连击
+
             BtnPenBlue.Visibility = Visibility.Visible;
             BtnPenRed.Visibility = Visibility.Collapsed;
             BtnPenBlue_CL.Visibility = Visibility.Collapsed;
@@ -1115,10 +1168,14 @@ namespace XHWK.WKTool
             {
                 Directory.CreateDirectory(tempPath);
             }
+
             #region 录屏批注取消画笔
+
             string imagePath = Path.Combine(tempPath, time + ".jpg");
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
-            #endregion
+
+            #endregion 录屏批注取消画笔
+
             try
             {
                 if (flg == 10)
@@ -1168,7 +1225,6 @@ namespace XHWK.WKTool
                     APP.W_PracticeWindow.Red();
                     APP.W_PracticeWindow.Show();
 
-
                     new Thread(new ThreadStart(new Action(() =>
                     {
                         Thread.Sleep(100);
@@ -1178,8 +1234,6 @@ namespace XHWK.WKTool
                             Topmost = true;
                         });
                     }))).Start();
-
-
                 }
             }
             catch (Exception ex)
@@ -1187,68 +1241,7 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
             }
         }
-        /// <summary>
-        /// 鼠标右键按下事件 废弃
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void RightButtonDown()
-        {
-            if (flg > 9)
-            {
-                Owner = null;
-                APP.W_PracticeWindow.Hide();
-            }
-            else
-            {
-                //string time = GetTimeStamp();
-                string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
-                if (!Directory.Exists(tempPath))
-                {
-                    Directory.CreateDirectory(tempPath);
-                }
-
-                #region 录屏批注取消画笔
-                //string imagePath = Path.Combine(tempPath, time + ".jpg");
-                //ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
-                #endregion
 
-                try
-                {
-                    if (APP.W_PracticeWindow == null)
-                    {
-                        APP.W_PracticeWindow = new PracticeWindow
-                        {
-                            //APP.W_PracticeWindow.Topmost = true;
-                            Width = pwidth,
-                            Height = pHeight,
-                            Left = 0,
-                            Top = 0
-                        };
-                        //practiceWin.Owner = this;
-                    }
-                    APP.W_PracticeWindow.InitPen();
-                    APP.W_PracticeWindow.InitTQLPPen();
-                    APP.W_PracticeWindow.Initialize();//imagePath);
-
-                    if (flg == 0)
-                    {
-                        flg = 10;
-                        APP.W_PracticeWindow.Red();
-                    }
-                    else
-                    {
-                        flg = 11;
-                        APP.W_PracticeWindow.Blue();
-                    }
-                    APP.W_PracticeWindow.Show();
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
-                }
-            }
-        }
         /// <summary>
         /// 返回主界面
         /// </summary>
@@ -1301,7 +1294,6 @@ namespace XHWK.WKTool
                     {
                         VideoInfo = null;
                         FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temprs/");
-
                     }))).Start();
                 }
                 catch (Exception ex)
@@ -1327,6 +1319,7 @@ namespace XHWK.WKTool
             }))).Start();
             Hide();
         }
+
         /// <summary>
         /// 批注退出 废弃
         /// </summary>
@@ -1334,11 +1327,6 @@ namespace XHWK.WKTool
         {
             new Thread(new ThreadStart(new Action(() =>
             {
-                //Dispatcher.Invoke(() =>
-                //{
-                //    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-                //    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-                //});
                 flg = 0;
                 Thread.Sleep(500);
                 Dispatcher.Invoke(() =>
@@ -1348,6 +1336,7 @@ namespace XHWK.WKTool
                 });
             }))).Start();
         }
+
         /// <summary>
         /// 修改笔状态
         /// </summary>
@@ -1357,40 +1346,18 @@ namespace XHWK.WKTool
             BtnPenRed.Visibility = Visibility.Visible;
             BtnPenBlue_CL.Visibility = Visibility.Collapsed;
             BtnPenRed_CL.Visibility = Visibility.Collapsed;
-            //borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-            //borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-        }
-
-        /// <summary>
-        /// 切换页面
-        /// </summary>
-        void SwitchPages()
-        {
-            //SendKeys.SendWait("%{TAB}");
-            MouseEventCommon.MouseMiddleClickEvent(0);
-        }
-        //bool isToobar = false;
-        /// <summary>
-        /// 在工具条区域内
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void gridToobarTwo_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            //isToobar = true;
         }
 
         private void gridToobarTwo_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
         {
             //if (BtnRecordingScreen.ToolTip.ToString().Equals("暂停") && (gridToobar.Visibility == Visibility.Visible || BorderBlack.Visibility == Visibility.Visible))
-            if(BtnRecordingScreenPause.Visibility == Visibility.Visible)
+            if (BtnRecordingScreenPause.Visibility == Visibility.Visible)
             {
                 if (APP.IsHideSRTool)
                 {
                     if (APP.W_MinToolbar == null)
                     {
                         APP.W_MinToolbar = new MinToolbar();
-
                     }
                     APP.W_MinToolbar.Topmost = true;
                     double MinToolTop = Top;
@@ -1419,7 +1386,7 @@ namespace XHWK.WKTool
                             {
                                 //LblMessage.Content = "不在区域内：(" + pointRecord.X + "," + pointRecord.Y + ") (" + Left + "," + Top + ")";
                                 APP.W_MinToolbar.Initialize(MinToolTop, ActualHeight);
-                                GridSrToobar.Visibility =  Visibility.Hidden;
+                                GridSrToobar.Visibility = Visibility.Hidden;
                                 APP.W_MinToolbar.Show();
                             }
                         });
@@ -1428,4 +1395,4 @@ namespace XHWK.WKTool
             }
         }
     }
-}
+}

XHWK.WKTool/UControl/Uc_VideoItem.xaml

@@ -1,119 +1,191 @@
-<UserControl x:Class="XHWK.WKTool.UControl.Uc_VideoItem"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:XHWK.WKTool.UControl"
-             mc:Ignorable="d" 
-             d:DesignHeight="260" d:DesignWidth="250">
+<UserControl
+    x:Class="XHWK.WKTool.UControl.Uc_VideoItem"
+    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:local="clr-namespace:XHWK.WKTool.UControl"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="260"
+    d:DesignWidth="250"
+    mc:Ignorable="d">
     <Grid>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="10*"/>
-                <RowDefinition Height="130*"/>
-                <RowDefinition Height="110*"/>
-                <RowDefinition Height="10*"/>
+                <RowDefinition Height="10*" />
+                <RowDefinition Height="130*" />
+                <RowDefinition Height="110*" />
+                <RowDefinition Height="10*" />
             </Grid.RowDefinitions>
-            <!--视频缩略图-->
+            <!--  视频缩略图  -->
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="20*"/>
-                    <ColumnDefinition Width="210*"/>
-                    <ColumnDefinition Width="20*"/>
+                    <ColumnDefinition Width="20*" />
+                    <ColumnDefinition Width="210*" />
+                    <ColumnDefinition Width="20*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="1">
-                    <Border Background="#dddddd">
-                        <Button  x:Name="BtnVideoPlay" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Stretch"  Cursor="Hand" Click="BtnVideoPlay_Click" VerticalAlignment="Stretch">
-                            <Image x:Name="ImgVideo" Cursor="Hand" Stretch="Fill"/>
+                    <Border Background="#eeeeee">
+                        <Button
+                            x:Name="BtnVideoPlay"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Click="BtnVideoPlay_Click"
+                            Cursor="Hand"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            <Image
+                                x:Name="ImgVideo"
+                                Cursor="Hand"
+                                Stretch="Fill" />
                         </Button>
                     </Border>
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="75*"/>
-                            <ColumnDefinition Width="60*"/>
-                            <ColumnDefinition Width="75*"/>
+                            <ColumnDefinition Width="75*" />
+                            <ColumnDefinition Width="60*" />
+                            <ColumnDefinition Width="75*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="35*"/>
-                            <RowDefinition Height="60*"/>
-                            <RowDefinition Height="35*"/>
+                            <RowDefinition Height="40*" />
+                            <RowDefinition Height="60*" />
+                            <RowDefinition Height="40*" />
                         </Grid.RowDefinitions>
                         <Grid Grid.Row="0" Grid.Column="2">
-                            <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Right" VerticalAlignment="Top" Click="Button_Click">
-                                <Image x:Name="ImgSetUp" Source="/Images/Clip_Clip.png" Visibility="Visible"/>
+                            <Button
+                                x:Name="btnSetUp"
+                                Margin="0,0,4,0"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Click="Button_Click"
+                                Cursor="Hand"
+                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                <Image
+                                    x:Name="ImgSetUp"
+                                    Source="/Images/Clip_Clip.png"
+                                    Visibility="Visible" />
                             </Button>
                         </Grid>
                         <Grid Grid.Row="1" Grid.Column="1">
                             <Border Background="#7FDDDDDD" CornerRadius="30">
-                                <Image x:Name="ImgVideoPlay" Source="/星火微课;component/Images/VideoList_Play.png" Cursor="Hand" MouseLeftButtonDown="Image_MouseLeftButtonDown" />
+                                <Image
+                                    x:Name="ImgVideoPlay"
+                                    Cursor="Hand"
+                                    MouseLeftButtonDown="Image_MouseLeftButtonDown"
+                                    Source="/星火微课;component/Images/VideoList_Play.png" />
                             </Border>
                         </Grid>
                     </Grid>
                 </Grid>
             </Grid>
-            <!--信息-->
+            <!--  信息  -->
             <Grid Grid.Row="2">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="5*"></RowDefinition>
-                    <RowDefinition Height="30*"></RowDefinition>
-                    <RowDefinition Height="5*"></RowDefinition>
-                    <RowDefinition Height="30*"></RowDefinition>
-                    <RowDefinition Height="40*"></RowDefinition>
+                    <RowDefinition Height="5*" />
+                    <RowDefinition Height="30*" />
+                    <RowDefinition Height="5*" />
+                    <RowDefinition Height="30*" />
+                    <RowDefinition Height="40*" />
                 </Grid.RowDefinitions>
-                <!--名-->
+                <!--  名  -->
                 <Grid Grid.Row="1">
-                    <TextBlock x:Name="TbName" Text="一二三四五六七八九十一..." TextWrapping="Wrap" Foreground="#FF3492F4" FontSize="{Binding WordSize18}" TextAlignment="Center" ToolTip="" Visibility="Visible" MouseLeftButtonDown="TextBlock_MouseLeftButtonDown"/>
+                    <TextBlock
+                        x:Name="TbName"
+                        FontSize="{Binding WordSize18}"
+                        Foreground="#FF3492F4"
+                        MouseLeftButtonDown="TextBlock_MouseLeftButtonDown"
+                        Text="一二三四五六七八九十一..."
+                        TextAlignment="Center"
+                        TextWrapping="Wrap"
+                        ToolTip=""
+                        Visibility="Visible" />
                     <Grid x:Name="GridModify" Visibility="Hidden">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="15*"/>
-                            <ColumnDefinition Width="190*"/>
-                            <ColumnDefinition Width="30*"/>
-                            <ColumnDefinition Width="15*"/>
+                            <ColumnDefinition Width="15*" />
+                            <ColumnDefinition Width="190*" />
+                            <ColumnDefinition Width="30*" />
+                            <ColumnDefinition Width="15*" />
                         </Grid.ColumnDefinitions>
                         <Grid Grid.Column="1">
-                            <TextBox x:Name="TxtModify"  TextWrapping="Wrap" Text="TextBox" FontSize="{Binding WordSize16}" LostFocus="TxtModify_LostFocus" KeyUp="TxtModify_KeyUp">
+                            <TextBox
+                                x:Name="TxtModify"
+                                FontSize="{Binding WordSize16}"
+                                KeyUp="TxtModify_KeyUp"
+                                LostFocus="TxtModify_LostFocus"
+                                Text="TextBox"
+                                TextWrapping="Wrap">
                                 <TextBox.Resources>
                                     <Style TargetType="{x:Type Border}">
-                                        <Setter Property="CornerRadius" Value="3"/>
-                                        <Setter Property="BorderBrush" Value="#3492F4"/>
+                                        <Setter Property="CornerRadius" Value="3" />
+                                        <Setter Property="BorderBrush" Value="#3492F4" />
                                     </Style>
                                 </TextBox.Resources>
                             </TextBox>
                         </Grid>
                         <Grid Grid.Column="2">
-                            <Button Cursor="Hand" x:Name="BtnNameModifyOK" Background="White" BorderBrush="#FFABADB3" Click="BtnNameModifyOK_Click">
+                            <Button
+                                x:Name="BtnNameModifyOK"
+                                Background="White"
+                                BorderBrush="#FFABADB3"
+                                Click="BtnNameModifyOK_Click"
+                                Cursor="Hand">
                                 <Button.Resources>
                                     <Style TargetType="{x:Type Border}">
-                                        <Setter Property="CornerRadius" Value="3"/>
-                                        <Setter Property="BorderBrush" Value="#3492F4"/>
+                                        <Setter Property="CornerRadius" Value="3" />
+                                        <Setter Property="BorderBrush" Value="#3492F4" />
                                     </Style>
                                 </Button.Resources>
-                                <Image Source="/星火微课;component/Images/VideoList_OK.png"></Image>
+                                <Image Source="/星火微课;component/Images/VideoList_OK.png" />
                             </Button>
                         </Grid>
                     </Grid>
                 </Grid>
-                <!--信息-->
+                <!--  信息  -->
                 <Grid Grid.Row="3">
-                    <Label x:Name="lblDateSize" Content="2020-10-10 10:10:00|1000.00MB" Foreground="#FF9A9A9A" FontSize="{Binding WordSize12}" HorizontalContentAlignment="Center"/>
+                    <Label
+                        x:Name="lblDateSize"
+                        HorizontalContentAlignment="Center"
+                        Content="2020-10-10 10:10:00|1000.00MB"
+                        FontSize="{Binding WordSize12}"
+                        Foreground="#FF9A9A9A" />
                 </Grid>
-                <!--按钮-->
+                <!--  按钮  -->
                 <Grid Grid.Row="4">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="20*"></ColumnDefinition>
-                        <ColumnDefinition Width="100*"></ColumnDefinition>
-                        <ColumnDefinition Width="10*"></ColumnDefinition>
-                        <ColumnDefinition Width="100*"></ColumnDefinition>
-                        <ColumnDefinition Width="20*"></ColumnDefinition>
+                        <ColumnDefinition Width="20*" />
+                        <ColumnDefinition Width="100*" />
+                        <ColumnDefinition Width="10*" />
+                        <ColumnDefinition Width="100*" />
+                        <ColumnDefinition Width="20*" />
                     </Grid.ColumnDefinitions>
                     <Grid Grid.Column="1">
-                        <Border x:Name="BorUploadBtn" CornerRadius="6" Background="#FF3492F4">
-                            <Button Cursor="Hand" x:Name="BtnUpload" Content="上传" Foreground="White" FontSize="{Binding WordSize18}" Click="BtnUpload_Click"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+                        <Border
+                            x:Name="BorUploadBtn"
+                            Background="#FF3492F4"
+                            CornerRadius="6">
+                            <Button
+                                x:Name="BtnUpload"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Click="BtnUpload_Click"
+                                Content="上传"
+                                Cursor="Hand"
+                                FontSize="{Binding WordSize18}"
+                                Foreground="White"
+                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
                         </Border>
                     </Grid>
                     <Grid Grid.Column="3">
-                        <Border CornerRadius="6" Background="#FFC3C3C3">
-                            <Button Cursor="Hand" x:Name="BtnDelVideo" Content="删除"  Foreground="White" FontSize="{Binding WordSize18}" Background="Transparent" Click="BtnDelVideo_Click"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+                        <Border Background="#FFC3C3C3" CornerRadius="6">
+                            <Button
+                                x:Name="BtnDelVideo"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="Transparent"
+                                Click="BtnDelVideo_Click"
+                                Content="删除"
+                                Cursor="Hand"
+                                FontSize="{Binding WordSize18}"
+                                Foreground="White"
+                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
                         </Border>
                     </Grid>
                 </Grid>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -8,6 +8,7 @@ using Common.system;
 using RobotpenGateway;
 
 using Spire.Pdf;
+using Spire.Pdf.Print;
 
 using System;
 using System.Collections.Generic;
@@ -38,6 +39,7 @@ using TStudyDigitalPen.HID;
 
 using XHWK.Model;
 using XHWK.WKTool.DAL;
+using XHWK.WKTool.Models;
 using XHWK.WKTool.Skin;
 using XHWK.WKTool.UControl;
 
@@ -100,15 +102,6 @@ namespace XHWK.WKTool
             End
         }
 
-        ///// <summary>
-        ///// 状态
-        ///// </summary>
-        //private State _state = State.End;
-        ///// <summary>
-        ///// 计时用
-        ///// </summary>
-        //private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
-
         #region 上传
 
         /// <summary>
@@ -154,60 +147,16 @@ namespace XHWK.WKTool
             new Aspose.Slides.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
             InitializeComponent();
 
-            float WorkW = PrimaryScreen.ScaleWorkingAreaSize.Width;
-            float WorkH = PrimaryScreen.ScaleWorkingAreaSize.Height;
-            double proportion = 1036.0 / 1290.0;
-            //限制大小 确保大屏幕下录制不会卡死  暂时
-            if (WorkW > 1920.0)
-            {
-                Width = 1290;
-                Height = 1036;
-            }
-            else
-            {
-                Width = (PrimaryScreen.ScaleWorkingAreaSize.Height) / proportion - (BorderThickness.Left + BorderThickness.Right);
-                Height = PrimaryScreen.ScaleWorkingAreaSize.Height - (BorderThickness.Top + BorderThickness.Bottom);
-            }
-            GridContent.Width = Width - 14;
-            GridContent.Height = Height;
-
             #region 调整文字大小
 
             APP.PageContextData.WordSize20 = 20.00;
             APP.PageContextData.WordSize18 = 18.00;
             APP.PageContextData.WordSize16 = 16.00;
-            double WordFontPro = GridContent.Height / 1030.00;
-            //txbNotConnected.FontSize = 16.00 * WordFontPro;//连接状态文字
-            //TxbTime.FontSize = 20.00 * WordFontPro;//录屏时间
-            //TxbType.FontSize = 20.00 * WordFontPro;//录屏消息
-            APP.PageContextData.WordSize20 = 20.00 * WordFontPro;
-            APP.PageContextData.WordSize18 = 18.00 * WordFontPro;
-            APP.PageContextData.WordSize16 = 16.00 * WordFontPro;
-            APP.PageContextData.WordSize14 = 14.00 * WordFontPro;
-            APP.PageContextData.WordSize12 = 12.00 * WordFontPro;
+            APP.PageContextData.WordSize14 = 14.00;
+            APP.PageContextData.WordSize12 = 12.00;
 
             #endregion 调整文字大小
 
-            #region 读取本地配置 废弃   2021年7月9日赵耀
-
-            //if (File.Exists(APP.DataPath + "interfaceAddress.txt")) //若不为空
-            //{
-            //    APP.apiUrl = System.IO.File.ReadAllText(APP.DataPath + "interfaceAddress.txt", Encoding.Default);
-            //}
-            //if (File.Exists(APP.DataPath + "imageUploadAddress.txt")) //若不为空
-            //{
-            //    APP.uploadUrl = System.IO.File.ReadAllText(APP.DataPath + "imageUploadAddress.txt", Encoding.Default);
-            //}
-            //if (File.Exists(APP.DataPath + "pictureShowsAddress.txt")) //若不为空
-            //{
-            //    APP.showImageUrl = System.IO.File.ReadAllText(APP.DataPath + "pictureShowsAddress.txt", Encoding.Default);
-            //}
-
-            #endregion 读取本地配置 废弃   2021年7月9日赵耀
-
-            //GridMain.Height= PrimaryScreen.ScaleScreenSize().Height - 40;
-            //this.Top = (screeHeight - this.Height) / 2;
-            //this.Left = (screeWidth - this.Width) / 2;
             ResizeMode = System.Windows.ResizeMode.CanMinimize;
             BtnPrint.IsEnabled = false;
 
@@ -225,14 +174,7 @@ namespace XHWK.WKTool
             APP.PageDrawList.Add(model_DrawData);
             txbv.Text = "v" + FileToolsCommon.GetConfigValue("VersionName");
             txbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoType");
-            //if (FileToolsCommon.GetConfigValue("IsSound").Equals("true"))
-            //{
-            //    rbnY.IsChecked = true;
-            //}
-            //else
-            //{
-            //    rbnN.IsChecked = true;
-            //}
+
             txbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoSavePath");
             Initialize();
             InitPen();
@@ -285,8 +227,6 @@ namespace XHWK.WKTool
             //wfhCamera.Visibility = Visibility.Hidden;
             ImgPDFPath = null;
             ImgPDFPath = new string[300];
-            //GridM.Height = GridM.ActualWidth / proportion;
-            //GridM.Height = GridM.Width / proportion;
         }
 
         /// <summary>
@@ -1287,8 +1227,6 @@ namespace XHWK.WKTool
                 APP.W_JieTuWindow.click_closeJietuWindowClick += JietuWindow_click_closeJietuWindowClick;
                 APP.W_JieTuWindow.Show();
             }
-
-            //imgCanvas.Source = new BitmapImage(new Uri(desktopPath));
         }
 
         /// <summary>
@@ -3859,31 +3797,6 @@ namespace XHWK.WKTool
                         num++;
                     }
 
-                    #region 设置录屏唯一  废弃
-
-                    //if (FileToolsCommon.IsExistFile(VideoSavePathName))
-                    //{
-                    //    MessageBoxResult dr = MessageWindow.Show("课程已录制，是否覆盖？", "提示", MessageBoxButton.OKCancel);
-                    //    if (dr == MessageBoxResult.OK)
-                    //    {
-                    //        try
-                    //        {
-                    //            FileToolsCommon.DeleteFile(VideoSavePathName);
-                    //            APP.VideoList.RemoveAll(x => x.VideoPath == VideoSavePathName);
-                    //        }
-                    //        catch (Exception ex)
-                    //        {
-                    //            LogHelper.WriteErrLog("【录制】（StartRecord）无法移除视频，" + ex.Message, ex);
-                    //        }
-                    //    }
-                    //    else
-                    //    {
-                    //        return;
-                    //    }
-                    //}
-
-                    #endregion 设置录屏唯一  废弃
-
                     #region 禁用按钮
 
                     BtnPrint.IsEnabled = false;
@@ -4113,36 +4026,20 @@ namespace XHWK.WKTool
 
                     #endregion 设置大小
 
-                    //System.Windows.Application.Current.Dispatcher.Invoke(DispatcherPriority.Send, new ThreadStart(delegate
-                    //{
-                    //}));
                     Dispatcher.Invoke(() =>
                     {
                         //保存图片
-                        ImageHelper.SaveUI(GridMain, FilePathName, gridActWidth, gridActHeight, (int)RsW, (int)RsH);
-                        //ImageHelper.SaveUIToImage(GridMain, FilePathName, gridActWidth, gridActHeight, (int)RsW, (int)RsH);
-                        //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f)), 0, 0);
-                        //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)), (int)RsW, (int)RsH);
-                        //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)), 1281, 1026);
+                        ImageHelper.SaveUI2(GridMain, FilePathName, gridActWidth, gridActHeight, (int)RsW, (int)RsH);
+
                         SRTime = SRTime.AddMilliseconds(200);
-                        //if (TxbTime.Visibility == Visibility.Hidden)
-                        //{
-                        //    TxbTime.Visibility = Visibility.Visible;
-                        //    ImgLZImg.Visibility = Visibility.Visible;
-                        //}
+
                         if (SRTime.Hour > 0)
                         {
-                            //Dispatcher.Invoke(() =>
-                            //{
                             TxbTime.Text = SRTime.ToString("HH:mm:ss");
-                            //});
                         }
                         else
                         {
-                            //Dispatcher.Invoke(() =>
-                            //{
                             TxbTime.Text = SRTime.ToString("mm:ss");
-                            //});
                         }
                     });
                 }
@@ -4466,15 +4363,6 @@ namespace XHWK.WKTool
                 mouseDown = false;
                 HideAngleBorder();
 
-                //隐藏跳转
-                //txbCurrpage.Visibility = Visibility.Visible;
-                //txtJump.Visibility = Visibility.Hidden;
-                //BtnJumpPage.Visibility = Visibility.Hidden;
-
-                //if(!APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation)
-                //{
-                //    ImgWG();
-                //}
                 APP.PageContextData.currpage -= 1;
                 JumpPageClick();
             }
@@ -4492,15 +4380,6 @@ namespace XHWK.WKTool
                 mouseDown = false;
                 HideAngleBorder();
 
-                //隐藏跳转
-                //txbCurrpage.Visibility = Visibility.Visible;
-                //txtJump.Visibility = Visibility.Hidden;
-                //BtnJumpPage.Visibility = Visibility.Hidden;
-
-                //if (!APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation)
-                //{
-                //    ImgWG();
-                //}
                 APP.PageContextData.currpage += 1;
                 JumpPageClick();
             }
@@ -4556,22 +4435,6 @@ namespace XHWK.WKTool
                         APP.PageDrawList[APP.PageContextData.currpage - 1].IsImageLocation = false;
                         if (APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation.X > 0)
                         {
-                            //var group = IMG.FindResource("Imageview") as TransformGroup;
-                            //#region 高低 缩放比例
-                            //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
-                            //{
-                            //    var transform1 = group.Children[0] as ScaleTransform;
-                            //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
-                            //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
-                            //    imgCanvas.Width = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX;
-                            //    imgCanvas.Height = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY;
-                            //}
-                            //#endregion
-                            //#region 坐标XY轴
-                            //var transform = group.Children[1] as TranslateTransform;
-                            //transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
-                            //transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
-                            //#endregion
                             mouseDown = false;
                             ImgXY();
                         }
@@ -4598,23 +4461,6 @@ namespace XHWK.WKTool
             imgCanvas.Height = APP.PageDrawList[APP.PageContextData.currpage - 1].ImageSizes.CenterY;
 
             imgCanvas.Margin = new Thickness(APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation.X, APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation.Y, 0, 0);
-            //imgCanvas.Margin.Left= APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
-            //transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
-        }
-
-        private void ImgWG()
-        {
-            mouseDown = false;
-            APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
-            {
-                X = imgCanvas.Margin.Left,
-                Y = imgCanvas.Margin.Top
-            };
-            APP.PageDrawList[APP.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
-            {
-                CenterX = imgCanvas.ActualWidth,
-                CenterY = imgCanvas.ActualHeight
-            };
         }
 
         #endregion 分页
@@ -6357,13 +6203,6 @@ namespace XHWK.WKTool
             DataContext = APP.PageContextData;
         }
 
-        /// <summary>
-        /// 设置页面显示
-        /// </summary>
-        private void SetUp()
-        {
-        }
-
         #endregion 方法
 
         #region 跳转
@@ -6419,33 +6258,6 @@ namespace XHWK.WKTool
 
         #region 原跳转
 
-        /// <summary>
-        /// 跳转页
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void txbCurrpage_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ClickCount == 2)
-            {
-                try
-                {
-                    if (int.Parse(txbCurrpage.Text) > 0)
-                    {
-                        //txtJump.Text = txbCurrpage.Text;
-                        //txbCurrpage.Visibility = Visibility.Hidden;
-                        //txtJump.Visibility = Visibility.Visible;
-                        //BtnJumpPage.Visibility = Visibility.Visible;
-                        //txtJump.Focus();
-                        //txtJump.SelectAll();
-                    }
-                }
-                catch (Exception)
-                {
-                }
-            }
-        }
-
         /// <summary>
         /// 确定跳转
         /// </summary>
@@ -6505,94 +6317,6 @@ namespace XHWK.WKTool
 
         #endregion 原跳转
 
-        #region 打印
-
-        /// <summary>
-        /// 下拉框数据源
-        /// </summary>
-        public DataTable data = new DataTable();
-
-        private DataTable dtComponentsUniqueNo;
-
-        /// <summary>
-        /// 打印进度
-        /// </summary>
-        private System.Timers.Timer timesPrint;
-
-        /// <summary>
-        /// 打印消息
-        /// </summary>
-        private System.Timers.Timer timesPrintMsg;
-
-        private double wit = 0;
-        private double hei = 0;
-
-        /// <summary>
-        /// 打印状态消息
-        /// </summary>
-        private string PrintMsg = "打印中";
-
-        /// <summary>
-        /// 打印初始化
-        /// </summary>
-        public void InitPrint()
-        {
-            ResizeMode = ResizeMode.NoResize;
-            List<string> defaList = LatticeFileHelper.GetPrinterList(out string defa);
-            if (defaList.Count > 0)
-            {
-                data.Columns.Add("Value");
-                data.Columns.Add("Key");
-                for (int i = 0; i < defaList.Count; i++)
-                {
-                    //创建一行
-                    DataRow row = data.NewRow();
-                    //将此行添加到table中
-                    data.Rows.Add(row);
-                    data.Rows[i]["Value"] = defaList[i];
-                    data.Rows[i]["Key"] = i.ToString();
-                }
-                dtComponentsUniqueNo = data.DefaultView.ToTable();
-                cmbClass.ItemsSource = dtComponentsUniqueNo.DefaultView;
-                cmbClass.SelectedIndex = 0;
-            }
-
-            Dictionary<int, int> dicItem = new Dictionary<int, int>();
-            dicItem.Add(0, 600);
-            dicItem.Add(1, 1200);
-            CbxDpi.ItemsSource = dicItem;
-            CbxDpi.SelectedIndex = 0;
-
-            Dictionary<int, string> dictypeItem = new Dictionary<int, string>();
-            dictypeItem.Add(0, "2x2");
-            dictypeItem.Add(1, "3x3");
-            dictypeItem.Add(2, "4x4");
-            CbxType.ItemsSource = dictypeItem;
-            CbxType.SelectedIndex = 0;
-            TQLInit();
-        }
-
-        /// <summary>
-        /// 初始化页面
-        /// </summary>
-        /// <param name="_imgPath"></param>
-        /// <param name="_wit"></param>
-        /// <param name="_hei"></param>
-        public void InitializePrint(string _imgPath, double _wit, double _hei)
-        {
-            wit = _wit;
-            hei = _hei;
-            if (!string.IsNullOrWhiteSpace(_imgPath))
-            {
-                imgPri.Source = new BitmapImage(new Uri(_imgPath));
-            }
-            else
-            {
-                imgPri.Source = null;
-            }
-            GridPrintMask.Visibility = Visibility.Collapsed;
-        }
-
         #region TQL打印
 
         /// <summary>
@@ -6608,28 +6332,10 @@ namespace XHWK.WKTool
         private TmatrixClass TMC = new TmatrixClass();
         public static string gPrintFileName;
 
-        //string gDirectory = Application.StartupPath;
-        //string gFileName = "";
         private bool gbInitDone = false;
 
-        //string gUserName = "";
-        //string gPassword = "";
-        //private string gEKeyStr;
-
         private iTextSharp.text.Document document;
 
-        private enum TMATRIX_POINT_TYPE
-        {
-            TmatrixPointType_2x2 = 0,	// 2x2 Point Type
-            TmatrixPointType_3x3 = 1,	// 3x3 Point Type
-        };
-
-        private enum TMATRIX_OBJECT_TYPE
-        {
-            TMATRIX_OT_ElementCode = 0,	// 此类型对象的Index范围是：75497472~83886079(十六进制为：0x04800000~0x04ffffff)
-            TMATRIX_OT_PositionCode,		// 此类型对象没有Index
-        };
-
         /// <summary>
         /// TQL初始化打印
         /// </summary>
@@ -6696,38 +6402,27 @@ namespace XHWK.WKTool
                 catch (Exception)
                 {
                 }
-                int i;
-                for (i = 0; i < 4; i++)
-                {
-                    int DPIValue = 0;
-                    int TypeValue = 0;
-                    try
-                    {
-                        DPIValue = CbxDpi.SelectedIndex;
-                        //TypeValue = CbxType.SelectedIndex;
-                    }
-                    catch (Exception)
-                    {
-                    }
-                    APP.gPointType[i] = TypeValue;
-                    APP.gPointDPI[i] = DPIValue;
-                }
 
-                APP.gbGenerateBGWithVImage = false;
-                APP.gbGenerateVImage = false;
-                APP.gbGenerateBGWithoutVImage = false;
-                APP.gbGenerateBGWithImage = true;
+                PDFPath = PDFPath.Replace("/", "\\");
 
                 //初始页
-                int SPID = 0;
-
                 bool[] bPublishImageType = new bool[4];
-                bPublishImageType[0] = APP.gbGenerateBGWithVImage;
-                bPublishImageType[1] = APP.gbGenerateVImage;
-                bPublishImageType[2] = APP.gbGenerateBGWithoutVImage;
-                bPublishImageType[3] = APP.gbGenerateBGWithImage;
-                PDFPath = PDFPath.Replace("/", "\\");
-                string sGenerateResult = TMC.GenerateTmatrixCode_OID4(gKeyStr, PDFPath, SPID, APP.gPointType, bPublishImageType, APP.gPointDPI);
+                bPublishImageType[0] = false;
+                bPublishImageType[1] = false;
+                bPublishImageType[2] = false;
+                bPublishImageType[3] = true;
+
+                int[] gPointType = { 0, 0, 0, 0, 1 };
+                int[] gPointDPI = { 0, 0, 0, 0, 1 };
+
+                string sGenerateResult = TMC.GenerateTmatrixCode_OID4(
+                        gKeyStr,
+                        PDFPath,
+                        0,
+                        gPointType,
+                        bPublishImageType,
+                        gPointDPI
+                    );
                 if (sGenerateResult.Substring(0, 1) == "1")
                 {
                     Dispatcher.Invoke(() =>
@@ -6752,6 +6447,8 @@ namespace XHWK.WKTool
 
         #endregion TQL打印
 
+        #region 事件
+
         /// <summary>
         /// 打印
         /// </summary>
@@ -6766,7 +6463,7 @@ namespace XHWK.WKTool
             }
             BtnPrint.IsEnabled = false;
             Thread myThread = new Thread(StartPrint);
-            List<string> StrList = new List<string>();
+            PrintModel printmodel = new PrintModel();
 
             int ipdf = 102;
             string imgPath = FileToolsCommon.GetFileAbsolutePath("temp/");
@@ -6777,18 +6474,18 @@ namespace XHWK.WKTool
                 imgPath = tempImgPath + ipdf.ToString() + ".pdf";
                 ipdf++;
             }
-            StrList.Add(imgPath);
+            printmodel.filepath = imgPath;
             //打印数量
             int PrinterNum = Convert.ToInt32(txbNumberOfCopies.Content);
-            StrList.Add(PrinterNum.ToString());
+            printmodel.num = PrinterNum;
             //打印机名称
             string PrinterName = cmbClass.Text;
-            StrList.Add(PrinterName);
+            printmodel.printname = PrinterName;
             PrintMsg = "准备中";
             msgnum = 0;
             num = 0;
             GridPrintMask.Visibility = Visibility.Visible;
-            myThread.Start(StrList);
+            myThread.Start(printmodel);
             timesPrint = new System.Timers.Timer(100);
             timesPrint.Elapsed += Times_ElapsedClick;
             timesPrint.Start();
@@ -6798,6 +6495,136 @@ namespace XHWK.WKTool
             timesPrintMsg.Start();
         }
 
+        /// <summary>
+        /// 减
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnPrintLess_Click(object sender, RoutedEventArgs e)
+        {
+            int num = Convert.ToInt32(txbNumberOfCopies.Content);
+            if (num > 1)
+            {
+                num--;
+                txbNumberOfCopies.Content = num.ToString();
+            }
+        }
+
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnPrintAdd_Click(object sender, RoutedEventArgs e)
+        {
+            int num = Convert.ToInt32(txbNumberOfCopies.Content);
+            if (num > 0)
+            {
+                num++;
+                txbNumberOfCopies.Content = num.ToString();
+            }
+        }
+
+        /// <summary>
+        /// 打印说明
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnPrintExplain_Click(object sender, RoutedEventArgs e)
+        {
+            System.Diagnostics.Process.Start(FileToolsCommon.GetFileAbsolutePath("/星火微课点阵码打印及印刷指导手册.docx"));
+        }
+
+        #endregion 事件
+
+        #region 打印界面
+
+        /// <summary>
+        /// 下拉框数据源
+        /// </summary>
+        public DataTable data = new DataTable();
+
+        private DataTable dtComponentsUniqueNo;
+
+        /// <summary>
+        /// 打印进度
+        /// </summary>
+        private System.Timers.Timer timesPrint;
+
+        /// <summary>
+        /// 打印消息
+        /// </summary>
+        private System.Timers.Timer timesPrintMsg;
+
+        private double wit = 0;
+        private double hei = 0;
+
+        /// <summary>
+        /// 打印状态消息
+        /// </summary>
+        private string PrintMsg = "打印中";
+
+        /// <summary>
+        /// 打印初始化
+        /// </summary>
+        public void InitPrint()
+        {
+            ResizeMode = ResizeMode.NoResize;
+            List<string> defaList = LatticeFileHelper.GetPrinterList(out string defa);
+            if (defaList.Count > 0)
+            {
+                data.Columns.Add("Value");
+                data.Columns.Add("Key");
+                for (int i = 0; i < defaList.Count; i++)
+                {
+                    //创建一行
+                    DataRow row = data.NewRow();
+                    //将此行添加到table中
+                    data.Rows.Add(row);
+                    data.Rows[i]["Value"] = defaList[i];
+                    data.Rows[i]["Key"] = i.ToString();
+                }
+                dtComponentsUniqueNo = data.DefaultView.ToTable();
+                cmbClass.ItemsSource = dtComponentsUniqueNo.DefaultView;
+                cmbClass.SelectedIndex = 0;
+            }
+
+            Dictionary<int, int> dicItem = new Dictionary<int, int>();
+            dicItem.Add(0, 600);
+            dicItem.Add(1, 1200);
+            CbxDpi.ItemsSource = dicItem;
+            CbxDpi.SelectedIndex = 0;
+
+            Dictionary<int, string> dictypeItem = new Dictionary<int, string>();
+            dictypeItem.Add(0, "2x2");
+            dictypeItem.Add(1, "3x3");
+            dictypeItem.Add(2, "4x4");
+            CbxType.ItemsSource = dictypeItem;
+            CbxType.SelectedIndex = 0;
+            TQLInit();
+        }
+
+        /// <summary>
+        /// 初始化页面
+        /// </summary>
+        /// <param name="_imgPath"></param>
+        /// <param name="_wit"></param>
+        /// <param name="_hei"></param>
+        public void InitializePrint(string _imgPath, double _wit, double _hei)
+        {
+            wit = _wit;
+            hei = _hei;
+            if (!string.IsNullOrWhiteSpace(_imgPath))
+            {
+                imgPri.Source = new BitmapImage(new Uri(_imgPath));
+            }
+            else
+            {
+                imgPri.Source = null;
+            }
+            GridPrintMask.Visibility = Visibility.Collapsed;
+        }
+
         private int msgnum = 0;
 
         /// <summary>
@@ -6849,13 +6676,14 @@ namespace XHWK.WKTool
         /// </summary>
         private void StartPrint(object obj)
         {
+            PrintModel printModel = (PrintModel)obj;
             try
             {
                 document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0f, 0f, 0f, 0f);
                 PrintMsg = "生成文件";
                 msgnum = 0;
-                List<string> objStr1 = (List<string>)obj;
-                string SourcePath1 = objStr1[0];
+
+                string SourcePath1 = printModel.filepath;
                 try
                 {
                     SourcePath1 = SourcePath1.Replace("/", "\\");
@@ -6868,7 +6696,6 @@ namespace XHWK.WKTool
                     document.AddKeywords("Print");
 
                     document.AddHeader("TmatrixCode", "0");
-                    Thread.Sleep(300);
 
                     iTextSharp.text.pdf.PdfWriter.GetInstance(document, fs);
                 }
@@ -6928,12 +6755,8 @@ namespace XHWK.WKTool
                     image.Alignment = iTextSharp.text.Image.ALIGN_MIDDLE;
                     document.NewPage();
                     document.Add(image);
-                    //iTextSharp.text.Chunk c1 = new iTextSharp.text.Chunk("Hello World");
-                    //iTextSharp.text.Phrase p1 = new iTextSharp.text.Phrase();
-                    //p1.Leading = 150;      //行间距
-                    //document.Add(p1);
                 }
-                //Console.WriteLine("转换成功！");
+
                 document.Close();
             }
             catch (Exception ex)
@@ -6950,11 +6773,10 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("打印转换PDF失败，原因：" + ex.Message, ex);
             }
 
-            List<string> objStr = (List<string>)obj;
             //PDF位置
-            string SourcePath = objStr[0];
-            int PrinterNum = int.Parse(objStr[1]);
-            string PrinterName = objStr[2];
+            string SourcePath = printModel.filepath;
+            int PrinterNum = printModel.num;
+            string PrinterName = printModel.printname;
             PrintMsg = "铺码中";
             msgnum = 0;
             Thread.Sleep(500);
@@ -6967,6 +6789,7 @@ namespace XHWK.WKTool
 
                 try
                 {
+                    // 腾千里会根据原PDF的页数生成多个PDF文件
                     for (int i = 0; i < strs.Count(); i++)
                     {
                         timesPrint.Stop();
@@ -6976,7 +6799,8 @@ namespace XHWK.WKTool
                         timesPrint.Interval = 100;
                         timesPrint.Start();
                         string fileName = strs[i];
-                        Print(fileName, PrinterName, (short)PrinterNum);
+                        //打印文件
+                        Print2(fileName, PrinterName, (short)PrinterNum);
                     }
                 }
                 catch (Exception ex)
@@ -7073,6 +6897,8 @@ namespace XHWK.WKTool
         /// <param name="PrinterName">打印机名称</param>
         private void Print(string PDFPath, string PrinterName, short PrinterNum = 1)
         {
+            Console.WriteLine("PDFPath:" + PDFPath);
+            //PDFPath = "D:/123.pdf";
             //加载PDF文档
             PdfDocument doc = new PdfDocument();
             doc.LoadFromFile(PDFPath);
@@ -7091,10 +6917,46 @@ namespace XHWK.WKTool
 
             //设置打印份数为2份
             doc.PrintSettings.Copies = PrinterNum;
+
+            doc.PrintSettings.PrinterResolutionKind = PdfPrinterResolutionKind.High;
+            //获取原文档第一页的纸张大小,这里的单位是Point
+
+            doc.PrintSettings.SelectSinglePageLayout(PdfSinglePageScalingMode.ActualSize, true);
             //打印PDF文档
+
             doc.Print();
         }
 
+        private void Print2(string PDFPath, string PrinterName, short PrinterNum = 1)
+        {
+            PrintDocument pd = new PrintDocument();
+
+            Process p = new Process();
+
+            ProcessStartInfo startInfo = new ProcessStartInfo();
+
+            startInfo.CreateNoWindow = true;
+
+            startInfo.WindowStyle = ProcessWindowStyle.Hidden;
+
+            startInfo.UseShellExecute = true;
+
+            startInfo.FileName = PDFPath;
+
+            startInfo.Verb = "print";
+
+            Console.WriteLine("PrinterName:"+ PrinterName);
+            Console.WriteLine("pd.PrinterSettings.PrinterName", pd.PrinterSettings.PrinterName);
+
+            startInfo.Arguments = @"/p /h \" + PDFPath + "\"\"" + PrinterName + "\"";
+
+            p.StartInfo = startInfo;
+
+            p.Start();
+
+            p.WaitForExit();
+        }
+
         /// <summary>
         /// 生成图片
         /// </summary>
@@ -7151,47 +7013,7 @@ namespace XHWK.WKTool
             }
         }
 
-        /// <summary>
-        /// 减
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnPrintLess_Click(object sender, RoutedEventArgs e)
-        {
-            int num = Convert.ToInt32(txbNumberOfCopies.Content);
-            if (num > 1)
-            {
-                num--;
-                txbNumberOfCopies.Content = num.ToString();
-            }
-        }
-
-        /// <summary>
-        /// 新增
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnPrintAdd_Click(object sender, RoutedEventArgs e)
-        {
-            int num = Convert.ToInt32(txbNumberOfCopies.Content);
-            if (num > 0)
-            {
-                num++;
-                txbNumberOfCopies.Content = num.ToString();
-            }
-        }
-
-        /// <summary>
-        /// 打印说明
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnPrintExplain_Click(object sender, RoutedEventArgs e)
-        {
-            System.Diagnostics.Process.Start(FileToolsCommon.GetFileAbsolutePath("/星火微课点阵码打印及印刷指导手册.docx"));
-        }
-
-        #endregion 打印
+        #endregion 打印界面
 
         #region 设备检测
 

XHWK.WKTool/XHWK.WKTool.csproj

@@ -229,9 +229,6 @@
     <Compile Include="DeviceWindow.xaml.cs">
       <DependentUpon>DeviceWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="FileDirectoryWindow.xaml.cs">
-      <DependentUpon>FileDirectoryWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Helpers\BackgroundWorkerHelper.cs" />
     <Compile Include="Helpers\ScreenHelper.cs" />
     <Compile Include="Helpers\WpfHelper.cs" />
@@ -258,16 +255,16 @@
     <Compile Include="Models\AppModel.cs" />
     <Compile Include="Models\Direction.cs" />
     <Compile Include="Models\EntityBase.cs" />
+    <Compile Include="Models\FileDirectoryData.cs" />
+    <Compile Include="Models\FileDirectoryModel.cs" />
     <Compile Include="Models\Limit.cs" />
+    <Compile Include="Models\PrintModel.cs" />
     <Compile Include="Models\Tool.cs" />
     <Compile Include="license\MyLicense.cs" />
     <Compile Include="Models\DownloadInfoModel.cs" />
     <Compile Include="PracticeWindow.xaml.cs">
       <DependentUpon>PracticeWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PrintWindow.xaml.cs">
-      <DependentUpon>PrintWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="ProductVerification.xaml.cs">
       <DependentUpon>ProductVerification.xaml</DependentUpon>
     </Compile>
@@ -368,10 +365,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PrintWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="ProductVerification.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -416,10 +409,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="FileDirectoryWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="LoginWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

XHWK.WKTool/XHWK.WKTool.csproj.user

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

XHWK.WKTool/system/FFMpeg.cs

@@ -14,23 +14,22 @@ using VisioForge.Shared.NAudio.Wave;
 namespace Common.system
 {
     /// <summary>
-    /// ffmpeg帮助类
-    /// 创建人：赵耀
-    /// 创建时间：：2020年8月22日
-    /// 需要安装\SSCR\Setup Screen Capturer Recorder v0.12.10.exe
+    /// ffmpeg帮助类 创建人：赵耀 创建时间：：2020年8月22日 需要安装\SSCR\Setup Screen Capturer Recorder v0.12.10.exe
     /// 本地调试需要配置环境变量 将ffmpeg.exe位置配置到环境变量的path中
     /// </summary>
     public class FFMpeg
     {
         #region 变量
+
         public Process myProcess = null;
 
         /// <summary>
         /// 是否输出录课录屏日志
         /// </summary>
         public bool OutputVideoLog = FileToolsCommon.GetConfigValue("OutputVideoLog") != "0";
+
         /// <summary>
-        /// ffmpeg输出日志文件地址  每个文件2MB左右
+        /// ffmpeg输出日志文件地址 每个文件2MB左右
         /// </summary>
         private string LogPath = "";
 
@@ -43,7 +42,9 @@ namespace Common.system
         /// 是否可以录制麦克风
         /// </summary>
         private bool IsRecordMicrophone = true;
-        #endregion
+
+        #endregion 变量
+
         /// <summary>
         /// 录制屏幕
         /// </summary>
@@ -78,7 +79,9 @@ namespace Common.system
             {
                 MicrophoneName = GetMicrophoneName();
             }
+
             #region 检测麦克风扬声器
+
             string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
             FileToolsCommon.CreateDirectory(AudioPath);
             string audioSpeakerPath = AudioPath + "adoS" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";//FileToolsCommon.GetFileAbsolutePath("adoS.m");
@@ -90,7 +93,6 @@ namespace Common.system
             }
             catch (Exception)
             {
-
             }
             //是否录制音频
             if (RecordingSound)
@@ -121,7 +123,9 @@ namespace Common.system
                 }
                 StopRecordAudio(1);
             }
-            #endregion
+
+            #endregion 检测麦克风扬声器
+
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             string SpeakerStr = "";
             string MicrophoneStr = "";
@@ -140,30 +144,15 @@ namespace Common.system
             {
                 case ".MP4":
                     myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -framerate 6 -offset_x 0 -offset_y 0 -video_size " + size.Width + "x" + size.Height + " -i desktop -pix_fmt yuv420p -vf scale=trunc(iw/2)*2:trunc(ih/2)*2 -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
-                    //myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
-                    //if (string.IsNullOrWhiteSpace(MicrophoneName))
-                    //{
-                    //    myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 " + PathName;  //ffmpeg的参数
-                    //}
-                    //else
-                    //{
-                    //    myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" -f dshow -i audio=\"" +
-                    //        MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec h264 -preset:v ultrafast -tune:v zerolatency -acodec aac -ar 44100 -ac 2 " + PathName;  //ffmpeg的参数
-                    //}
+
                     break;
+
                 case ".AVI":
                 case ".FLV":
                     myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -framerate 6 -offset_x 0 -offset_y 0 -video_size " + size.Width + "x" + size.Height + " -i desktop -pix_fmt yuv420p -vf scale=trunc(iw/2)*2:trunc(ih/2)*2 -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac -f " + Extension.ToLower().Replace(".", "") + " " + PathName;
-                    //if (string.IsNullOrWhiteSpace(MicrophoneName))
-                    //{
-                    //    myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
-                    //}
-                    //else
-                    //{
-                    //    myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" -f dshow -i audio=\"" +
-                    //        MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec h264 -preset:v ultrafast -tune:v zerolatency -acodec aac -ar 44100 -ac 2 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
-                    //}
+
                     break;
+
                 default:
                     myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -framerate 6 -offset_x 0 -offset_y 0 -video_size " + size.Width + "x" + size.Height + " -i desktop -pix_fmt yuv420p -vf scale=trunc(iw/2)*2:trunc(ih/2)*2 -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
                     break;
@@ -229,7 +218,9 @@ namespace Common.system
             {
                 MicrophoneName = GetMicrophoneName();
             }
+
             #region 检测麦克风扬声器
+
             string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
             FileToolsCommon.CreateDirectory(AudioPath);
             string audioSpeakerPath = AudioPath + "adoS" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
@@ -241,7 +232,6 @@ namespace Common.system
             }
             catch (Exception)
             {
-
             }
             if (RecordingSound)
             {
@@ -278,10 +268,11 @@ namespace Common.system
                 {
                     ErrMessage = "无法录制麦克风，请关闭杀毒软件，确保麦克风处于可用状态!";
                     //return false;
-
                 }
             }
-            #endregion
+
+            #endregion 检测麦克风扬声器
+
             myProcess = new Process();
             LogPath = CreateffmpegLog();
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
@@ -349,7 +340,9 @@ namespace Common.system
                 myProcess.Close();//关闭进程
                 myProcess.Dispose();//释放资源
             }
+
             #region 进程是否已经释放
+
             bool IsRunning = true;
             while (IsRunning)
             {
@@ -361,7 +354,9 @@ namespace Common.system
                     Thread.Sleep(100);
                 }
             }
-            #endregion
+
+            #endregion 进程是否已经释放
+
             myProcess = null;
             return true;
             //myProcess.Kill();
@@ -387,7 +382,9 @@ namespace Common.system
             {
                 myProcess = null;
             }
+
             #region 进程是否已经释放
+
             bool IsRunning = true;
             while (IsRunning)
             {
@@ -399,7 +396,9 @@ namespace Common.system
                     Thread.Sleep(100);
                 }
             }
-            #endregion
+
+            #endregion 进程是否已经释放
+
             try
             {
                 myProcess = null;
@@ -426,10 +425,6 @@ namespace Common.system
         /// <param name="VideoHeight">视频高度</param>
         public bool SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight, out string ErrMessage)
         {
-            //new Thread(new ThreadStart(new Action(() =>
-            //{
-
-            //}))).Start();
             while (myProcess != null)
             {
                 Thread.Sleep(100);
@@ -437,7 +432,7 @@ namespace Common.system
             ErrMessage = null;
             string Extension = FileToolsCommon.GetIOExtension(VideoSavePath);//扩展名
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            //Debug.WriteLine(KillProcessArray.Length.ToString());
+       
             foreach (Process KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
@@ -445,10 +440,11 @@ namespace Common.system
             myProcess = new Process();
             try
             {
-
                 LogPath = CreateffmpegLog();
                 string mp3Str = "";
+
                 #region 判断音频是否存在
+
                 if (!string.IsNullOrWhiteSpace(Mp3Path))
                 {
                     if (FileToolsCommon.IsExistFile(Mp3Path))
@@ -456,7 +452,9 @@ namespace Common.system
                         mp3Str = "-i " + Mp3Path;
                     }
                 }
-                #endregion
+
+                #endregion 判断音频是否存在
+
                 myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
                 switch (Extension.ToUpper())
                 {
@@ -466,18 +464,21 @@ namespace Common.system
                             mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -vcodec mpeg4 " +
                             VideoSavePath;
                         break;
+
                     case ".AVI":
                         myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
                             ImageListPath + @"%d.png " +
                             mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -f AVI " +
                             VideoSavePath;
                         break;
+
                     case ".FLV":
                         myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
                             ImageListPath + @"%d.png " +
                             mp3Str + @" -s " + VideoWidth + "x" + VideoHeight + " -f FLV " +
                             VideoSavePath;
                         break;
+
                     default:
                         myProcess.StartInfo.Arguments = @"-y -r " + Frequency + " -i " +
                             ImageListPath + @"%d.png " +
@@ -520,7 +521,9 @@ namespace Common.system
                     return false;
                 }
                 myProcess.Dispose();               //释放资源
+
                 #region 进程是否已经释放
+
                 bool IsRunning = true;
                 while (IsRunning)
                 {
@@ -532,7 +535,9 @@ namespace Common.system
                         Thread.Sleep(100);
                     }
                 }
-                #endregion
+
+                #endregion 进程是否已经释放
+
                 myProcess = null;
                 //生成视频后删除图片和音频保存列表
                 //FileToolsCommon.DeleteDirectory(ImageListPath);
@@ -582,7 +587,9 @@ namespace Common.system
             //{
             //    KillProcess.Kill();
             //}
+
             #region 判断文件是否存在
+
             if (Extension.ToUpper() == ".MP3")
             {
                 if (!FileToolsCommon.IsExistFile(Path + "temp/filelist.d"))
@@ -597,7 +604,9 @@ namespace Common.system
                     return;
                 }
             }
-            #endregion
+
+            #endregion 判断文件是否存在
+
             myProcess = new Process();
             LogPath = CreateffmpegLog();
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
@@ -607,7 +616,6 @@ namespace Common.system
             }
             else
             {
-
                 myProcess.StartInfo.Arguments = "-f concat  -safe 0 -i " + Path + "temprs/filelist.d -c copy " + FilePath;
             }
             if (OutputVideoLog)
@@ -627,7 +635,9 @@ namespace Common.system
             myProcess.WaitForExit();           //阻塞等待进程结束
             myProcess.Close();                 //关闭进程
             myProcess.Dispose();               //释放资源
+
             #region 进程是否已经释放
+
             bool IsRunning = true;
             while (IsRunning)
             {
@@ -639,7 +649,9 @@ namespace Common.system
                     Thread.Sleep(100);
                 }
             }
-            #endregion
+
+            #endregion 进程是否已经释放
+
             myProcess = null;
             if (Extension.ToUpper() == ".MP3")
             {
@@ -693,7 +705,9 @@ namespace Common.system
             myProcess.WaitForExit();           //阻塞等待进程结束
             myProcess.Close();                 //关闭进程
             myProcess.Dispose();               //释放资源
+
             #region 进程是否已经释放
+
             bool IsRunning = true;
             while (IsRunning)
             {
@@ -705,7 +719,9 @@ namespace Common.system
                     Thread.Sleep(100);
                 }
             }
-            #endregion
+
+            #endregion 进程是否已经释放
+
             myProcess = null;
         }
 
@@ -768,6 +784,7 @@ namespace Common.system
             FileToolsCommon.AppendText(tempFilePath + "filelist.d", "file ./" + num + Extension + "\r\n");
             return CompleteFilePath;
         }
+
         /// <summary>
         /// 生成缩略图
         /// </summary>
@@ -816,7 +833,9 @@ namespace Common.system
                 myProcess.WaitForExit();           //阻塞等待进程结束
                 myProcess.Close();                 //关闭进程
                 myProcess.Dispose();               //释放资源
+
                 #region 进程是否已经释放
+
                 bool IsRunning = true;
                 while (IsRunning)
                 {
@@ -828,7 +847,9 @@ namespace Common.system
                         Thread.Sleep(100);
                     }
                 }
-                #endregion
+
+                #endregion 进程是否已经释放
+
                 myProcess = null;
                 return true;
             }
@@ -838,6 +859,7 @@ namespace Common.system
                 return false;
             }
         }
+
         /// <summary>
         /// 视频转码
         /// </summary>
@@ -881,7 +903,9 @@ namespace Common.system
                 myProcess.WaitForExit();           //阻塞等待进程结束
                 myProcess.Close();                 //关闭进程
                 myProcess.Dispose();               //释放资源
+
                 #region 进程是否已经释放
+
                 bool IsRunning = true;
                 while (IsRunning)
                 {
@@ -893,7 +917,9 @@ namespace Common.system
                         Thread.Sleep(100);
                     }
                 }
-                #endregion
+
+                #endregion 进程是否已经释放
+
                 myProcess = null;
                 Thread.Sleep(200);
                 FileToolsCommon.DeleteFile(VideoPathName);
@@ -959,15 +985,17 @@ namespace Common.system
             }
         }
 
-
         #region 麦克风声卡检测
+
         #region 获取麦克风
+
         private bool IsMicrophone = false;
 
         /// <summary>
         /// 使用FFmpeg获取的麦克风名
         /// </summary>
         private string MicrophoneNameInfo = "";
+
         /// <summary>
         /// 获取麦克风名称
         /// </summary>
@@ -1011,6 +1039,7 @@ namespace Common.system
             //    return FullName;
             //}
         }
+
         /// <summary>
         /// 获取麦克风列表
         /// </summary>
@@ -1019,6 +1048,7 @@ namespace Common.system
         {
             return GetAudioInDevicesList();
         }
+
         /// <summary>
         /// 使用FFmpeg获取设备名称--待定
         /// </summary>
@@ -1029,7 +1059,6 @@ namespace Common.system
             {
                 try
                 {
-
                     while (myProcess != null)
                     {
                         Thread.Sleep(100);
@@ -1061,9 +1090,9 @@ namespace Common.system
                 {
                     LogHelper.WriteErrLog("【获取设备信息】（GetMToFFmpeg）信息获取失败：" + ex.Message, ex);
                 }
-
             }))).Start();
         }
+
         /// <summary>
         /// 使用FFmpeg获取设备名称--待定
         /// </summary>
@@ -1081,13 +1110,17 @@ namespace Common.system
                         MicrophoneNameInfo = MicrophoneNameInfo.Substring(MicrophoneNameInfo.IndexOf("]") + 1);
                         MicrophoneNameInfo = MicrophoneNameInfo.Replace("\"", "");
                         MicrophoneNameInfo = MicrophoneNameInfo.Trim();
+
                         #region 测试
+
                         //byte[] bufferASCII = Encoding.Default.GetBytes(MicrophoneNameInfo);
                         //MicrophoneNameInfo = Encoding.UTF8.GetString(bufferASCII); // 统一使用UTF-8
                         ////System.Text.Encoding GB2312 = System.Text.Encoding.GetEncoding("GB2312");
                         ////byte[] gb = GB2312.GetBytes(MicrophoneNameInfo);
                         ////MicrophoneNameInfo = Encoding.UTF8.GetString(gb);
-                        #endregion
+
+                        #endregion 测试
+
                         IsMicrophone = false;
                         FileToolsCommon.AppendText(LogPath, e.Data);
                         //FileToolsCommon.AppendText(LogPath, "\r\n***************************************************\r\n");
@@ -1139,6 +1172,7 @@ namespace Common.system
                 return "";
             }
         }
+
         /// <summary>
         /// AForge获取麦克风列表
         /// </summary>
@@ -1164,8 +1198,9 @@ namespace Common.system
             }
             return devicesList;
         }
+
         /// <summary>
-        /// 获取声音输入设备名称   不完整
+        /// 获取声音输入设备名称 不完整
         /// </summary>
         /// <returns></returns>
         public static string GetInDeviceName()
@@ -1190,6 +1225,7 @@ namespace Common.system
                 return "";
             }
         }
+
         /// <summary>
         /// 获取声音输入设备完整名称
         /// </summary>
@@ -1229,6 +1265,7 @@ namespace Common.system
                 return "";
             }
         }
+
         /// <summary>
         /// 获取声音输入设备完整名称列表
         /// </summary>
@@ -1259,6 +1296,7 @@ namespace Common.system
             }
             return devices;
         }
+
         /// <summary>
         /// 获取麦克风---废弃
         /// </summary>
@@ -1275,7 +1313,6 @@ namespace Common.system
                 {
                     try
                     {
-
                         if (device.FriendlyName.StartsWith(deviceInfo.ProductName))
                         {
                             devs.Add(device.FriendlyName);
@@ -1284,7 +1321,6 @@ namespace Common.system
                     }
                     catch (Exception)
                     {
-
                     }
                 }
             }
@@ -1297,7 +1333,8 @@ namespace Common.system
                 return "";
             }
         }
-        #endregion
+
+        #endregion 获取麦克风
 
         #region 录音
 
@@ -1351,27 +1388,29 @@ namespace Common.system
         //            }
         //            catch (Exception)
         //            {
-
         //            }
         //        };
         //        waveIn.StartRecording();
         //    }
         //    catch (Exception ex)
         //    {
-
         //        throw;
         //    }
         //}
-        #endregion
+
+        #endregion 录音
+
         #region 检测是否可用
+
         /// <summary>
         /// 录制麦克风的声音
         /// </summary>
         private WaveInEvent waveIn = null; //new WaveInEvent();
+
         /// <summary>
         /// 开始录制麦克风
         /// </summary>
-        public bool StartRecordAudio(string audioFile, string DeviceName = "", bool IsStopDelFile=true)
+        public bool StartRecordAudio(string audioFile, string DeviceName = "", bool IsStopDelFile = true)
         {
             try
             {
@@ -1408,7 +1447,6 @@ namespace Common.system
                     }
                     catch (Exception)
                     {
-
                     }
                 };
                 waveIn.StartRecording();
@@ -1464,7 +1502,6 @@ namespace Common.system
             }
         }
 
-
         /// <summary>
         /// 录制扬声器的声音
         /// </summary>
@@ -1497,7 +1534,6 @@ namespace Common.system
                     }
                     catch (Exception)
                     {
-
                     }
                 };
                 capture.StartRecording();
@@ -1509,7 +1545,9 @@ namespace Common.system
                 return false;
             }
         }
-        #endregion
-        #endregion
+
+        #endregion 检测是否可用
+
+        #endregion 麦克风声卡检测
     }
-}
+}

XHWK.WKTool/system/ImageHelper.cs

@@ -11,9 +11,7 @@ using System.Windows.Media.Imaging;
 namespace Common.system
 {
     /// <summary>
-    /// 图片帮助类
-    /// 创建人：赵耀
-    /// 创建时间：2018年11月1日
+    /// 图片帮助类 创建人：赵耀 创建时间：2018年11月1日
     /// </summary>
     public class ImageHelper
     {
@@ -30,9 +28,9 @@ namespace Common.system
                 {
                     FileStream fs = File.OpenRead(path); //OpenRead
                     int filelength = 0;
-                    filelength = (int)fs.Length; //获得文件长度 
-                    byte[] image = new byte[filelength]; //建立一个字节数组 
-                    fs.Read(image, 0, filelength); //按字节流读取 
+                    filelength = (int)fs.Length; //获得文件长度
+                    byte[] image = new byte[filelength]; //建立一个字节数组
+                    fs.Read(image, 0, filelength); //按字节流读取
                     System.Drawing.Image result = System.Drawing.Image.FromStream(fs);
                     fs.Close();
                     Bitmap bit = new Bitmap(result);
@@ -48,6 +46,7 @@ namespace Common.system
                 return null;
             }
         }
+
         /// <summary>
         /// 通过FileStream 来打开文件，这样就可以实现不锁定Image文件，到时可以让多用户同时访问Image文件
         /// </summary>
@@ -61,9 +60,9 @@ namespace Common.system
                 {
                     FileStream fs = File.OpenRead(path); //OpenRead
                     int filelength = 0;
-                    filelength = (int)fs.Length; //获得文件长度 
-                    byte[] image = new byte[filelength]; //建立一个字节数组 
-                    fs.Read(image, 0, filelength); //按字节流读取 
+                    filelength = (int)fs.Length; //获得文件长度
+                    byte[] image = new byte[filelength]; //建立一个字节数组
+                    fs.Read(image, 0, filelength); //按字节流读取
                     System.Drawing.Image result = System.Drawing.Image.FromStream(fs);
                     fs.Close();
                     return result;
@@ -78,6 +77,7 @@ namespace Common.system
                 return null;
             }
         }
+
         /// <summary>
         /// 通过FileStream 来打开文件，这样就可以实现不锁定Image文件，到时可以让多用户同时访问Image文件
         /// </summary>
@@ -107,6 +107,7 @@ namespace Common.system
                 return null;
             }
         }
+
         #region 获取RGB
 
         private static Bitmap _Bitmap = null;
@@ -138,6 +139,7 @@ namespace Common.system
         #endregion 获取RGB
 
         #region 截图统一方法
+
         /// <summary>
         /// 截图通用方法 创建人：赵耀 创建时间：2020年8月11日
         /// </summary>
@@ -180,7 +182,6 @@ namespace Common.system
                 }
                 if (IsRetImg)
                 {
-
                     Uri uri = new Uri(ImageSavePath, UriKind.Absolute);
                     bitmapimg = new BitmapImage(uri);
                 }
@@ -193,6 +194,7 @@ namespace Common.system
                 return false;
             }
         }
+
         /// <summary>
         /// 获取临时图片保存位置
         /// </summary>
@@ -206,6 +208,7 @@ namespace Common.system
             TempPath += Convert.ToInt64(ts.TotalMilliseconds).ToString() + ".jpg";
             return TempPath;
         }
+
         #endregion 截图统一方法
 
         #region 图片压缩
@@ -389,9 +392,11 @@ namespace Common.system
                 ob.Dispose();
             }
         }
+
         #endregion 图片压缩
 
         #region 截屏指定UI控件
+
         /// <summary>
         /// 保存图片
         /// </summary>
@@ -403,6 +408,7 @@ namespace Common.system
         /// <param name="ImgHeight">转换后高</param>
         public static void SaveUI(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
         {
+            Console.WriteLine("截图的路径为:" + filePathName);
             try
             {
                 //在位图中呈现UI元素
@@ -429,9 +435,6 @@ namespace Common.system
                         Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
                         try
                         {
-                            //MemoryStream memoryStream = new MemoryStream(data);
-                            //Bitmap bit = (Bitmap)Image.FromStream(memoryStream);
-
                             MemoryStream memoryStream = new MemoryStream();
                             encoder.Save(memoryStream);
                             Bitmap bit = new Bitmap(memoryStream, true);
@@ -476,10 +479,20 @@ namespace Common.system
             }
             catch (Exception)
             {
-
             }
         }
 
+        public static void SaveUI2(FrameworkElement frameworkElement, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
+        {
+            System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
+            RenderTargetBitmap bmp = new RenderTargetBitmap((int)frameworkElement.ActualWidth, (int)frameworkElement.ActualHeight, 1 / 96, 1 / 96, PixelFormats.Default);
+            bmp.Render(frameworkElement);
+            BitmapEncoder encoder = new PngBitmapEncoder();
+            encoder.Frames.Add(BitmapFrame.Create(bmp));
+            encoder.Save(fs);
+            fs.Close();
+        }
+
         /// <summary>
         /// 保存图片
         /// </summary>
@@ -528,10 +541,7 @@ namespace Common.system
                                 Img = bit;
                             }
                             Img.Save(filePathName);
-                            //Bitmap bitmap = CutImageWhitePart(Img);
-                            //FileToolsCommon.DeleteFile(filePathName);
-                            //bitmap.Save(filePathName);
-                            //bitmap.Dispose();
+
                             memoryStream.Dispose();
                             Img.Dispose();
                             bit.Dispose();
@@ -539,25 +549,10 @@ namespace Common.system
                     }
                     catch (Exception)
                     {
-
                     }
                 }
                 else
                 {
-                    //SaveImageModel sim = new SaveImageModel();
-                    //sim.encoder = new PngBitmapEncoder();
-                    //sim.encoder = new PngBitmapEncoder();
-                    //BitmapFrame test= encoder.Frames[0];
-                    //sim.encoder.Frames.Add(BitmapFrame.Create(test));
-                    ////sim.encoder.Frames[0].CopyTo(encoder.Frames[0]);
-                    ////sim.encoder.CopyTo(encoder);
-                    ////encoder.CopyTo(sim.encoder);
-                    //sim.FilePath = filePathName;
-                    ////sim.bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
-                    ////bmp.CopyTo(sim.bmp);
-                    //Thread t1 = new Thread(SaveImage);
-                    //t1.Start(sim);
-
                     System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
                     encoder.Save(fs);
                     fs.Close();
@@ -569,63 +564,7 @@ namespace Common.system
                 //Console.WriteLine(ex.Message);
             }
         }
-        public static void SaveUI1(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
-        {
-            try
-            {
-                //在位图中呈现UI元素
-                RenderTargetBitmap bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
-                bmp.Render(ui);
-
-                //BitmapEncoder encoder = new PngBitmapEncoder();
-                //encoder.Frames.Add(BitmapFrame.Create(bmp));
-
-                //BitmapSource bitmapSource= bmp.Clone();
-
-
 
-                //定义切割矩形
-                var cut = new Int32Rect(0, 0, width, height);
-                //计算Stride
-                var stride = bmp.Format.BitsPerPixel * cut.Width / 8;
-                //声明字节数组
-                byte[] data = new byte[cut.Height * stride];
-
-                //调用CopyPixels
-                bmp.CopyPixels(cut, data, stride, 0);
-                new Thread(new ThreadStart(new Action(() =>
-                {
-                    BitmapSource bitmapSource = BitmapSource.Create(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Bgr32, null, data, stride);
-
-                    BitmapEncoder encoder = new PngBitmapEncoder();
-                    encoder.Frames.Add(BitmapFrame.Create(bitmapSource));
-
-                    using (var stream = new FileStream(filePathName, FileMode.Create))
-                    {
-                        encoder.Save(stream);
-                    }
-                }))).Start();
-                //SaveModel saveModel = new SaveModel();
-                //saveModel.ImgWidth = ImgWidth;
-                //saveModel.ImgHeight = ImgHeight;
-                //saveModel.filePathName = filePathName;
-                //saveModel.bmp = bmp;
-                //saveModel.encoder =new PngBitmapEncoder();
-                //foreach (BitmapFrame eitem in encoder.Frames)
-                //{
-                //    saveModel.encoder = new PngBitmapEncoder();
-                //    saveModel.encoder.Frames.Add( eitem );
-                //}
-
-                //Thread myThread = new Thread(SaveImage);
-                //myThread.Start(saveModel);
-            }
-            catch (Exception)
-            {
-
-            }
-
-        }
         public static void SaveImage(object model)
         {
             try
@@ -679,7 +618,6 @@ namespace Common.system
                     }
                     catch (Exception)
                     {
-
                     }
                 }
                 else
@@ -705,9 +643,9 @@ namespace Common.system
             }
             catch (Exception)
             {
-
             }
         }
+
         /// <summary>
         /// 截图转换成bitmap
         /// </summary>
@@ -782,6 +720,7 @@ namespace Common.system
 
             return bmp;
         }
+
         private static void SaveImage1(object obj)
         {
             SaveImageModel sim = (SaveImageModel)obj;
@@ -795,9 +734,10 @@ namespace Common.system
             fs.Close();
         }
 
-        #endregion
+        #endregion 截屏指定UI控件
 
         #region 去掉白边
+
         /// <summary>
         /// 裁剪图片（去掉白边）
         /// </summary>
@@ -903,7 +843,6 @@ namespace Common.system
                 //cloneBitmap.Save(@"d:\123.png", ImageFormat.Png);
                 return cloneBitmap;
             }
-
         }
 
         /// <summary>
@@ -919,14 +858,17 @@ namespace Common.system
 
             return false;
         }
-        #endregion
+
+        #endregion 去掉白边
     }
+
     public class SaveImageModel
     {
         public string FilePath { get; set; }
         public BitmapEncoder encoder { get; set; }
         //public RenderTargetBitmap bmp { get; set; }
     }
+
     public class SaveModel
     {
         public int ImgWidth { get; set; }
@@ -935,4 +877,4 @@ namespace Common.system
         public string filePathName { get; set; }
         public RenderTargetBitmap bmp { get; set; }
     }
-}
+}