代码优化

XHWK.WKTool/App.config

@@ -5,7 +5,7 @@
   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="0" />
+    <add key="IsDebug" value="1" />
     <!--版本号-->
     <add key="VersionCode" value="133" />
     <add key="VersionName" value="3.13.6" />

XHWK.WKTool/App.xaml.cs

@@ -1,5 +1,7 @@
 using ComeCapture;
+
 using Common.system;
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -9,6 +11,7 @@ using System.Reflection;
 using System.Security.Principal;
 using System.Threading.Tasks;
 using System.Windows;
+
 using XHWK.Model;
 using XHWK.WKTool.Helpers;
 using XHWK.WKTool.Skin;
@@ -16,7 +19,9 @@ using XHWK.WKTool.Skin;
 namespace XHWK.WKTool
 {
     using System.Runtime.InteropServices;
+
     using system;
+
     using XHWK.WKTool.Utils;
 
     public partial class App
@@ -26,7 +31,7 @@ namespace XHWK.WKTool
         #region 更新需改动
 
         /// <summary>
-        /// 是否为测试版
+        ///     是否为测试版
         /// </summary>
         public static bool isDebug = FileToolsCommon.GetConfigValue("IsDebug") != "0";
 
@@ -35,32 +40,32 @@ namespace XHWK.WKTool
         #region 接口地址
 
         /// <summary>
-        /// 是否为校外接口
+        ///     是否为校外接口
         /// </summary>
         public static bool IsOutsideSchool = FileToolsCommon.GetConfigValue("IsOutsideSchool") == "1";
 
         /// <summary>
-        /// 服务地址
+        ///     服务地址
         /// </summary>
         public static ModelServiceAddress ServiceAddress;
 
         /// <summary>
-        /// 接口地址
+        ///     接口地址
         /// </summary>
         public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";
 
         /// <summary>
-        /// 图片地址
+        ///     图片地址
         /// </summary>
         public static string uploadUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/" : "http://schoolfile.xhkjedu.com/";
 
         /// <summary>
-        /// 展示文件
+        ///     展示文件
         /// </summary>
         public static string showImageUrl = isDebug ? "http://schoolstatictest.xhkjedu.com/static/" : "http://schoolstatic.xhkjedu.com/static/";
 
         /// <summary>
-        /// 认证接口地址
+        ///     认证接口地址
         /// </summary>
         public static string certapiUrl = isDebug ? "http://scapitest.xhkjedu.com" : "http://scapi.xhkjedu.com";
 
@@ -69,37 +74,37 @@ namespace XHWK.WKTool
         #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黑色
+        ///     皮肤样式 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 = "";
 
@@ -108,64 +113,64 @@ namespace XHWK.WKTool
         #region 记录数据
 
         /// <summary>
-        /// 全局页面数据变量
+        ///     全局页面数据变量
         /// </summary>
         public static readonly ModelPage PageContextData = new Model.ModelPage();
 
         /// <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 ModelUserInfo UserInfo;
 
         /// <summary>
-        /// 接口返回消息
+        ///     接口返回消息
         /// </summary>
         public static string ServerMsg = string.Empty;
 
         /// <summary>
-        /// 登录状态 false 未登录 true已登录
+        ///     登录状态 false 未登录 true已登录
         /// </summary>
         public static bool IsLoginType = false;
 
         /// <summary>
-        /// 截图地址
+        ///     截图地址
         /// </summary>
         public static string ImgPath = string.Empty;
 
         /// <summary>
-        /// 教材列表
+        ///     教材列表
         /// </summary>
         public static List<ModelTsubjectbookList> TsubjectbookList = null;
 
         /// <summary>
-        /// 章节列表
+        ///     章节列表
         /// </summary>
         public static List<ModelDirectorList> DirectorList = null;
 
         /// <summary>
-        /// 上传个人空间 入参
+        ///     上传个人空间 入参
         /// </summary>
         public static ModelResourceAddTwo ResourceAddTwo = null;
 
         /// <summary>
-        /// 是否正在上传
+        ///     是否正在上传
         /// </summary>
         public static bool IsUpLoad = false;
 
@@ -174,22 +179,22 @@ namespace XHWK.WKTool
         #region 微课数据记录
 
         /// <summary>
-        /// 用户微课列表模型
+        ///     用户微课列表模型
         /// </summary>
         public static List<ModelWkData> WKDataList;
 
         /// <summary>
-        /// 微课模型
+        ///     微课模型
         /// </summary>
         public static ModelWkData WKData;
 
         /// <summary>
-        /// 微课视频列表
+        ///     微课视频列表
         /// </summary>
         public static List<ModelVideo> VideoList;
 
         /// <summary>
-        /// 画板模型
+        ///     画板模型
         /// </summary>
         public static List<ModelDrawData> PageDrawList = new List<ModelDrawData>();
 
@@ -198,17 +203,17 @@ namespace XHWK.WKTool
         #region 点阵笔
 
         /// <summary>
-        /// 笔序号
+        ///     笔序号
         /// </summary>
         public static string PenSerial;
 
         /// <summary>
-        /// 笔状态，是否已连接
+        ///     笔状态，是否已连接
         /// </summary>
         public static bool PenStatus = false;
 
         /// <summary>
-        /// 手写板状态，是否已连接
+        ///     手写板状态，是否已连接
         /// </summary>
         public static bool BoardStatus = false;
 
@@ -221,12 +226,12 @@ namespace XHWK.WKTool
         ///// </summary>
         //public static DAL_TmatrixCode dAL_TmatrixCode;
         /// <summary>
-        /// 腾千里手写笔事件
+        ///     腾千里手写笔事件
         /// </summary>
         public static PenEvents TQLPenevents;
 
         /// <summary>
-        /// 腾千里手写笔是否已连接
+        ///     腾千里手写笔是否已连接
         /// </summary>
         public static bool TQLPenStatus = false;
 
@@ -250,57 +255,57 @@ namespace XHWK.WKTool
         #region 页面
 
         /// <summary>
-        /// 主页面
+        ///     主页面
         /// </summary>
         public static MainWindow W_XHMicroLessonSystemWindow = 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 PromptWindow W_PromptWindow = null;
 
         /// <summary>
-        /// loding页面
+        ///     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;
 
@@ -365,7 +370,7 @@ namespace XHWK.WKTool
                     }
                     //退出
                     //Current.Shutdown();
-                    Application.Current.Shutdown();
+                    Current.Shutdown();
                 }
             }
             catch (Exception ex)
@@ -389,23 +394,23 @@ namespace XHWK.WKTool
             Process current = Process.GetCurrentProcess();
             //获取欲启动进程名
             string strProcessName = Process.GetCurrentProcess().ProcessName;
-            var processList = Process.GetProcessesByName(strProcessName);
+            Process[] processList = Process.GetProcessesByName(strProcessName);
             if (processList.Length <= 1)
             {
                 return;
             }
             MessageWindow.Show("当前程序已在运行，请勿重复运行。");
-            foreach (var process in processList)
+            foreach (Process process in processList)
             {
                 if (process.Id == current.Id) continue;
                 int hWnd = FindWindow(null, process.MainWindowTitle);
                 SetForegroundWindow(hWnd);
             }
-            Application.Current.Shutdown(); //退出新打开的程序
+            Current.Shutdown(); //退出新打开的程序
         }
 
         /// <summary>
-        /// 杀死正在运行的ffmpeg
+        ///     杀死正在运行的ffmpeg
         /// </summary>
         public static void Killffmpeg()
         {
@@ -434,8 +439,7 @@ namespace XHWK.WKTool
         {
             try
             {
-                var exception = e.Exception as Exception;
-                if (exception != null)
+                if (e.Exception is Exception exception)
                 {
                     HandleException(exception);
                 }
@@ -493,7 +497,7 @@ namespace XHWK.WKTool
         #region 数据保存和读取
 
         /// <summary>
-        /// 保存微课信息
+        ///     保存微课信息
         /// </summary>
         public static void SaveWkData()
         {
@@ -524,7 +528,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 读取微课信息
+        ///     读取微课信息
         /// </summary>
         public static void ReadWkData(string wkPath)
         {
@@ -559,7 +563,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 保存画板数据
+        ///     保存画板数据
         /// </summary>
         public static void SaveDraw()
         {
@@ -586,7 +590,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 读取文件
+        ///     读取文件
         /// </summary>
         public static void ReadDrawData()
         {
@@ -615,7 +619,7 @@ namespace XHWK.WKTool
         #region 服务地址数据
 
         /// <summary>
-        /// 服务地址存储到本地
+        ///     服务地址存储到本地
         /// </summary>
         public static void SaveServiceAddressData()
         {
@@ -640,7 +644,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 从本地读取服务地址
+        ///     从本地读取服务地址
         /// </summary>
         public static void ReadServiceAddressData()
         {
@@ -665,7 +669,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 切换校内外网
+        ///     切换校内外网
         /// </summary>
         public static void SwitchAddress()
         {
@@ -684,7 +688,7 @@ namespace XHWK.WKTool
         #endregion 服务地址数据
 
         /// <summary>
-        /// 内存释放压缩
+        ///     内存释放压缩
         /// </summary>
         /// <param name="e">
         /// </param>
@@ -704,4 +708,4 @@ namespace XHWK.WKTool
             Environment.Exit(0);
         }
     }
-}
+}

XHWK.WKTool/AppUpdateWin.xaml

@@ -21,7 +21,7 @@
         <views:ZClippingBorder
             Margin="0"
             Background="#fafafa"
-            BorderBrush="#3f6fff"
+            BorderBrush="#4597FF"
             BorderThickness="1"
             CornerRadius="0">
 
@@ -102,7 +102,7 @@
                                     BorderBrush="{TemplateBinding Control.BorderBrush}"
                                     BorderThickness="0"
                                     CornerRadius="21">
-                                    <Border.Background>#3f6fff</Border.Background>
+                                    <Border.Background>#4597FF</Border.Background>
                                     <ContentPresenter
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
@@ -140,7 +140,7 @@
                                 x:Name="Mprogress"
                                 BorderThickness="0"
                                 Cursor=""
-                                Foreground="#3f6fff"
+                                Foreground="#4597FF"
                                 Maximum="100"
                                 Minimum="0" />
                         </views:ZClippingBorder>

XHWK.WKTool/CountdownWindow.xaml

@@ -19,13 +19,13 @@
     <Grid>
 
         <Image
-            x:Name="imgLoding"
+            x:Name="ImgLoding"
             Width="300"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Source=".\Images\countdown3_1.png" />
         <Border
-            x:Name="borShortcut"
+            x:Name="BorShortcut"
             Width="550"
             Height="60"
             Margin="0,450,0,0"
@@ -34,7 +34,7 @@
             Opacity="0.3"
             Visibility="Hidden" />
         <Label
-            x:Name="lblShortcut"
+            x:Name="LblShortcut"
             Height="60"
             Margin="0,450,0,0"
             HorizontalContentAlignment="Center"

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -10,7 +10,7 @@ namespace XHWK.WKTool
     using System.Threading.Tasks;
 
     /// <summary>
-    /// 录屏等待 CountdownWindow.xaml 的交互逻辑
+    ///     录屏等待 CountdownWindow.xaml 的交互逻辑
     /// </summary>
     public partial class CountdownWindow
     {
@@ -19,20 +19,20 @@ namespace XHWK.WKTool
         public CountdownWindow()
         {
             InitializeComponent();
-            foreach (var imgName in _imgNames)
+            foreach (string imgName in _imgNames)
             {
                 _images.Add(new BitmapImage(new Uri("pack://application:,,/Images/" + imgName)));
             }
         }
 
         /// <summary>
-        /// 计时器
+        ///     计时器
         /// </summary>
         private int _imgNum = 22;
 
         public void InitAndShow(bool showlblShortcut = false, int changeTime = 3000)
         {
-            imgLoding.Source = _images.Last();
+            ImgLoding.Source = _images.Last();
             Init(showlblShortcut, changeTime);
             Show();
         }
@@ -43,13 +43,13 @@ namespace XHWK.WKTool
         {
             if (showlblShortcut)
             {
-                lblShortcut.Visibility = Visibility.Visible;
-                borShortcut.Visibility = Visibility.Visible;
+                LblShortcut.Visibility = Visibility.Visible;
+                BorShortcut.Visibility = Visibility.Visible;
             }
             else
             {
-                lblShortcut.Visibility = Visibility.Hidden;
-                borShortcut.Visibility = Visibility.Hidden;
+                LblShortcut.Visibility = Visibility.Hidden;
+                BorShortcut.Visibility = Visibility.Hidden;
             }
             _imgNum = 22;
             _timer = new System.Timers.Timer();
@@ -63,12 +63,11 @@ namespace XHWK.WKTool
 
         private void _timer_Disposed(object sender, EventArgs e)
         {
-            Dispatcher.Invoke
-            (
+            Dispatcher.Invoke(
                 async () =>
                 {
                     // 执行操作
-                    imgLoding.Source = null;
+                    ImgLoding.Source = null;
                     await Task.Delay(300);
                     Hide();
                 },
@@ -80,12 +79,11 @@ namespace XHWK.WKTool
         {
             if (_imgNum >= 0)
             {
-                Dispatcher.Invoke
-                (
+                Dispatcher.Invoke(
                     () =>
                     {
                         // 执行操作
-                        imgLoding.Source = _images[_imgNum];
+                        ImgLoding.Source = _images[_imgNum];
                     },
                     DispatcherPriority.Send
                 );
@@ -125,4 +123,4 @@ namespace XHWK.WKTool
             "countdown3_1.png",
         };
     }
-}
+}

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -1,371 +0,0 @@
-using Common.system;
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Forms;
-using System.Windows.Input;
-
-using XHWK.Model;
-
-namespace XHWK.WKTool
-{
-    using system;
-    using Application = System.Windows.Application;
-
-    /// <summary>
-    /// 创建微课
-    /// </summary>
-    public partial class CreateAMicroLessonWindow
-    {
-        #region 字段
-
-        private FolderBrowserDialog _ofd;
-        private DialogResult _result;
-
-        #endregion 字段
-
-        /// <summary>
-        /// 创建微课
-        /// </summary>
-        public CreateAMicroLessonWindow()
-        {
-            InitializeComponent();
-            ResizeMode = ResizeMode.NoResize;
-            TxbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
-            var versionCode = FileToolsCommon.GetConfigValue("VersionCode");
-            var versionName = FileToolsCommon.GetConfigValue("VersionName");
-            var isDebug = FileToolsCommon.GetConfigValue("IsDebug");
-            var debugStr = "测试版";
-            if (isDebug == "1")
-            {
-                debugStr = "测试版";
-            }
-            else if (isDebug == "0")
-            {
-                debugStr = "正式版";
-            }
-            VersionLabel.Content = debugStr + " v" + versionName + "(" + versionCode + ")";
-            LoadingCarouseImg();
-        }
-
-        #region 轮播图
-
-        /// <summary>
-        /// 图片宽度，每次切换的宽度
-        /// </summary>
-        private double _imgWidth = 502.00;
-
-        /// <summary>
-        /// 轮播时移动增加的宽度
-        /// </summary>
-        private double _imgMove = 1;
-
-        /// <summary>
-        /// 当前展示的图片序号Index从0开始
-        /// </summary>
-        private int _imgNumIndex;
-
-        /// <summary>
-        /// 加载录播图
-        /// </summary>
-        private void LoadingCarouseImg()
-        {
-            new Thread(() =>
-            {
-                Thread.Sleep(3000);
-                Dispatcher.Invoke(() =>
-                {
-                    _imgWidth = ImgCarouse1.ActualWidth;
-                    _imgMove = _imgWidth / 250.00;
-                    CarouseImg();
-                    //timesCarouse = new System.Timers.Timer(2000);
-                    //timesCarouse.Elapsed += TimesCarouse_Elapsed; ;
-                    //timesCarouse.Start();
-                });
-            }).Start();
-        }
-
-        /// <summary>
-        /// 轮播图
-        /// </summary>
-        private void CarouseImg()
-        {
-            new Thread(() =>
-            {
-                while (true)
-                {
-                    for (double i = _imgMove; i < _imgWidth; i += _imgMove)
-                    {
-                        var i1 = i;
-                        Dispatcher.Invoke(() =>
-                        {
-                            if (Math.Abs(
-                                    i1 + _imgMove) < _imgWidth)
-                            {
-                                //图片移动轮播
-                                SplCarouse.Margin = new Thickness(SplCarouse.Margin.Left - _imgMove, 0, 0, 0);
-                            }
-                            else
-                            {
-                                if (_imgNumIndex >= 2)
-                                {
-                                    _imgNumIndex = 0;
-                                    SplCarouse.Margin = new Thickness(0, 0, 0, 0);
-                                }
-                                else
-                                {
-                                    _imgNumIndex++;
-                                    SplCarouse.Margin = new Thickness(-(_imgNumIndex * _imgWidth), 0, 0, 0);
-                                }
-                            }
-                        });
-                        Thread.Sleep(3);
-                    }
-
-                    bool isBreak = false;
-                    Dispatcher.Invoke(() =>
-                    {
-                        if (this.Visibility != Visibility.Visible)
-                        {
-                            SplCarouse.Margin = new Thickness(0);
-                            isBreak = true;
-                        }
-                    });
-                    Thread.Sleep(5000);
-                    if (isBreak)
-                    {
-                        break;
-                    }
-                }
-            }).Start();
-        }
-
-        #endregion 轮播图
-
-        #region 事件
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <param name="sender">
-        /// </param>
-        /// <param name="e">
-        /// </param>
-        private void BtnDown_Click(object sender, RoutedEventArgs e)
-        {
-            MessageBoxResult dr = MessageWindow.Show("确定退出系统？", "提示", MessageBoxButton.OKCancel);
-            if (dr == MessageBoxResult.OK)
-            {
-                Application.Current.Shutdown();
-            }
-        }
-
-        /// <summary>
-        /// 浏览
-        /// </summary>
-        /// <param name="sender">
-        /// </param>
-        /// <param name="e">
-        /// </param>
-        private void BtnBrowse_Click(object sender, RoutedEventArgs e)
-        {
-            //string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
-            _ofd = new FolderBrowserDialog();
-
-            _result = _ofd.ShowDialog();
-            if (_result == System.Windows.Forms.DialogResult.OK)
-            {
-                if (_ofd.SelectedPath != "")
-                {
-                    TxbStoragePath.Text = _ofd.SelectedPath;
-                }
-            }
-        }
-
-        private bool _isPressButton;
-
-        /// <summary>
-        /// 开始
-        /// </summary>
-        /// <param name="sender">
-        /// </param>
-        /// <param name="e">
-        /// </param>
-        private async void BtnStart_Click(object sender, RoutedEventArgs e)
-        {
-            #region 防止连击
-
-            if (_isPressButton)
-            {
-                return;
-            }
-            else
-            {
-                _isPressButton = true;
-                new Thread(() =>
-                {
-                    Thread.Sleep(500);
-                    _isPressButton = false;
-                }).Start();
-            }
-
-            #endregion 防止连击
-
-            #region 合法性判断
-
-            if (string.IsNullOrWhiteSpace(TxbExplainName.Text.Trim()))
-            {
-                MessageWindow.Show("讲解名称不可为空！");
-                return;
-            }
-            if (string.IsNullOrWhiteSpace(TxbStoragePath.Text.Trim()))
-            {
-                MessageWindow.Show("路径不可为空！");
-                return;
-            }
-            try
-            {
-                FileToolsCommon.CreateDirectory(TxbStoragePath.Text.Trim());
-            }
-            catch (Exception)
-            {
-                MessageWindow.Show("路径无法访问，解决方案：\r\n1,检查路径是否可访问。\r\n2,关闭杀毒软件或信任软件。");
-                return;
-            }
-
-            #endregion 合法性判断
-
-            LblCreate.Visibility = Visibility.Visible;
-            string wkpath = FileToolsCommon.GetLegalPath(TxbStoragePath.Text) + TxbExplainName.Text.Trim() + "/";
-            string storagePath = TxbStoragePath.Text;
-            string wkName = TxbExplainName.Text;
-            await Task.Run(() =>
-            {
-                try
-                {
-                    //读取微课数据
-                    App.ReadWkData(wkpath);
-                    if (App.WKData == null)
-                    {
-                        App.WKData = new ModelWkData { WkPath = wkpath, WkName = wkName, WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") };
-                    }
-
-                    try
-                    {
-                        //创建文件夹
-                        FileToolsCommon.CreateDirectory(App.WKData.WkPath);
-                        FileToolsCommon.DeleteDirectory(wkpath + "temp");
-                        FileToolsCommon.DeleteDirectory(wkpath + "_temppath");
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.Logerror.Error("【微课创建课程】文件夹创建删除失败：" + ex.Message, ex);
-                    }
-
-                    //存储文件
-                    FileToolsCommon.SetConfigValue("VideoSavePath", storagePath);
-                    App.ReadDrawData();
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.Logerror.Error("【微课创建课程】读取课堂数据失败：" + ex.Message, ex);
-                }
-            });
-            if (App.W_XHMicroLessonSystemWindow == null)
-            {
-                App.W_XHMicroLessonSystemWindow = new MainWindow();
-            }
-            App.W_XHMicroLessonSystemWindow.Show();
-            LblCreate.Visibility = Visibility.Hidden;
-            Hide();
-        }
-
-        /// <summary>
-        /// 窗体移动
-        /// </summary>
-        /// <param name="sender">
-        /// </param>
-        /// <param name="e">
-        /// </param>
-        private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            DragMove();
-        }
-
-        #endregion 事件
-
-        /// <summary>
-        /// 检测APP更新
-        /// </summary>
-        private void GetNewApp()
-        {
-            new Thread(o =>
-            {
-                //读取本地
-                App.ReadServiceAddressData();
-                int versionThis = int.Parse(FileToolsCommon.GetConfigValue("VersionCode"));
-                if (versionThis < 0)
-                {
-                    //软件是否更新，版本号小于0不更新
-                    return;
-                }
-                string url = App.apiUrl + "/sapi/apprecord/get_new";
-                Console.WriteLine(url);
-                ResultVo<ModelApp> resultObj = ZHttpUtil.PostSignle<ResultVo<ModelApp>>(url, "{}");
-                if (resultObj == null || resultObj.code != 0)
-                {
-                    return;
-                }
-                if (resultObj.obj != null)
-                {
-                    try
-                    {
-                        int versionCode = resultObj.obj.versioncode;
-                        if (versionThis < versionCode)
-                        {
-                            Dispatcher.Invoke(
-                                () =>
-                                {
-                                    string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
-                                    FileToolsCommon.CreateDirectory(pathTemp);
-                                    AppUpdateShow(resultObj.obj);
-                                }
-                            );
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.Logerror.Error("【检查更新】（getNewApp）版本号错误：" + ex.Message, ex);
-                    }
-                }
-            }).Start();
-        }
-
-        /// <summary>
-        /// 应用更新
-        /// </summary>
-        /// <param name="app">
-        /// </param>
-        private void AppUpdateShow(ModelApp app)
-        {
-            AppUpdateWin win = new AppUpdateWin(app)
-            {
-                Topmost = true,
-                Owner = this
-            };
-            win.Show();
-        }
-
-        private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            GetNewApp();
-        }
-
-        private void Window_Closed(object sender, EventArgs e)
-        {
-            Application.Current.Shutdown();
-        }
-    }
-}

XHWK.WKTool/CreateAMicroLessonWindow.xaml → XHWK.WKTool/CreateWin.xaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="XHWK.WKTool.CreateAMicroLessonWindow"
+    x:Class="XHWK.WKTool.CreateWin"
     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"

XHWK.WKTool/CreateWin.xaml.cs

@@ -0,0 +1,404 @@
+using Common.system;
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Forms;
+using System.Windows.Input;
+
+using XHWK.Model;
+
+namespace XHWK.WKTool
+{
+    using system;
+
+    using Application = System.Windows.Application;
+
+    /// <summary>
+    ///     创建微课
+    /// </summary>
+    public partial class CreateWin
+    {
+        #region 字段
+
+        private FolderBrowserDialog _ofd;
+        private DialogResult _result;
+
+        #endregion 字段
+
+        /// <summary>
+        ///     创建微课
+        /// </summary>
+        public CreateWin()
+        {
+            InitializeComponent();
+            ResizeMode = ResizeMode.NoResize;
+            TxbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
+            string versionCode = FileToolsCommon.GetConfigValue("VersionCode");
+            string versionName = FileToolsCommon.GetConfigValue("VersionName");
+            string isDebug = FileToolsCommon.GetConfigValue("IsDebug");
+            string debugStr = "测试版";
+            if (isDebug == "1")
+            {
+                debugStr = "测试版";
+            }
+            else if (isDebug == "0")
+            {
+                debugStr = "正式版";
+            }
+            VersionLabel.Content = debugStr + " v" + versionName + "(" + versionCode + ")";
+            LoadingCarouseImg();
+        }
+
+        #region 轮播图
+
+        /// <summary>
+        ///     图片宽度，每次切换的宽度
+        /// </summary>
+        private double _imgWidth = 502.00;
+
+        /// <summary>
+        ///     轮播时移动增加的宽度
+        /// </summary>
+        private double _imgMove = 1;
+
+        /// <summary>
+        ///     当前展示的图片序号Index从0开始
+        /// </summary>
+        private int _imgNumIndex;
+
+        /// <summary>
+        ///     加载录播图
+        /// </summary>
+        private void LoadingCarouseImg()
+        {
+            new Thread(
+                () =>
+                {
+                    Thread.Sleep(3000);
+                    Dispatcher.Invoke(
+                        () =>
+                        {
+                            _imgWidth = ImgCarouse1.ActualWidth;
+                            _imgMove = _imgWidth / 250.00;
+                            CarouseImg();
+                            //timesCarouse = new System.Timers.Timer(2000);
+                            //timesCarouse.Elapsed += TimesCarouse_Elapsed; ;
+                            //timesCarouse.Start();
+                        }
+                    );
+                }
+            ).Start();
+        }
+
+        /// <summary>
+        ///     轮播图
+        /// </summary>
+        private void CarouseImg()
+        {
+            new Thread(
+                () =>
+                {
+                    while (true)
+                    {
+                        for (double i = _imgMove; i < _imgWidth; i += _imgMove)
+                        {
+                            double i1 = i;
+                            Dispatcher.Invoke(
+                                () =>
+                                {
+                                    if (Math.Abs(i1 + _imgMove) < _imgWidth)
+                                    {
+                                        //图片移动轮播
+                                        SplCarouse.Margin = new Thickness(
+                                            SplCarouse.Margin.Left - _imgMove,
+                                            0,
+                                            0,
+                                            0
+                                        );
+                                    }
+                                    else
+                                    {
+                                        if (_imgNumIndex >= 2)
+                                        {
+                                            _imgNumIndex = 0;
+                                            SplCarouse.Margin = new Thickness(
+                                                0,
+                                                0,
+                                                0,
+                                                0
+                                            );
+                                        }
+                                        else
+                                        {
+                                            _imgNumIndex++;
+                                            SplCarouse.Margin = new Thickness(
+                                                -(_imgNumIndex * _imgWidth),
+                                                0,
+                                                0,
+                                                0
+                                            );
+                                        }
+                                    }
+                                }
+                            );
+                            Thread.Sleep(3);
+                        }
+                        bool isBreak = false;
+                        Dispatcher.Invoke(
+                            () =>
+                            {
+                                if (Visibility != Visibility.Visible)
+                                {
+                                    SplCarouse.Margin = new Thickness(0);
+                                    isBreak = true;
+                                }
+                            }
+                        );
+                        Thread.Sleep(5000);
+                        if (isBreak)
+                        {
+                            break;
+                        }
+                    }
+                }
+            ).Start();
+        }
+
+        #endregion 轮播图
+
+        #region 事件
+
+        /// <summary>
+        ///     关闭
+        /// </summary>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
+        private void BtnDown_Click(object sender, RoutedEventArgs e)
+        {
+            MessageBoxResult dr = MessageWindow.Show(
+                "确定退出系统？",
+                "提示",
+                MessageBoxButton.OKCancel
+            );
+            if (dr == MessageBoxResult.OK)
+            {
+                Application.Current.Shutdown();
+            }
+        }
+
+        /// <summary>
+        ///     浏览
+        /// </summary>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
+        private void BtnBrowse_Click(object sender, RoutedEventArgs e)
+        {
+            //string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
+            _ofd = new FolderBrowserDialog();
+            _result = _ofd.ShowDialog();
+            if (_result == System.Windows.Forms.DialogResult.OK)
+            {
+                if (_ofd.SelectedPath != "")
+                {
+                    TxbStoragePath.Text = _ofd.SelectedPath;
+                }
+            }
+        }
+
+        private bool _isPressButton;
+
+        /// <summary>
+        ///     开始
+        /// </summary>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
+        private async void BtnStart_Click(object sender, RoutedEventArgs e)
+        {
+            #region 防止连击
+
+            if (_isPressButton)
+            {
+                return;
+            }
+            else
+            {
+                _isPressButton = true;
+                new Thread(
+                    () =>
+                    {
+                        Thread.Sleep(500);
+                        _isPressButton = false;
+                    }
+                ).Start();
+            }
+
+            #endregion 防止连击
+
+            #region 合法性判断
+
+            if (string.IsNullOrWhiteSpace(TxbExplainName.Text.Trim()))
+            {
+                MessageWindow.Show("讲解名称不可为空！");
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(TxbStoragePath.Text.Trim()))
+            {
+                MessageWindow.Show("路径不可为空！");
+                return;
+            }
+            try
+            {
+                FileToolsCommon.CreateDirectory(TxbStoragePath.Text.Trim());
+            }
+            catch (Exception)
+            {
+                MessageWindow.Show("路径无法访问，解决方案：\r\n1,检查路径是否可访问。\r\n2,关闭杀毒软件或信任软件。");
+                return;
+            }
+
+            #endregion 合法性判断
+
+            LblCreate.Visibility = Visibility.Visible;
+            string wkpath = FileToolsCommon.GetLegalPath(TxbStoragePath.Text) + TxbExplainName.Text.Trim() + "/";
+            string storagePath = TxbStoragePath.Text;
+            string wkName = TxbExplainName.Text;
+            await Task.Run(
+                () =>
+                {
+                    try
+                    {
+                        //读取微课数据
+                        App.ReadWkData(wkpath);
+                        if (App.WKData == null)
+                        {
+                            App.WKData = new ModelWkData
+                            {
+                                WkPath = wkpath,
+                                WkName = wkName,
+                                WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                            };
+                        }
+                        try
+                        {
+                            //创建文件夹
+                            FileToolsCommon.CreateDirectory(App.WKData.WkPath);
+                            FileToolsCommon.DeleteDirectory(wkpath + "temp");
+                            FileToolsCommon.DeleteDirectory(wkpath + "_temppath");
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Logerror.Error("【微课创建课程】文件夹创建删除失败：" + ex.Message, ex);
+                        }
+
+                        //存储文件
+                        FileToolsCommon.SetConfigValue("VideoSavePath", storagePath);
+                        App.ReadDrawData();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.Logerror.Error("【微课创建课程】读取课堂数据失败：" + ex.Message, ex);
+                    }
+                }
+            );
+            if (App.W_XHMicroLessonSystemWindow == null)
+            {
+                App.W_XHMicroLessonSystemWindow = new MainWindow();
+            }
+            App.W_XHMicroLessonSystemWindow.Show();
+            LblCreate.Visibility = Visibility.Hidden;
+            Hide();
+        }
+
+        /// <summary>
+        ///     窗体移动
+        /// </summary>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
+        private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            DragMove();
+        }
+
+        #endregion 事件
+
+        /// <summary>
+        ///     检测APP更新
+        /// </summary>
+        private void GetNewApp()
+        {
+            new Thread(
+                o =>
+                {
+                    //读取本地
+                    App.ReadServiceAddressData();
+                    int versionThis = int.Parse(FileToolsCommon.GetConfigValue("VersionCode"));
+                    if (versionThis < 0)
+                    {
+                        //软件是否更新，版本号小于0不更新
+                        return;
+                    }
+                    string url = App.apiUrl + "/sapi/apprecord/get_new";
+                    Console.WriteLine(url);
+                    ResultVo<ModelApp> resultObj = ZHttpUtil.PostSignle<ResultVo<ModelApp>>(url, "{}");
+                    if (resultObj == null || resultObj.code != 0)
+                    {
+                        return;
+                    }
+                    if (resultObj.obj != null)
+                    {
+                        try
+                        {
+                            int versionCode = resultObj.obj.versioncode;
+                            if (versionThis < versionCode)
+                            {
+                                Dispatcher.Invoke(
+                                    () =>
+                                    {
+                                        string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                                        FileToolsCommon.CreateDirectory(pathTemp);
+                                        AppUpdateShow(resultObj.obj);
+                                    }
+                                );
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Logerror.Error("【检查更新】（getNewApp）版本号错误：" + ex.Message, ex);
+                        }
+                    }
+                }
+            ).Start();
+        }
+
+        /// <summary>
+        ///     应用更新
+        /// </summary>
+        /// <param name="app">
+        /// </param>
+        private void AppUpdateShow(ModelApp app)
+        {
+            AppUpdateWin win = new AppUpdateWin(app) { Topmost = true, Owner = this };
+            win.Show();
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            GetNewApp();
+        }
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            Application.Current.Shutdown();
+        }
+    }
+}

XHWK.WKTool/DeviceWindow.xaml

@@ -146,7 +146,7 @@
             x:Name="GridTitleBlack"
             Grid.Row="0"
             Margin="0,0"
-            Background="#3f6fff"
+            Background="#4597FF"
             MouseLeftButtonDown="Window_MouseLeftButtonDown">
             <TextBlock
                 Grid.RowSpan="2"
@@ -329,7 +329,7 @@
                         Margin="0,0,10,0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
-                        Background="#3f6fff"
+                        Background="#4597FF"
                         Click="btn_camera_good_Click"
                         Content="可以看见"
                         Cursor="Hand"
@@ -387,7 +387,7 @@
                                         BorderThickness="1"
                                         CornerRadius="7">
                                         <Border.Background>
-                                            <Brush>#3f6fff</Brush>
+                                            <Brush>#4597FF</Brush>
                                         </Border.Background>
                                         <ContentPresenter
                                             HorizontalAlignment="Center"
@@ -440,7 +440,7 @@
                             Margin="0,0,10,0"
                             HorizontalAlignment="Right"
                             VerticalAlignment="Center"
-                            Background="#3f6fff"
+                            Background="#4597FF"
                             Click="btn_speaker_good_Click"
                             Content="可以听见"
                             Cursor="Hand"
@@ -508,7 +508,7 @@
                         x:Name="MicrophoneSetting"
                         Width="60"
                         Margin="20,0,0,0"
-                        Background="#3f6fff"
+                        Background="#4597FF"
                         Content="设置"
                         FontSize="14"
                         Foreground="White" />
@@ -549,7 +549,7 @@
                             Margin="0,0,10,0"
                             HorizontalAlignment="Right"
                             VerticalAlignment="Center"
-                            Background="#3f6fff"
+                            Background="#4597FF"
                             Click="btn_microphone_good_Click"
                             Content="可以看见"
                             Cursor="Hand"
@@ -670,7 +670,7 @@
                         Margin="0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Stretch"
-                        Background="#3f6fff"
+                        Background="#4597FF"
                         Click="BtnDetection_Click"
                         Content="重新检测"
                         Cursor="Hand"

XHWK.WKTool/JieTuWindow.xaml

@@ -3,7 +3,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ctrl="clr-namespace:ComeCapture.Controls"
-    xmlns:local="clr-namespace:ComeCapture"
     Title="MainWindow"
     Closed="Window_Closed"
     Cursor="Cross"
@@ -66,14 +65,14 @@
 
             <!--  尺寸和RGB  -->
             <StackPanel
-                x:Name="SizeRGB"
+                x:Name="SizeRgb"
                 Canvas.Left="{Binding ShowSizeLeft}"
                 Canvas.Top="{Binding ShowSizeTop}"
                 Width="200"
                 Background="Black"
                 Opacity="0.7">
                 <TextBlock
-                    x:Name="Show_Size"
+                    x:Name="ShowSize"
                     Height="20"
                     Padding="10,4,10,0"
                     FontSize="12"
@@ -82,7 +81,7 @@
                     TextAlignment="Left"
                     Visibility="Collapsed" />
                 <TextBlock
-                    x:Name="Show_RGB"
+                    x:Name="ShowRgb"
                     Height="20"
                     Padding="10,1,10,0"
                     FontSize="12"
@@ -97,4 +96,4 @@
             <ctrl:SizeColorBar x:Name="SizeColorBar" />
         </Canvas>
     </Grid>
-</Window>
+</Window>

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -1,11 +1,9 @@
-
-using ComeCapture.Controls;
+using ComeCapture.Controls;
 using ComeCapture.Helpers;
 using ComeCapture.Models;
 
 using Common.system;
 
-
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -24,9 +22,9 @@ using static XHWK.WKTool.MainWindow;
 namespace ComeCapture
 {
     /// <summary>
-    /// 截图 MainWindow.xaml 的交互逻辑
+    ///     截图 MainWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class JieTuWindow : Window
+    public partial class JieTuWindow
     {
         public static double ScreenWidth = SystemParameters.PrimaryScreenWidth;
         public static double ScreenHeight = SystemParameters.PrimaryScreenHeight;
@@ -43,30 +41,32 @@ namespace ComeCapture
         public int num = 1;
 
         //是否截图开始
-        private bool _IsMouseDown = false;
+        private bool _isMouseDown;
 
         //是否截图完毕
-        private bool _IsCapture = false;
+        private bool _isCapture;
+
+        private double _x0;
+        private double _y0;
 
-        private double _X0 = 0;
-        private double _Y0 = 0;
         /// <summary>
-        /// 键盘钩子
+        ///     键盘钩子
         /// </summary>
-        private KeyboardHookCommon k_hook;
+        private readonly KeyboardHookCommon _kHook;
+
         //private IntPtr BitmapPtr = IntPtr.Zero;
         //private IntPtr JieTuBitmapPtr = IntPtr.Zero;
         /// <summary>
-        /// 截图
+        ///     截图
         /// </summary>
         public JieTuWindow()
         {
-            _Current = this;
+            _current = this;
             InitializeComponent();
-            k_hook = new KeyboardHookCommon();
-            k_hook.KeyDownEvent += K_hook_KeyDownEvent;
+            _kHook = new KeyboardHookCommon();
+            _kHook.KeyDownEvent += K_hook_KeyDownEvent;
             DataContext = new AppModel();
-            initialization();
+            Initialization();
             Screenshot();
             MaxWindow();
             MaskLeft.Height = ScreenHeight;
@@ -79,44 +79,50 @@ namespace ComeCapture
 
         public void Screenshot()
         {
-            //IntPtr BitmapPtr = IntPtr.Zero;
-            //Background = new ImageBrush(ImageHelper.GetFullBitmapSource(out BitmapPtr));
-
-            string time = GetTimeStamp();
             string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
             if (!Directory.Exists(tempPath))
             {
                 Directory.CreateDirectory(tempPath);
             }
-            string imagePath = Path.Combine(tempPath, time + ".jpg");
-            if (ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), null, true, out BitmapImage bitmap))
+            if (ImageHelper.GetScreenshot(
+                    new Rectangle(
+                        0,
+                        0,
+                        0,
+                        0
+                    ),
+                    null,
+                    true,
+                    out BitmapImage bitmap
+                ))
             {
                 Background = new ImageBrush(bitmap);
             }
         }
 
-        public void initialization()
+        public void Initialization()
         {
             Background = null;
-            _IsMouseDown = false;
-            _IsCapture = false;
+            _isMouseDown = false;
+            _isCapture = false;
             ImageEditBar.Current.Visibility = Visibility.Collapsed;
             SizeColorBar.Current.Visibility = Visibility.Collapsed;
-            SizeRGB.Visibility = Visibility.Collapsed;
+            SizeRgb.Visibility = Visibility.Collapsed;
             MainImage.Visibility = Visibility.Collapsed;
             DataContext = new AppModel();
             WpfHelper.MainDispatcher = Dispatcher;
         }
+
         /// <summary>
-        /// 初始化快捷键
+        ///     初始化快捷键
         /// </summary>
         public void InitializeKeyDownEvent()
         {
-
-            k_hook.Start();//安装键盘钩子
+            _kHook.Start(); //安装键盘钩子
         }
+
         /// <summary>
-        /// 快捷键
+        ///     快捷键
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -124,7 +130,7 @@ namespace ComeCapture
         {
             if (e.KeyValue == (int)System.Windows.Forms.Keys.Escape)
             {
-                k_hook.Stop();
+                _kHook.Stop();
                 Current.OnCancel();
                 App.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
                 App.W_XHMicroLessonSystemWindow.WindowType();
@@ -134,9 +140,9 @@ namespace ComeCapture
 
         #region 属性 Current
 
-        private static JieTuWindow _Current = null;
+        private static JieTuWindow _current;
 
-        public static JieTuWindow Current => _Current;
+        public static JieTuWindow Current => _current;
 
         #endregion 属性 Current
 
@@ -157,10 +163,10 @@ namespace ComeCapture
 
         public static void Register(object control)
         {
-            string name = "Draw" + _Current.num;
-            _Current.MainCanvas.RegisterName(name, control);
-            _Current.list.Add(new NameAndLimit(name));
-            _Current.num++;
+            string name = "Draw" + _current.num;
+            _current.MainCanvas.RegisterName(name, control);
+            _current.list.Add(new NameAndLimit(name));
+            _current.num++;
         }
 
         #endregion 注册画图
@@ -169,7 +175,7 @@ namespace ComeCapture
 
         public static void AddControl(UIElement e)
         {
-            _Current.MainCanvas.Children.Add(e);
+            _current.MainCanvas.Children.Add(e);
         }
 
         #endregion 截图区域添加画图
@@ -178,7 +184,7 @@ namespace ComeCapture
 
         public static void RemoveControl(UIElement e)
         {
-            _Current.MainCanvas.Children.Remove(e);
+            _current.MainCanvas.Children.Remove(e);
         }
 
         #endregion 截图区域撤回画图
@@ -251,10 +257,8 @@ namespace ComeCapture
 
         #region 获取截图
 
-
         private void GetCapture()
         {
-
             string time = GetTimeStamp();
             string tempPath = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
             if (!Directory.Exists(tempPath))
@@ -270,54 +274,31 @@ namespace ComeCapture
 
             //BitmapSource bitmap = ImageHelper.GetBitmapSource((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2, out JieTuBitmapPtr);
             /* BitmapImage bitmap = */
-            ImageHelper.GetScreenshot(new Rectangle((int)AppModel.Current.MaskLeftWidth + 1, (int)AppModel.Current.MaskTopHeight + 1, (int)MainImage.ActualWidth - 2, (int)MainImage.ActualHeight - 2), imagePath, true, out BitmapImage bitmapimg);
-            _IsMouseDown = false;
-            _IsCapture = false;
+            ImageHelper.GetScreenshot(
+                new Rectangle(
+                    (int)AppModel.Current.MaskLeftWidth + 1,
+                    (int)AppModel.Current.MaskTopHeight + 1,
+                    (int)MainImage.ActualWidth - 2,
+                    (int)MainImage.ActualHeight - 2
+                ),
+                imagePath,
+                true,
+                out BitmapImage _
+            );
+            _isMouseDown = false;
+            _isCapture = false;
             ImageEditBar.Current.Visibility = Visibility.Collapsed;
             SizeColorBar.Current.Visibility = Visibility.Collapsed;
-            SizeRGB.Visibility = Visibility.Collapsed;
+            SizeRgb.Visibility = Visibility.Collapsed;
             MainImage.Visibility = Visibility.Collapsed;
             DataContext = new AppModel();
-            //ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);//zxy
-            //Background = new ImageBrush(bitmap);
             WpfHelper.MainDispatcher = Dispatcher;
             MaxWindow();
             MaskLeft.Height = ScreenHeight;
             MaskRight.Height = ScreenHeight;
             //计算Windows项目缩放比例
             ScreenHelper.ResetScreenScale();
-            //if (bitmap != null)
-            //{
-            //    //Shared.TeachingData.REQ_InteractiveLaunch.teacherpic = serverSavePath;
-            //    //Shared.TeachingData.FilePath = imagePath;
-            //}
-
-            ///修改为统一截图时存储到服务器 修改人：赵耀 修改时间：2020年8月11日
-            //if (bitmap != null)
-            //{
-            //    TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-            //    string httpurl = Convert.ToInt64(ts.TotalMilliseconds).ToString() + ".png";
-            //    string path = ZConfig.classRoomImagePath() + httpurl.Substring(httpurl.LastIndexOf('/') + 1);
-            //    Shared.TeachingData.REQ_InteractiveLaunch.teacherpic = ZConfig.dbImagePath() + httpurl;
-            //    Shared.TeachingData.FilePath = path;
-            // FileInfo fi = new FileInfo(path); var di = fi.Directory; if (!di.Exists) {
-            // di.Create();
-            //}
-
-            //    using (var fs = System.IO.File.Create(path))
-            //    {
-            //        BitmapEncoder encoder = new PngBitmapEncoder();
-            //        encoder.Frames.Add(BitmapFrame.Create(bitmap));
-            //        encoder.Save(fs);
-            //        bitmap = null;
-            //        encoder = null;
-            //    }
-            //}
-            //Dispose();
-            //GC.Collect();
-            //ImageHelper.DeleteObject(BitmapPtr);
-            //ImageHelper.DeleteObject(JieTuBitmapPtr);
-            initialization();
+            Initialization();
             Owner = null;
             WindowState = WindowState.Minimized;
             Visibility = Visibility.Hidden;
@@ -325,21 +306,32 @@ namespace ComeCapture
             //this.Hide();
             if (ChangeTextEvent != null)
             {
-                k_hook.Stop();
+                _kHook.Stop();
                 ChangeTextEvent("关闭窗口");
             }
         }
 
         #endregion 获取截图
+
         /// <summary>
-        /// 获取时间戳
+        ///     获取时间戳
         /// </summary>
         /// <returns></returns>
         public string GetTimeStamp()
         {
-            TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            TimeSpan ts = DateTime.Now -
+            new DateTime(
+                1970,
+                1,
+                1,
+                0,
+                0,
+                0,
+                0
+            );
             return Convert.ToInt64(ts.TotalMilliseconds).ToString();
         }
+
         #region 退出截图
 
         public void OnCancel()
@@ -347,17 +339,16 @@ namespace ComeCapture
             //Close();
             //ImageHelper.DeleteObject(BitmapPtr);
             //ImageHelper.DeleteObject(JieTuBitmapPtr);
-            initialization();
+            Initialization();
             Owner = null;
             WindowState = WindowState.Minimized;
             Visibility = Visibility.Hidden;
             ShowInTaskbar = false;
             //this.Hide();
             //_Bitmap.Dispose();
-
             if (ChangeTextEvent != null)
             {
-                k_hook.Stop();
+                _kHook.Stop();
                 ChangeTextEvent("取消");
             }
         }
@@ -369,36 +360,13 @@ namespace ComeCapture
         public void OnOK()
         {
             Hidden();
-
-            Thread t = new Thread(new ThreadStart(() =>
-            {
-                Thread.Sleep(50);
-                //Thread.Sleep(200);
-                WpfHelper.SafeRun(() =>
+            Thread t = new Thread(
+                () =>
                 {
-                    /*var source = */
-                    GetCapture();
-                    //Shared.TeachingData.Source = source;
-                    //if (source != null)
-                    //{
-                    //    TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                    //    string httpurl = Convert.ToInt64(ts.TotalMilliseconds).ToString() + ".png";
-                    //    string path = ZConfig.classRoomImagePath() + httpurl.Substring(httpurl.LastIndexOf('/') + 1);
-                    //    Shared.TeachingData.REQ_InteractiveLaunch.teacherpic = ZConfig.dbImagePath() + httpurl;
-                    //    ImageHelper.SaveToPng(source, path);
-                    //    Shared.TeachingData.FilePath = path;
-                    //    //Clipboard.SetImage(source);
-                    //}
-                    //Close();
-                    //if (ChangeTextEvent != null)
-                    //{
-                    //    ChangeTextEvent("关闭窗口");
-                    //}
-                });
-            }))
-            {
-                IsBackground = true
-            };
+                    Thread.Sleep(50);
+                    WpfHelper.SafeRun(GetCapture);
+                }
+            ) { IsBackground = true };
             t.Start();
         }
 
@@ -411,7 +379,7 @@ namespace ComeCapture
             //隐藏尺寸RGB框
             if (AppModel.Current.MaskTopHeight < 40)
             {
-                SizeRGB.Visibility = Visibility.Collapsed;
+                SizeRgb.Visibility = Visibility.Collapsed;
             }
             int need = SizeColorBar.Current.Selected == Tool.Null ? 30 : 67;
             if (AppModel.Current.MaskBottomHeight < need && AppModel.Current.MaskTopHeight < need)
@@ -428,32 +396,32 @@ namespace ComeCapture
 
         private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            if (_IsCapture)
+            if (_isCapture)
             {
                 return;
             }
             System.Windows.Point point = e.GetPosition(this);
-            _X0 = point.X;
-            _Y0 = point.Y;
-            _IsMouseDown = true;
-            Canvas.SetLeft(MainImage, _X0);
-            Canvas.SetTop(MainImage, _Y0);
-            AppModel.Current.MaskLeftWidth = _X0;
-            AppModel.Current.MaskRightWidth = ScreenWidth - _X0;
-            AppModel.Current.MaskTopHeight = _Y0;
-            Show_Size.Visibility = Visibility.Visible;
+            _x0 = point.X;
+            _y0 = point.Y;
+            _isMouseDown = true;
+            Canvas.SetLeft(MainImage, _x0);
+            Canvas.SetTop(MainImage, _y0);
+            AppModel.Current.MaskLeftWidth = _x0;
+            AppModel.Current.MaskRightWidth = ScreenWidth - _x0;
+            AppModel.Current.MaskTopHeight = _y0;
+            ShowSize.Visibility = Visibility.Visible;
         }
 
         private void Window_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
-            if (!_IsMouseDown || _IsCapture)
+            if (!_isMouseDown || _isCapture)
             {
                 return;
             }
-            _IsMouseDown = false;
+            _isMouseDown = false;
             if (MainImage.Width >= MinSize && MainImage.Height >= MinSize)
             {
-                _IsCapture = true;
+                _isCapture = true;
                 ImageEditBar.Current.Visibility = Visibility.Visible;
                 ImageEditBar.Current.ResetCanvas();
                 Cursor = Cursors.Arrow;
@@ -472,20 +440,18 @@ namespace ComeCapture
             {
                 MessageWindow.Show(ex.Message);
             }
-            if (_IsCapture)
+            if (_isCapture)
             {
                 return;
             }
-
-            if (Show_RGB.Visibility == Visibility.Collapsed)
+            if (ShowRgb.Visibility == Visibility.Collapsed)
             {
-                Show_RGB.Visibility = Visibility.Visible;
+                ShowRgb.Visibility = Visibility.Visible;
             }
-
-            if (_IsMouseDown)
+            if (_isMouseDown)
             {
-                double w = point.X - _X0;
-                double h = point.Y - _Y0;
+                double w = point.X - _x0;
+                double h = point.Y - _y0;
                 if (w < MinSize || h < MinSize)
                 {
                     return;
@@ -512,7 +478,7 @@ namespace ComeCapture
         {
             if (e.Key == Key.Escape)
             {
-                initialization();
+                Initialization();
                 Owner = null;
                 WindowState = WindowState.Minimized;
                 Visibility = Visibility.Hidden;
@@ -523,25 +489,26 @@ namespace ComeCapture
         #endregion 鼠标及键盘事件
 
         /// <summary>
-        /// 关闭时清除tool页记录的截图数据
+        ///     关闭时清除tool页记录的截图数据
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void Window_Closed(object sender, EventArgs e)
         {
-            click_closeJietuWindowClick();
+            if (ClickCloseJietuWindowClick != null)
+            {
+                ClickCloseJietuWindowClick();
+            }
         }
 
         /// <summary>
-        /// 非正常关闭时jietuWindow=null；
+        ///     非正常关闭时jietuWindow=null；
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         public delegate void CloseJietuWindowClick();
 
         /// <summary>
-        /// 非正常关闭时jietuWindow=null；
+        ///     非正常关闭时jietuWindow=null；
         /// </summary>
-        public event CloseJietuWindowClick click_closeJietuWindowClick;
+        public event CloseJietuWindowClick ClickCloseJietuWindowClick;
     }
-}
+}

XHWK.WKTool/KeyVerification.xaml

@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="KeyVerification"
-    Width="400"
+    Width="446"
     Height="200"
     AllowsTransparency="True"
     Background="Transparent"
@@ -19,14 +19,13 @@
     <Window.Resources />
     <Grid Margin="0,0,0,0" Background="White">
         <Grid.RowDefinitions>
-            <RowDefinition Height="50" />
+            <RowDefinition Height="40" />
             <RowDefinition Height="*" />
             <RowDefinition Height="75" />
         </Grid.RowDefinitions>
         <!--  头部  -->
         <Grid
             Grid.Row="0"
-            Height="50"
             Background="#4597FF"
             MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
             <TextBlock
@@ -44,6 +43,7 @@
                 Grid.Row="0"
                 Padding="10,0,10,0"
                 HorizontalAlignment="Right"
+                VerticalAlignment="Center"
                 Click="CloseClick"
                 Content="×"
                 Cursor="Hand"

XHWK.WKTool/KeyVerification.xaml.cs

@@ -83,7 +83,7 @@ namespace XHWK.WKTool
                     () =>
                     {
                         Hide();
-                        CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
+                        CreateWin win = new CreateWin();
                         //win.Topmost = true;
                         win.Show();
                         Thread.Sleep(200);

XHWK.WKTool/LoadDialog.xaml

@@ -1,11 +1,8 @@
-<Window x:Class="XHWK.WKTool.LoadDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:XHWK.WKTool"
-      
-         Width="100"
+<Window
+    x:Class="XHWK.WKTool.LoadDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Width="100"
     Height="100"
     AllowsTransparency="True"
     Background="Transparent"
@@ -19,7 +16,7 @@
             <Grid Width="60" Height="60">
                 <Grid.Resources>
                     <DrawingBrush
-                        x:Key="brush"
+                        x:Key="Brush"
                         AlignmentX="Center"
                         AlignmentY="Top"
                         Stretch="None">
@@ -34,8 +31,8 @@
                 </Grid.Resources>
 
                 <Rectangle
-                    x:Name="r01"
-                    Fill="{StaticResource brush}"
+                    x:Name="R01"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -43,8 +40,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r02"
-                    Fill="{StaticResource brush}"
+                    x:Name="R02"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -52,8 +49,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r03"
-                    Fill="{StaticResource brush}"
+                    x:Name="R03"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -61,8 +58,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r04"
-                    Fill="{StaticResource brush}"
+                    x:Name="R04"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -70,8 +67,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r05"
-                    Fill="{StaticResource brush}"
+                    x:Name="R05"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -79,8 +76,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r06"
-                    Fill="{StaticResource brush}"
+                    x:Name="R06"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -88,8 +85,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r07"
-                    Fill="{StaticResource brush}"
+                    x:Name="R07"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -97,8 +94,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r08"
-                    Fill="{StaticResource brush}"
+                    x:Name="R08"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -106,8 +103,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r09"
-                    Fill="{StaticResource brush}"
+                    x:Name="R09"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -115,8 +112,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r10"
-                    Fill="{StaticResource brush}"
+                    x:Name="R10"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -124,8 +121,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r11"
-                    Fill="{StaticResource brush}"
+                    x:Name="R11"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -133,8 +130,8 @@
                     </Rectangle.RenderTransform>
                 </Rectangle>
                 <Rectangle
-                    x:Name="r12"
-                    Fill="{StaticResource brush}"
+                    x:Name="R12"
+                    Fill="{StaticResource Brush}"
                     Opacity="0.8"
                     RenderTransformOrigin="0.5,0.5">
                     <Rectangle.RenderTransform>
@@ -148,84 +145,84 @@
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.00000"
-                                    Storyboard.TargetName="r01"
+                                    Storyboard.TargetName="R01"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.08333"
-                                    Storyboard.TargetName="r02"
+                                    Storyboard.TargetName="R02"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.16666"
-                                    Storyboard.TargetName="r03"
+                                    Storyboard.TargetName="R03"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.24999"
-                                    Storyboard.TargetName="r04"
+                                    Storyboard.TargetName="R04"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.33332"
-                                    Storyboard.TargetName="r05"
+                                    Storyboard.TargetName="R05"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.41665"
-                                    Storyboard.TargetName="r06"
+                                    Storyboard.TargetName="R06"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.49998"
-                                    Storyboard.TargetName="r07"
+                                    Storyboard.TargetName="R07"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.58331"
-                                    Storyboard.TargetName="r08"
+                                    Storyboard.TargetName="R08"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.66664"
-                                    Storyboard.TargetName="r09"
+                                    Storyboard.TargetName="R09"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.74997"
-                                    Storyboard.TargetName="r10"
+                                    Storyboard.TargetName="R10"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.83330"
-                                    Storyboard.TargetName="r11"
+                                    Storyboard.TargetName="R11"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
                                 <DoubleAnimation
                                     AutoReverse="True"
                                     BeginTime="0:0:0.91663"
-                                    Storyboard.TargetName="r12"
+                                    Storyboard.TargetName="R12"
                                     Storyboard.TargetProperty="Opacity"
                                     To="0"
                                     Duration="0:0:0.08333" />
@@ -236,4 +233,4 @@
             </Grid>
         </Border>
     </Grid>
-</Window>
+</Window>

XHWK.WKTool/LoadDialog.xaml.cs

@@ -1,11 +1,9 @@
-using System.Windows;
-
-namespace XHWK.WKTool
+namespace XHWK.WKTool
 {
     /// <summary>
-    /// LoadDialog.xaml 的交互逻辑
+    ///     LoadDialog.xaml 的交互逻辑
     /// </summary>
-    public partial class LoadDialog : Window
+    public partial class LoadDialog
     {
         public LoadDialog()
         {

XHWK.WKTool/LoginWindow.xaml.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Configuration;
 using System.Text;
-using System.Text.RegularExpressions;
 
 //using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Input;
+
 using XHWK.WKTool.DAL;
 
 namespace XHWK.WKTool
@@ -13,19 +13,18 @@ namespace XHWK.WKTool
     using system;
 
     /// <summary>
-    /// LoginWindow.xaml 的交互逻辑
+    ///     LoginWindow.xaml 的交互逻辑
     /// </summary>
     public partial class LoginWindow
     {
         /// <summary>
-        /// 调用接口
+        ///     调用接口
         /// </summary>
         private readonly XhApi _xhapi = new XhApi();
 
         public LoginWindow()
         {
             InitializeComponent();
-
             Initialize();
         }
 
@@ -44,7 +43,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 关闭事件
+        ///     关闭事件
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -58,7 +57,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 登录事件
+        ///     登录事件
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -97,12 +96,12 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 登录
+        ///     登录
         /// </summary>
         private void Login()
         {
-            var accountNumber = TxbAccountNumber.Text.Replace(" ", "").Trim();
-            var password = PobPassword.Password.Replace(" ", "").Trim();
+            string accountNumber = TxbAccountNumber.Text.Replace(" ", "").Trim();
+            string password = PobPassword.Password.Replace(" ", "").Trim();
             int code = _xhapi.Login(accountNumber, password);
             if (code == 0)
             {
@@ -111,8 +110,7 @@ namespace XHWK.WKTool
                 if (CkSaveName.IsChecked == true)
                 {
                     string accountNumbers = TxbAccountNumber.Text;
-                    System.IO.File.WriteAllText
-                    (
+                    System.IO.File.WriteAllText(
                         applicationData,
                         accountNumbers,
                         Encoding.Default
@@ -121,8 +119,7 @@ namespace XHWK.WKTool
                 else
                 {
                     string accountNumbers = "";
-                    System.IO.File.WriteAllText
-                    (
+                    System.IO.File.WriteAllText(
                         applicationData,
                         accountNumbers,
                         Encoding.Default
@@ -156,18 +153,16 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 记住账号
+        ///     记住账号
         /// </summary>
         /// <param name="sender">
         /// </param>
         /// <param name="e">
         /// </param>
-        private void CkSaveName_Click(object sender, RoutedEventArgs e)
-        {
-        }
+        private void CkSaveName_Click(object sender, RoutedEventArgs e) { }
 
         /// <summary>
-        /// 读取客户设置
+        ///     读取客户设置
         /// </summary>
         /// <param name="settingName">
         /// </param>
@@ -187,7 +182,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 更新设置
+        ///     更新设置
         /// </summary>
         /// <param name="settingName">
         /// </param>
@@ -196,7 +191,6 @@ namespace XHWK.WKTool
         public static void UpdateSettingString(string settingName, string valueName)
         {
             Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-
             if (ConfigurationManager.AppSettings[settingName] != null)
             {
                 config.AppSettings.Settings.Remove(settingName);
@@ -206,38 +200,6 @@ namespace XHWK.WKTool
             ConfigurationManager.RefreshSection("appSettings");
         }
 
-        /// <summary>
-        /// 限制输入特殊字符
-        /// </summary>
-        /// <param name="sender">
-        /// </param>
-        /// <param name="e">
-        /// </param>
-        private void TxbAccountNumberPreviewTextInput(object sender, TextCompositionEventArgs e)
-        {
-            try
-            {
-                Regex re = new Regex("[^0-9\\-]+");
-                Regex re1 = new Regex("[^A-Za-z\\-]+");
-                if (!re.IsMatch(e.Text))
-                {
-                    e.Handled = re.IsMatch(e.Text);
-                }
-                else if (!re1.IsMatch(e.Text))
-                {
-                    e.Handled = re1.IsMatch(e.Text);
-                }
-                else
-                {
-                    e.Handled = true;
-                }
-            }
-            catch (Exception)
-            {
-                // ignored
-            }
-        }
-
         private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             DragMove();
@@ -246,7 +208,7 @@ namespace XHWK.WKTool
         #region 服务地址
 
         /// <summary>
-        /// 打开服务地址
+        ///     打开服务地址
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -259,7 +221,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 取消
+        ///     取消
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -272,7 +234,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 服务地址设置
+        ///     服务地址设置
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -303,7 +265,7 @@ namespace XHWK.WKTool
         #region 切换校内外
 
         /// <summary>
-        /// 校外
+        ///     校外
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -320,7 +282,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 校内
+        ///     校内
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -340,4 +302,4 @@ namespace XHWK.WKTool
 
         #endregion 服务地址
     }
-}
+}

XHWK.WKTool/MainWindow.xaml

@@ -563,7 +563,7 @@
                                                             Cursor="SizeAll"
                                                             Fill="#00000000"
                                                             SnapsToDevicePixels="True"
-                                                            Stroke="#3f6fff"
+                                                            Stroke="#4597FF"
                                                             StrokeDashArray="4 4"
                                                             StrokeThickness="4"
                                                             Visibility="Hidden" />
@@ -590,7 +590,7 @@
                                                                 HorizontalAlignment="Left"
                                                                 VerticalAlignment="Top"
                                                                 Background="White"
-                                                                BorderBrush="#3f6fff"
+                                                                BorderBrush="#4597FF"
                                                                 BorderThickness="2"
                                                                 Cursor="SizeNWSE"
                                                                 DragCompleted="RectRightUp_DragCompleted"
@@ -606,7 +606,7 @@
                                                                 HorizontalAlignment="Left"
                                                                 VerticalAlignment="Top"
                                                                 Background="White"
-                                                                BorderBrush="#3f6fff"
+                                                                BorderBrush="#4597FF"
                                                                 BorderThickness="2"
                                                                 Cursor="SizeNESW"
                                                                 DragCompleted="RectRightUp_DragCompleted"
@@ -622,7 +622,7 @@
                                                                 HorizontalAlignment="Left"
                                                                 VerticalAlignment="Top"
                                                                 Background="White"
-                                                                BorderBrush="#3f6fff"
+                                                                BorderBrush="#4597FF"
                                                                 BorderThickness="2"
                                                                 Cursor="SizeNESW"
                                                                 DragCompleted="RectRightUp_DragCompleted"
@@ -638,7 +638,7 @@
                                                                 HorizontalAlignment="Left"
                                                                 VerticalAlignment="Top"
                                                                 Background="White"
-                                                                BorderBrush="#3f6fff"
+                                                                BorderBrush="#4597FF"
                                                                 BorderThickness="2"
                                                                 Cursor="SizeNWSE"
                                                                 DragCompleted="RectRightUp_DragCompleted"
@@ -1337,7 +1337,7 @@
                                                 Height="30"
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Stretch"
-                                                Background="#3f6fff"
+                                                Background="#4597FF"
                                                 Click="BtnBrowse_Click"
                                                 Content="浏览"
                                                 Cursor="Hand"
@@ -1351,7 +1351,7 @@
                                                 Height="30"
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Stretch"
-                                                Background="#3f6fff"
+                                                Background="#4597FF"
                                                 Click="btnOpen_Click"
                                                 Content="打开"
                                                 Cursor="Hand"
@@ -1455,7 +1455,7 @@
                                             Height="30"
                                             HorizontalAlignment="Stretch"
                                             VerticalAlignment="Center"
-                                            Background="#3f6fff"
+                                            Background="#4597FF"
                                             Click="BtnSave_Click"
                                             Content="保存"
                                             Cursor="Hand"

XHWK.WKTool/MessageWindow.xaml

@@ -20,7 +20,7 @@
 
     <Border
         Background="White"
-        BorderBrush="#3f6fff"
+        BorderBrush="#4597FF"
         BorderThickness="0">
         <Grid>
             <Grid.RowDefinitions>
@@ -28,7 +28,7 @@
                 <RowDefinition Height="*" />
                 <RowDefinition Height="60" />
             </Grid.RowDefinitions>
-            <Grid Grid.Row="0" Background="#3f6fff">
+            <Grid Grid.Row="0" Background="#4597FF">
                 <Label
                     x:Name="LblTitle"
                     Margin="14,0,0,0"
@@ -69,7 +69,7 @@
                     Margin="0,0,10,0"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
-                    Background="#3f6fff"
+                    Background="#4597FF"
                     CornerRadius="6">
                     <Button
                         x:Name="BtnOk"

XHWK.WKTool/MessageWindow.xaml.cs

@@ -4,20 +4,25 @@ using System.Windows.Input;
 namespace XHWK.WKTool
 {
     /// <summary>
-    /// 消息提示框 .show()
+    ///     消息提示框 .show()
     /// </summary>
-    public partial class MessageWindow : Window
+    public partial class MessageWindow
     {
         /// <summary>
-        /// 提示框
+        ///     提示框
         /// </summary>
-        /// <param name="MessageType">取消按钮  1不显示2显示</param>
-        /// <param name="Title">标题</param>
-        /// <param name="content">消息内容</param>
-        public MessageWindow(int MessageType, string Title, string Content)
+        /// <param name="messageType">取消按钮  1不显示2显示</param>
+        /// <param name="title">标题</param>
+        /// <param name="content"></param>
+        public MessageWindow
+        (
+            int messageType,
+            string title,
+            string content
+        )
         {
             InitializeComponent();
-            switch (MessageType)
+            switch (messageType)
             {
                 case 1:
                     BorCancel.Visibility = Visibility.Hidden;
@@ -25,25 +30,24 @@ namespace XHWK.WKTool
                 case 2:
                     BorCancel.Visibility = Visibility.Visible;
                     break;
-                default:
-                    break;
             }
-            LblTitle.Content = Title;
-            if (!string.IsNullOrWhiteSpace(Content))
+            LblTitle.Content = title;
+            if (!string.IsNullOrWhiteSpace(content))
             {
-                if (Content.Length > 143)
+                if (content.Length > 143)
                 {
-                    Content = Content.Substring(0, 140) + "...";
+                    content = content.Substring(0, 140) + "...";
                 }
-                TbkContent.Text = Content;
+                TbkContent.Text = content;
             }
             else
             {
-                TbkContent.Text = "错误！";
+                TbkContent.Text = "请求失败请重试！";
             }
         }
+
         /// <summary>
-        /// 取消
+        ///     取消
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -51,8 +55,9 @@ namespace XHWK.WKTool
         {
             DialogResult = false;
         }
+
         /// <summary>
-        /// 确定
+        ///     确定
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -60,64 +65,74 @@ namespace XHWK.WKTool
         {
             DialogResult = true;
         }
+
         /// <summary>
-        /// 消息提示框
+        ///     消息提示框
         /// </summary>
-        /// <param name="Message">消息</param>
+        /// <param name="message">消息</param>
         /// <returns></returns>
-        public static MessageBoxResult Show(string Message)
+        public static MessageBoxResult Show(string message)
         {
-            string Title = "消息提示";
-            return Show(Message, Title);
+            string title = "消息提示";
+            return Show(message, title);
         }
+
         /// <summary>
-        /// 消息提示框
+        ///     消息提示框
         /// </summary>
-        /// <param name="Message">消息</param>
+        /// <param name="content">消息</param>
+        /// <param name="title"></param>
         /// <returns></returns>
-        public static MessageBoxResult Show(string Message, string Title)
+        public static MessageBoxResult Show(string content, string title)
         {
-            MessageWindow message = new MessageWindow(1, Title, Message);
+            MessageWindow message = new MessageWindow(
+                1,
+                title,
+                content
+            );
             message.ShowDialog();
             return MessageBoxResult.Cancel;
         }
+
         /// <summary>
-        /// 消息提示框
+        ///     消息提示框
         /// </summary>
-        /// <param name="Title">标题</param>
-        /// <param name="Message">消息</param>
+        /// <param name="title">标题</param>
+        /// <param name="content">消息</param>
+        /// <param name="messageBox"></param>
         /// <returns></returns>
-        public static MessageBoxResult Show(string Message, string Title, MessageBoxButton messageBox)
+        public static MessageBoxResult Show
+        (
+            string content,
+            string title,
+            MessageBoxButton messageBox
+        )
         {
-            if (string.IsNullOrWhiteSpace(Title))
+            if (string.IsNullOrWhiteSpace(title))
             {
-                Title = "消息提示";
+                title = "消息提示";
             }
-            MessageWindow message = new MessageWindow(2, Title, Message);
+            MessageWindow message = new MessageWindow(
+                2,
+                title,
+                content
+            );
             bool? res = message.ShowDialog();
-            if ((bool)res)
+            if (res != null && (bool)res)
             {
                 if (messageBox == MessageBoxButton.OKCancel)
                 {
                     return MessageBoxResult.OK;
                 }
-                else
-                {
-                    return MessageBoxResult.Yes;
-                }
+                return MessageBoxResult.Yes;
             }
-            else
+            if (messageBox == MessageBoxButton.OKCancel)
             {
-                if (messageBox == MessageBoxButton.OKCancel)
-                {
-                    return MessageBoxResult.Cancel;
-                }
-                else
-                {
-                    return MessageBoxResult.No;
-                }
+                return MessageBoxResult.Cancel;
             }
+            return MessageBoxResult.No;
         }
+
         private static MessageBoxResult Win32ToMessageBoxResult(int value)
         {
             switch (value)
@@ -144,4 +159,4 @@ namespace XHWK.WKTool
             }
         }
     }
-}
+}

XHWK.WKTool/MinToolbar.xaml.cs

@@ -4,36 +4,36 @@ using System.Windows.Media;
 namespace XHWK.WKTool
 {
     /// <summary>
-    /// 最小化工具栏
+    ///     最小化工具栏
     /// </summary>
     public partial class MinToolbar
     {
         /// <summary>
-        /// 屏幕宽
+        ///     屏幕宽
         /// </summary>
         internal double pwidth = SystemParameters.PrimaryScreenWidth;
 
         /// <summary>
-        /// 屏幕高
+        ///     屏幕高
         /// </summary>
         internal double pHeight = SystemParameters.PrimaryScreenHeight;
+
         public MinToolbar()
         {
             InitializeComponent();
             ResizeMode = ResizeMode.NoResize;
             Topmost = true;
-
         }
 
         /// <summary>
-        /// 初始化隐藏工具栏位置颜色
+        ///     初始化隐藏工具栏位置颜色
         /// </summary>
         /// <param name="top"></param>
         /// <param name="thisHeight"></param>
         public void Initialize(double top, double thisHeight)
         {
-            var desktopWorkingArea = System.Windows.SystemParameters.WorkArea;
-            Left = desktopWorkingArea.Right - this.Width + 7;
+            Rect desktopWorkingArea = System.Windows.SystemParameters.WorkArea;
+            Left = desktopWorkingArea.Right - Width + 7;
             Top = top;
             // ReSharper disable once PossibleNullReferenceException
             BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FF638AFF"));
@@ -42,8 +42,8 @@ namespace XHWK.WKTool
 
         private void buttonMin_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
         {
-            this.Hide();
+            Hide();
             App.W_ScreenRecordingToolbarWindow.MaxToobar();
         }
     }
-}
+}

XHWK.WKTool/PracticeWindow.xaml

@@ -3,7 +3,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
         Title="PracticeWindow"  Width="1280"
     Height="800"
@@ -14,7 +13,7 @@
     ShowInTaskbar="False"
     WindowStyle="None">
     <Grid>
-        <Image x:Name="imgCanvas"/>
-        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" PreviewMouseRightButtonDown="blackboard_canvas_PreviewMouseRightButtonDown" Background="#021B1919" Visibility="Visible" Grid.ColumnSpan="2"/>
+        <Image x:Name="ImgCanvas"/>
+        <InkCanvas Grid.Row="0" x:Name="BlackboardCanvas" PreviewMouseRightButtonDown="blackboard_canvas_PreviewMouseRightButtonDown" Background="#021B1919" Visibility="Visible" Grid.ColumnSpan="2"/>
     </Grid>
 </Window>

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Common.system;
+
 using System;
 using System.Threading;
 using System.Windows;
@@ -6,12 +7,13 @@ using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
+
 using XHWK.Model;
 
 namespace XHWK.WKTool
 {
     /// <summary>
-    /// 录屏画板
+    ///     录屏画板
     /// </summary>
     public partial class PracticeWindow
     {
@@ -22,39 +24,38 @@ namespace XHWK.WKTool
         private ViewModel _viewModel;
 
         /// <summary>
-        /// 0 画笔 1 矩形 2 圆形
+        ///     0 画笔 1 矩形 2 圆形
         /// </summary>
 #pragma warning disable CS0414
         private int _flg;
 #pragma warning restore CS0414
 
         /// <summary>
-        /// 当前画笔颜色
+        ///     当前画笔颜色
         /// </summary>
         private Color _colour = Colors.Red;
 
         /// <summary>
-        /// 当前画笔宽
+        ///     当前画笔宽
         /// </summary>
         private int _wit = 2;
 
         /// <summary>
-        /// 当前画笔高
+        ///     当前画笔高
         /// </summary>
         private int _hei = 2;
 
         public PracticeWindow()
         {
             InitializeComponent();
-
             InitTqlpPen();
         }
 
         public void Initialize(string imgPath = null)
         {
             _flg = 0;
-            blackboard_canvas.Strokes.Clear();
-            blackboard_canvas.UseCustomCursor = true;
+            BlackboardCanvas.Strokes.Clear();
+            BlackboardCanvas.UseCustomCursor = true;
             //blackboard_canvas.EditingMode = InkCanvasEditingMode.EraseByStroke;
             //加背景 废弃更利于讲解ppt
             //if (File.Exists(_imgPath))
@@ -71,26 +72,21 @@ namespace XHWK.WKTool
 
             ////将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用
             ////InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型
-            blackboard_canvas.DefaultDrawingAttributes = _drawingAttributes;
+            BlackboardCanvas.DefaultDrawingAttributes = _drawingAttributes;
             Pen();
             //blackboard_canvas.Cursor = Cursors.Pen;
 
             //Cursor cus = new Cursor(@"G:\06.cur");
 
             //blackboard_canvas.Cursor = cus;
-
-            _viewModel = new ViewModel
-            {
-                InkStrokes = new StrokeCollection(),
-            };
-
+            _viewModel = new ViewModel { InkStrokes = new StrokeCollection(), };
             DataContext = _viewModel;
             //APP.W_ScreenRecordingToolbarWindow.Owner = this;
             //APP.W_ScreenRecordingToolbarWindow.Topmost = true;
         }
 
         /// <summary>
-        /// 画笔颜色事件 白色
+        ///     画笔颜色事件 白色
         /// </summary>
         public void White()
         {
@@ -100,7 +96,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 画笔颜色事件 红色
+        ///     画笔颜色事件 红色
         /// </summary>
         public void Red()
         {
@@ -109,7 +105,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 画笔颜色事件 黑色
+        ///     画笔颜色事件 黑色
         /// </summary>
         public void Gray()
         {
@@ -119,7 +115,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 画笔颜色事件 青色
+        ///     画笔颜色事件 青色
         /// </summary>
         public void CyanBlue()
         {
@@ -129,7 +125,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 画笔颜色事件 黄色
+        ///     画笔颜色事件 黄色
         /// </summary>
         public void Yellow()
         {
@@ -139,7 +135,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 画笔颜色事件 蓝色
+        ///     画笔颜色事件 蓝色
         /// </summary>
         public void Blue()
         {
@@ -149,7 +145,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 画笔粗细事件 细
+        ///     画笔粗细事件 细
         /// </summary>
         public void Fine()
         {
@@ -161,7 +157,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 画笔粗细事件 中
+        ///     画笔粗细事件 中
         /// </summary>
         public void In()
         {
@@ -173,7 +169,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 画笔粗细事件 粗
+        ///     画笔粗细事件 粗
         /// </summary>
         public void Crude()
         {
@@ -185,33 +181,36 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 橡皮
+        ///     橡皮
         /// </summary>
         public void Eraser()
         {
             _flg = 0;
             //this.type = ZPenType.Erase;
-            blackboard_canvas.UseCustomCursor = false;
-            blackboard_canvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
-            blackboard_canvas.EraserShape = new EllipseStylusShape(64, 64, 0);
+            BlackboardCanvas.UseCustomCursor = false;
+            BlackboardCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
+            BlackboardCanvas.EraserShape = new EllipseStylusShape(
+                64,
+                64,
+                0
+            );
         }
 
         /// <summary>
-        /// 画笔
+        ///     画笔
         /// </summary>
         public void Pen()
         {
             _flg = 0;
-            blackboard_canvas.EditingMode = InkCanvasEditingMode.Ink;
-            blackboard_canvas.UseCustomCursor = true;
+            BlackboardCanvas.EditingMode = InkCanvasEditingMode.Ink;
+            BlackboardCanvas.UseCustomCursor = true;
             _drawingAttributes.FitToCurve = true;
             _drawingAttributes.IgnorePressure = false;
-
-            blackboard_canvas.Cursor = Cursors.Pen;
+            BlackboardCanvas.Cursor = Cursors.Pen;
         }
 
         /// <summary>
-        /// 圆
+        ///     圆
         /// </summary>
         public void Round()
         {
@@ -226,13 +225,13 @@ namespace XHWK.WKTool
                 IsHighlighter = false,
                 IgnorePressure = true,
             };
-            blackboard_canvas.DefaultDrawingAttributes = _drawingAttributes;
-            blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
-            blackboard_canvas.Cursor = Cursors.Cross;
+            BlackboardCanvas.DefaultDrawingAttributes = _drawingAttributes;
+            BlackboardCanvas.EditingMode = InkCanvasEditingMode.None;
+            BlackboardCanvas.Cursor = Cursors.Cross;
         }
 
         /// <summary>
-        /// 矩形
+        ///     矩形
         /// </summary>
         public void Rectangle()
         {
@@ -247,23 +246,25 @@ namespace XHWK.WKTool
                 IsHighlighter = false,
                 IgnorePressure = true,
             };
-            blackboard_canvas.DefaultDrawingAttributes = _drawingAttributes;
-            blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
-            blackboard_canvas.Cursor = Cursors.Cross;
+            BlackboardCanvas.DefaultDrawingAttributes = _drawingAttributes;
+            BlackboardCanvas.EditingMode = InkCanvasEditingMode.None;
+            BlackboardCanvas.Cursor = Cursors.Cross;
         }
 
         /// <summary>
-        /// 鼠标中键点击
+        ///     鼠标中键点击
         /// </summary>
         private void SwitchPages()
         {
             try
             {
-                new Thread(() =>
-                {
-                    Thread.Sleep(500);
-                    MouseEventCommon.MouseMiddleClickEvent(0);
-                }).Start();
+                new Thread(
+                    () =>
+                    {
+                        Thread.Sleep(500);
+                        MouseEventCommon.MouseMiddleClickEvent(0);
+                    }
+                ).Start();
             }
             catch (Exception ex)
             {
@@ -281,7 +282,6 @@ namespace XHWK.WKTool
             {
                 App.W_ScreenRecordingToolbarWindow.flg = 1;
             }
-
             ReturnPractice();
             //模拟切到ppt
             SwitchPages();
@@ -289,22 +289,26 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 退出批注并清空画板
+        ///     退出批注并清空画板
         /// </summary>
         public void ReturnPractice()
         {
-            blackboard_canvas.Strokes.Clear();
-            new Thread(() =>
-            {
-                Dispatcher.Invoke(() => { App.W_ScreenRecordingToolbarWindow.ModifyState(); });
-                _flg = 0;
-                Thread.Sleep(500);
-                Dispatcher.Invoke(() =>
+            BlackboardCanvas.Strokes.Clear();
+            new Thread(
+                () =>
                 {
-                    Owner = null;
-                    App.W_PracticeWindow.Hide();
-                });
-            }).Start();
+                    Dispatcher.Invoke(() => { App.W_ScreenRecordingToolbarWindow.ModifyState(); });
+                    _flg = 0;
+                    Thread.Sleep(500);
+                    Dispatcher.Invoke(
+                        () =>
+                        {
+                            Owner = null;
+                            App.W_PracticeWindow.Hide();
+                        }
+                    );
+                }
+            ).Start();
         }
 
         #region 点阵笔相关
@@ -326,9 +330,9 @@ namespace XHWK.WKTool
         private Stroke _strokes;
 
         /// <summary>
-        /// 引用user32.dll动态链接库（windows api），
-        /// 使用库中定义 API：SetCursorPos
-        /// 设置光标位置
+        ///     引用user32.dll动态链接库（windows api），
+        ///     使用库中定义 API：SetCursorPos
+        ///     设置光标位置
         /// </summary>
         [System.Runtime.InteropServices.DllImport("user32.dll")]
         private static extern int SetCursorPos(int x, int y);
@@ -338,21 +342,21 @@ namespace XHWK.WKTool
         #region 腾千里手写笔
 
         /// <summary>
-        /// 是否在书写
+        ///     是否在书写
         /// </summary>
         private bool _isTqlPenDown;
 
         /// <summary>
-        /// TQL点阵笔宽高
+        ///     TQL点阵笔宽高
         /// </summary>
-//static float TQLA4_WIDTH = (float)1075 / (float)150 * (float)25.4 / (float)1.524; //OID4
+        //static float TQLA4_WIDTH = (float)1075 / (float)150 * (float)25.4 / (float)1.524; //OID4
 //static float TQLA4_HEIGHT = (float)1512 / (float)150 * (float)25.4 / (float)1.524;
-        private const float Tqla4Width = 2480 / (float)300 * (float)25.4 / (float)1.524;
+        private const float TQLA4_WIDTH = 2480 / (float)300 * (float)25.4 / (float)1.524;
 
-        private const float Tqla4Height = 3509 / (float)300 * (float)25.4 / (float)1.524;
+        private const float TQLA4_HEIGHT = 3509 / (float)300 * (float)25.4 / (float)1.524;
 
         /// <summary>
-        /// 初始化
+        ///     初始化
         /// </summary>
         public void InitTqlpPen()
         {
@@ -367,7 +371,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 笔落下
+        ///     笔落下
         /// </summary>
         public void TqlDown()
         {
@@ -377,112 +381,110 @@ namespace XHWK.WKTool
             {
                 _isFirst = true;
             }
-
             _stylusPoints = new StylusPointCollection();
             _stylusPoint = new StylusPoint();
             _strokes = null;
         }
 
         /// <summary>
-        /// 笔抬起
+        ///     笔抬起
         /// </summary>
         public void TqlUp()
         {
             _isTqlPenDown = false;
-
             if (_strokes != null && _strokes.StylusPoints.Count > 1)
             {
                 _isFirst = true;
             }
-
             _stylusPoints = new StylusPointCollection();
             _stylusPoint = new StylusPoint();
             _strokes = null;
         }
 
         /// <summary>
-        /// 笔书写
+        ///     笔书写
         /// </summary>
         /// <param name="cx"></param>
         /// <param name="cy"></param>
         /// <param name="force"></param>
-        public void TqlPenWrite(double cx, double cy, int force)
+        public void TqlPenWrite
+        (
+            double cx,
+            double cy,
+            int force
+        )
         {
-            if (this.Visibility == Visibility.Visible)
+            if (Visibility == Visibility.Visible)
             {
                 //判断是否是落笔后输出的坐标，在设置悬浮模式下，落笔前的悬浮坐标不绘制
                 if (!_isTqlPenDown)
                 {
                     return;
                 }
-
-                double propW = blackboard_canvas.ActualWidth / Tqla4Height;
-                double propH = blackboard_canvas.ActualHeight / Tqla4Width;
-
+                double propW = BlackboardCanvas.ActualWidth / TQLA4_HEIGHT;
+                double propH = BlackboardCanvas.ActualHeight / TQLA4_WIDTH;
                 double tempX = cy * propW;
-                double tempY = (Tqla4Width - cx) * propH;
-                Dispatcher.Invoke(() =>
-                {
-                    //0~1023,亦即有 1024 阶供应用软件后续应用之用，如笔锋笔触，暂无用
-                    //添加笔画
-                    if (_isFirst)
+                double tempY = (TQLA4_WIDTH - cx) * propH;
+                Dispatcher.Invoke(
+                    () =>
                     {
-                        _stylusPoint.X = tempX;
-                        _stylusPoint.Y = tempY;
-                        _stylusPoints.Add(_stylusPoint);
-                        if (_stylusPoints.Count > 1)
-                        {
-                            _drawing = new DrawingAttributes
-                            {
-                                Color = _colour,
-                                Width = _wit * 4.5,
-                                Height = _wit * 4.5,
-                                FitToCurve = true,
-                                IgnorePressure = false
-                            };
-
-                            _strokes = new Stroke(_stylusPoints);
-
-                            _strokes.DrawingAttributes = _drawing;
-
-                            blackboard_canvas.Strokes.Add(_strokes);
-                            _isFirst = false;
-                        }
-                    }
-                    else
-                    {
-                        if (blackboard_canvas.Strokes.Count > 0)
+                        //0~1023,亦即有 1024 阶供应用软件后续应用之用，如笔锋笔触，暂无用
+                        //添加笔画
+                        if (_isFirst)
                         {
                             _stylusPoint.X = tempX;
                             _stylusPoint.Y = tempY;
                             _stylusPoints.Add(_stylusPoint);
-                            _strokes = new Stroke(_stylusPoints);
-                            _drawing = new DrawingAttributes
+                            if (_stylusPoints.Count > 1)
                             {
-                                Color = _colour,
-                                Width = _wit * 4.5,
-                                Height = _wit * 4.5,
-                                FitToCurve = true,
-                                IgnorePressure = false
-                            };
-                            _strokes.DrawingAttributes = _drawing;
-
-                            //viewModel.InkStrokes.Add(strokes);
-                            blackboard_canvas.Strokes[blackboard_canvas.Strokes.Count - 1] = _strokes;
+                                _drawing = new DrawingAttributes
+                                {
+                                    Color = _colour,
+                                    Width = _wit * 4.5,
+                                    Height = _wit * 4.5,
+                                    FitToCurve = true,
+                                    IgnorePressure = false
+                                };
+                                _strokes = new Stroke(_stylusPoints);
+                                _strokes.DrawingAttributes = _drawing;
+                                BlackboardCanvas.Strokes.Add(_strokes);
+                                _isFirst = false;
+                            }
+                        }
+                        else
+                        {
+                            if (BlackboardCanvas.Strokes.Count > 0)
+                            {
+                                _stylusPoint.X = tempX;
+                                _stylusPoint.Y = tempY;
+                                _stylusPoints.Add(_stylusPoint);
+                                _strokes = new Stroke(_stylusPoints);
+                                _drawing = new DrawingAttributes
+                                {
+                                    Color = _colour,
+                                    Width = _wit * 4.5,
+                                    Height = _wit * 4.5,
+                                    FitToCurve = true,
+                                    IgnorePressure = false
+                                };
+                                _strokes.DrawingAttributes = _drawing;
+
+                                //viewModel.InkStrokes.Add(strokes);
+                                BlackboardCanvas.Strokes[BlackboardCanvas.Strokes.Count - 1] = _strokes;
+                            }
                         }
-                    }
 
-                    //设置鼠标位置
-                    if (tempX > 0 && tempY > 0)
-                    {
-                        //System.Windows.Point getP = scroMain.PointToScreen(new System.Windows.Point(testX, testY - scroMain.VerticalOffset));
-                        SetCursorPos((int)((float)tempX * (PrimaryScreen.DpiX / 96f)),
-                            (int)((float)tempY * (PrimaryScreen.DpiY / 96f)));
+                        //设置鼠标位置
+                        if (tempX > 0 && tempY > 0)
+                        {
+                            //System.Windows.Point getP = scroMain.PointToScreen(new System.Windows.Point(testX, testY - scroMain.VerticalOffset));
+                            SetCursorPos((int)((float)tempX * (PrimaryScreen.DpiX / 96f)), (int)((float)tempY * (PrimaryScreen.DpiY / 96f)));
+                        }
                     }
-                });
+                );
             }
         }
 
         #endregion 腾千里手写笔
     }
-}
+}

XHWK.WKTool/ProductVerification.xaml

@@ -2,10 +2,9 @@
     x:Class="XHWK.WKTool.ProductVerification"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Views="clr-namespace:XHWK.WKTool.Helpers"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:XHWK.WKTool"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:views="clr-namespace:XHWK.WKTool.Helpers"
     Title="ProductVerification"
     Width="300"
     Height="230"
@@ -23,53 +22,18 @@
             ShadowDepth="0"
             Color="#bababa" />
     </Window.Effect>
-    <Window.Resources>
-        <Style x:Key="oiliu" TargetType="ListBoxItem">
-            <!--  设置控件模板  -->
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ListBoxItem">
-                        <Border
-                            Margin="4,0,0,0"
-                            Padding="0"
-                            Background="{TemplateBinding Background}">
-                            <ContentPresenter
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                TextBlock.Foreground="{TemplateBinding Foreground}" />
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <DataTemplate x:Key="UserTpl">
-            <StackPanel
-                Width="70.5"
-                Height="auto"
-                Background="Transparent">
-                <TextBlock
-                    Padding="0,12,0,0"
-                    HorizontalAlignment="Left"
-                    FontSize="20"
-                    Foreground="#3C525B"
-                    Text="{Binding username}" />
-            </StackPanel>
-        </DataTemplate>
-    </Window.Resources>
-    <Views:ZJClippingBorder Background="White" CornerRadius="10,10,10,10">
+    <Window.Resources />
+    <views:ZJClippingBorder Background="White" CornerRadius="10,10,10,10">
         <Grid Margin="0,0,0,0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="50" />
+                <RowDefinition Height="40" />
                 <RowDefinition Height="*" />
                 <RowDefinition Height="75" />
             </Grid.RowDefinitions>
             <!--  头部  -->
-            <Grid
-                Grid.Row="0"
-                Height="50"
-                Background="#4597FF">
+            <Grid Grid.Row="0" Background="#4597FF">
                 <TextBlock
-                    x:Name="title_tb"
+                    x:Name="TitleTb"
                     Grid.Row="0"
                     Margin="15,0,0,0"
                     HorizontalAlignment="Left"
@@ -86,8 +50,7 @@
                     VerticalAlignment="Center"
                     Background="White"
                     Click="CloseClick"
-                    Cursor="Hand"
-                    >
+                    Cursor="Hand">
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border
@@ -116,5 +79,5 @@
                 </StackPanel>
             </Grid>
         </Grid>
-    </Views:ZJClippingBorder>
-</Window>
+    </views:ZJClippingBorder>
+</Window>

XHWK.WKTool/ProductVerification.xaml.cs

@@ -7,21 +7,18 @@ using System.Windows;
 
 using XHWK.Model;
 using XHWK.WKTool.DAL;
-using XHWK.WKTool.Skin;
 
 namespace XHWK.WKTool
 {
     /// <summary>
-    /// ProductVerification.xaml 的交互逻辑
+    ///     ProductVerification.xaml 的交互逻辑
+    ///     本地解密  解密成功 日期在有效期内 ，判断当天是否调用添加历史接口，没有则调用
+    ///     解密失败 或解密获取的时间 过期 ， 跳到输入code 激活界面
     /// </summary>
-    /*
-     本地解密  解密成功 日期在有效期内 ，判断当天是否调用添加历史接口，没有则调用
-     解密失败 或解密获取的时间 过期 ， 跳到输入code 激活界面
-         */
-    public partial class ProductVerification : Window
+    public partial class ProductVerification
     {
-        private readonly XhApi registerController = new XhApi();
-        private int serverReturnCode = 0;
+        private readonly XhApi _registerController = new XhApi();
+        private int _serverReturnCode;
 
         public ProductVerification()
         {
@@ -30,8 +27,9 @@ namespace XHWK.WKTool
             Topmost = true;
             App.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationDecryptServering, InvokeActivationDecryptServerCompate);
         }
+
         /// <summary>
-        /// 激活信息--验证签名是否过期-调用
+        ///     激活信息--验证签名是否过期-调用
         /// </summary>
         /// <returns></returns>
         private object InvokeActivationDecryptServering()
@@ -40,7 +38,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 激活信息--验证签名是否过期-返回结果
+        ///     激活信息--验证签名是否过期-返回结果
         /// </summary>
         /// <returns></returns>
         public void InvokeActivationDecryptServerCompate(object obj)
@@ -53,67 +51,67 @@ namespace XHWK.WKTool
                 decrypt = decrypt.Replace("\u0001", "").Replace("\u0007", "").Trim();
                 ModelSignatures msgBean = JsonHelper.JsonToObj<ModelSignatures>(decrypt);
                 long currentTimeTimestamp = DataProvider.TimestampTotalSeconds(); //当前时间 时间戳
-                if (msgBean.endtime > currentTimeTimestamp)//条件成立  解析成功 code 在有效期内
+                if (msgBean.endtime > currentTimeTimestamp) //条件成立  解析成功 code 在有效期内
                 {
                     if (File.Exists(App.DataPath + "signatureTime.txt"))
                     {
                         string signatureTime = System.IO.File.ReadAllText(App.DataPath + "signatureTime.txt", Encoding.Default);
-                        string currentTime = DateTime.Now.ToLongDateString().ToString(); //当前时间  
+                        string currentTime = DateTime.Now.ToLongDateString(); //当前时间  
                         if (signatureTime != currentTime)
                         {
                             App.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering, InvokeActivationAddHistoryServerCompate);
                         }
                     }
-                    Dispatcher.Invoke(new Action(() =>
-                    {
-                        Hide();
-                        CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
-                        win.Show();
-                        Close();
-                    }));
+                    Dispatcher.Invoke(
+                        () =>
+                        {
+                            Hide();
+                            CreateWin win = new CreateWin();
+                            win.Show();
+                            Close();
+                        }
+                    );
                 }
-                else//时间失效
+                else //时间失效
                 {
-                    Dispatcher.Invoke(new Action(() =>
-                    {
-                        Hide();
-                        KeyVerification wins = new KeyVerification
+                    Dispatcher.Invoke(
+                        () =>
                         {
-                            Topmost = true
-                        };
-                        wins.ShowDialog();
-                        Close();
-                    }));
+                            Hide();
+                            KeyVerification wins = new KeyVerification { Topmost = true };
+                            wins.ShowDialog();
+                            Close();
+                        }
+                    );
                 }
             }
             catch (Exception ex) //解析失败 输code  
             {
                 LogHelper.Logerror.Error("ProductVerification(解析失败)" + ex.Message, ex);
-                Dispatcher.Invoke(new Action(() =>
-                {
-                    Hide();
-                    KeyVerification wins = new KeyVerification
+                Dispatcher.Invoke(
+                    () =>
                     {
-                        Topmost = true
-                    };
-                    wins.ShowDialog();
-                    Close();
-                }));
+                        Hide();
+                        KeyVerification wins = new KeyVerification { Topmost = true };
+                        wins.ShowDialog();
+                        Close();
+                    }
+                );
             }
-
         }
+
         /// <summary>
-        /// 激活信息--添加激活历史-调用
+        ///     激活信息--添加激活历史-调用
         /// </summary>
         /// <returns></returns>
         private object InvokeActivationAddHistoryServering()
         {
-            serverReturnCode = registerController.ActivationAddHistory();
+            _serverReturnCode = _registerController.ActivationAddHistory();
             return App.ServerMsg;
         }
 
         /// <summary>
-        /// 激活信息--添加激活历史-返回结果
+        ///     激活信息--添加激活历史-返回结果
         /// </summary>
         /// <returns></returns>
         public void InvokeActivationAddHistoryServerCompate(object obj)
@@ -122,13 +120,17 @@ namespace XHWK.WKTool
             {
                 Directory.CreateDirectory(App.DataPath);
             }
-            string ApplicationData = App.DataPath + "signatureTime.txt";
-            string currentTime = DateTime.Now.ToLongDateString().ToString();//当前时间
-            System.IO.File.WriteAllText(ApplicationData, currentTime, Encoding.Default);//存放签名验证日期
+            string applicationData = App.DataPath + "signatureTime.txt";
+            string currentTime = DateTime.Now.ToLongDateString(); //当前时间
+            System.IO.File.WriteAllText(
+                applicationData,
+                currentTime,
+                Encoding.Default
+            ); //存放签名验证日期
         }
 
         /// <summary>
-        /// 关闭弹窗
+        ///     关闭弹窗
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -138,12 +140,11 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 退出程序
+        ///     退出程序
         /// </summary>
         private void CloseAction()
         {
-            Dispatcher.Invoke
-            (
+            Dispatcher.Invoke(
                 () =>
                 {
                     Application.Current.Shutdown();
@@ -156,6 +157,7 @@ namespace XHWK.WKTool
             //Console.WriteLine("{0}被销毁", this);
             Dispose(false);
         }
+
         public void Dispose()
         {
             //Console.WriteLine("{0}被手动销毁", this);
@@ -163,21 +165,21 @@ namespace XHWK.WKTool
             GC.SuppressFinalize(this);
         }
 
-        private bool disposed;
+        private bool _disposed;
+
         protected void Dispose(bool disposing)
         {
             //Console.WriteLine("{0}被自动销毁", this);
-            if (!disposed)
+            if (!_disposed)
             {
                 if (disposing)
                 {
                     //托管资源释放
-
                 }
                 //非托管资源释放
                 // ...
             }
-            disposed = true;
+            _disposed = true;
         }
     }
-}
+}

XHWK.WKTool/PromptWindow.xaml

@@ -42,7 +42,7 @@
                 Foreground="#919191"
                 Text="删除" />
             <TextBlock
-                x:Name="txbName"
+                x:Name="TxbName"
                 FontSize="18"
                 Foreground="#919191"
                 Text="微课01" />
@@ -54,11 +54,11 @@
             HorizontalAlignment="Right"
             Orientation="Horizontal">
             <Border
-                x:Name="borCancel"
+                x:Name="BorCancel"
                 Background="#E5E5E5"
                 CornerRadius="6">
                 <Button
-                    x:Name="btnCancel"
+                    x:Name="BtnCancel"
                     Width="104"
                     Height="42"
                     Background="Transparent"

XHWK.WKTool/PromptWindow.xaml.cs

@@ -4,33 +4,29 @@ using System.Windows.Media;
 namespace XHWK.WKTool
 {
     /// <summary>
-    /// PromptWindow.xaml 的交互逻辑
+    ///     PromptWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class PromptWindow : Window
+    public partial class PromptWindow
     {
         public PromptWindow()
         {
             InitializeComponent();
         }
-        public void Initialize(string _name)
+
+        public void Initialize(string name)
         {
-            txbName.Text = _name;
+            TxbName.Text = name;
         }
+
         private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             System.Windows.Rect r = new System.Windows.Rect(e.NewSize);
-            RectangleGeometry gm = new RectangleGeometry(r, 1, 1);
+            RectangleGeometry gm = new RectangleGeometry(
+                r,
+                1,
+                1
+            );
             ((UIElement)sender).Clip = gm;
         }
-
-        private void Window_SizeChanged_1(object sender, SizeChangedEventArgs e)
-        {
-
-        }
-
-        private void Window_SizeChanged1(object sender, SizeChangedEventArgs e)
-        {
-
-        }
     }
-}
+}

XHWK.WKTool/ResourceDictionary.xaml

@@ -1,6 +1,5 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <FontFamily x:Key="QuartzRegular">../Resources/#QuartzRegular</FontFamily>
 
 
-</ResourceDictionary>
+</ResourceDictionary>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -146,7 +146,6 @@
                     Grid.Column="3">
                     <Label
                         x:Name="TxbTime"
-                        Grid.Column="1"
                         Padding="0"
                         HorizontalContentAlignment="Center"
                         VerticalContentAlignment="Center"
@@ -192,7 +191,7 @@
                     </Button>
                     <!--  选中  -->
                     <Button
-                        x:Name="BtnPenBlue_CL"
+                        x:Name="BtnPenBlueCl"
                         Click="BtnBrush_Click"
                         Cursor="Hand"
                         ToolTip="蓝笔"
@@ -227,7 +226,7 @@
                     </Button>
                     <!--  选中  -->
                     <Button
-                        x:Name="BtnPenRed_CL"
+                        x:Name="BtnPenRedCl"
                         Click="BtnBlackPenTwo_Click"
                         Cursor="Hand"
                         ToolTip="批注"
@@ -277,4 +276,4 @@
             </Grid>
         </Grid>
     </Grid>
-</Window>
+</Window>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -1,5 +1,7 @@
 using Common.system;
+
 using NReco.VideoConverter;
+
 using System;
 using System.Drawing;
 using System.IO;
@@ -9,6 +11,7 @@ using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Interop;
 using System.Windows.Threading;
+
 using XHWK.Model;
 using XHWK.WKTool.Utils;
 
@@ -17,36 +20,36 @@ namespace XHWK.WKTool
     using system;
 
     /// <summary>
-    /// 录屏工具栏
+    ///     录屏工具栏
     /// </summary>
     public partial class ScreenRecordingToolbarWindow
     {
         #region 初始变量
 
         /// <summary>
-        /// 视频保存名称
+        ///     视频保存名称
         /// </summary>
         private string _videoSavePathName;
 
         /// <summary>
-        /// 临时视频路径
+        ///     临时视频路径
         /// </summary>
         private string _tempVideoPathName;
 
         /// <summary>
-        /// 临时麦克风路径
+        ///     临时麦克风路径
         /// </summary>
         private string _tempAudioPathName1;
 
         /// <summary>
-        /// 临时扬声器路径
+        ///     临时扬声器路径
         /// </summary>
         private string _tempAudioPathName2;
 
         private readonly string _temppath = App.WKData.WkPath + "_temppath/";
 
         /// <summary>
-        /// 视频信息
+        ///     视频信息
         /// </summary>
         private ModelVideo _videoInfo;
 
@@ -55,7 +58,7 @@ namespace XHWK.WKTool
         private DispatcherTimer _t;
 
         /// <summary>
-        /// 计时器状态
+        ///     计时器状态
         /// </summary>
         private enum State
         {
@@ -66,14 +69,14 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 状态
+        ///     状态
         /// </summary>
         private State _state = State.End;
 
         private KeyboardHookCommon _kHook;
 
         /// <summary>
-        /// 🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
+        ///     🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
         /// </summary>
         public int flg;
 
@@ -82,7 +85,7 @@ namespace XHWK.WKTool
         #region 初始化
 
         /// <summary>
-        /// 录屏工具栏
+        ///     录屏工具栏
         /// </summary>
         public ScreenRecordingToolbarWindow()
         {
@@ -91,7 +94,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 初始化
+        ///     初始化
         /// </summary>
         public void Initialize()
         {
@@ -110,8 +113,7 @@ namespace XHWK.WKTool
             }
             App.W_PracticeWindow.InitTqlpPen();
             App.W_PracticeWindow.Show();
-            new Thread
-            (
+            new Thread(
                 () =>
                 {
                     Thread.Sleep(100);
@@ -133,8 +135,8 @@ namespace XHWK.WKTool
             BtnPenRed.IsEnabled = false; //红笔不可点击
             BtnPenBlue.Visibility = Visibility.Visible;
             BtnPenRed.Visibility = Visibility.Visible;
-            BtnPenBlue_CL.Visibility = Visibility.Collapsed;
-            BtnPenRed_CL.Visibility = Visibility.Collapsed;
+            BtnPenBlueCl.Visibility = Visibility.Collapsed;
+            BtnPenRedCl.Visibility = Visibility.Collapsed;
             TxbTime.Content = "00:00:00";
         }
 
@@ -159,7 +161,7 @@ namespace XHWK.WKTool
         private DateTime _srTime = Convert.ToDateTime("2020-01-01 00:00:00");
 
         /// <summary>
-        /// 时钟回调
+        ///     时钟回调
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -173,7 +175,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 结束
+        ///     结束
         /// </summary>
         private void End()
         {
@@ -183,7 +185,7 @@ namespace XHWK.WKTool
         #region 录屏
 
         /// <summary>
-        /// 设置录屏文件地址
+        ///     设置录屏文件地址
         /// </summary>
         private void SetSavePath()
         {
@@ -204,7 +206,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 是否已经按下按钮
+        ///     是否已经按下按钮
         /// </summary>
         private bool _isPressButton;
 
@@ -220,7 +222,7 @@ namespace XHWK.WKTool
         public IntPtr winHandle; // 当前窗体指针
 
         /// <summary>
-        /// 开始或暂停录制
+        ///     开始或暂停录制
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -233,8 +235,7 @@ namespace XHWK.WKTool
                 return;
             }
             _isPressButton = true;
-            new Thread
-            (
+            new Thread(
                 () =>
                 {
                     Thread.Sleep(500);
@@ -252,8 +253,7 @@ namespace XHWK.WKTool
                 {
                     _t = new DispatcherTimer();
                     _t.Tick += OnTimer;
-                    _t.Interval = new TimeSpan
-                    (
+                    _t.Interval = new TimeSpan(
                         0,
                         0,
                         0,
@@ -265,8 +265,7 @@ namespace XHWK.WKTool
                 }
                 else
                 {
-                    _t.Interval = new TimeSpan
-                    (
+                    _t.Interval = new TimeSpan(
                         0,
                         0,
                         0,
@@ -289,8 +288,8 @@ namespace XHWK.WKTool
                 BtnPenRed.IsEnabled = true; //红笔可点击
                 BtnPenBlue.Visibility = Visibility.Visible;
                 BtnPenRed.Visibility = Visibility.Visible;
-                BtnPenBlue_CL.Visibility = Visibility.Collapsed;
-                BtnPenRed_CL.Visibility = Visibility.Collapsed;
+                BtnPenBlueCl.Visibility = Visibility.Collapsed;
+                BtnPenRedCl.Visibility = Visibility.Collapsed;
                 TxbTime.Visibility = Visibility.Visible; //时间显示
 
                 #region 隐藏工具栏
@@ -314,11 +313,10 @@ namespace XHWK.WKTool
                 {
                     // 视频
                     winHandle = new WindowInteropHelper(this).Handle;
-                    var curScreen = Screen.FromHandle(winHandle);
+                    Screen curScreen = Screen.FromHandle(winHandle);
                     int recordWidth = curScreen.Bounds.Width;
                     int recordHeight = curScreen.Bounds.Height;
-                    _helper0 = new ZVideoRecordHelper
-                    (
+                    _helper0 = new ZVideoRecordHelper(
                         _tempVideoPathName,
                         recordWidth,
                         recordHeight
@@ -403,7 +401,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 停止录像
+        ///     停止录像
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -418,8 +416,7 @@ namespace XHWK.WKTool
             else
             {
                 _isPressButton = true;
-                new Thread
-                (
+                new Thread(
                     () =>
                     {
                         Thread.Sleep(500);
@@ -457,8 +454,7 @@ namespace XHWK.WKTool
                 _helper0.StopRecordVideo();
                 _helper1.StopRecordAudio();
                 _helper2.StopRecordAudio();
-                new Thread
-                (
+                new Thread(
                     () =>
                     {
                         FFMpegConverter ffMpeg = new FFMpegConverter();
@@ -471,8 +467,7 @@ namespace XHWK.WKTool
                         try
                         {
                             // 多路音频混音
-                            ffMpeg.ConvertMedia
-                            (
+                            ffMpeg.ConvertMedia(
                                 input,
                                 _videoSavePathName,
                                 "mp4",
@@ -529,7 +524,7 @@ namespace XHWK.WKTool
         #region 画笔相关
 
         /// <summary>
-        /// 笔调用批注
+        ///     笔调用批注
         /// </summary>
         public void PenPractice()
         {
@@ -544,8 +539,7 @@ namespace XHWK.WKTool
                 else
                 {
                     _isPressButton = true;
-                    new Thread
-                    (
+                    new Thread(
                         () =>
                         {
                             Thread.Sleep(500);
@@ -559,8 +553,7 @@ namespace XHWK.WKTool
                 GetTimeStamp();
                 try
                 {
-                    Dispatcher.Invoke
-                    (
+                    Dispatcher.Invoke(
                         () =>
                         {
                             if (App.W_PracticeWindow == null)
@@ -581,8 +574,7 @@ namespace XHWK.WKTool
                             App.W_PracticeWindow.Focus();
                         }
                     );
-                    new Thread
-                    (
+                    new Thread(
                         () =>
                         {
                             Dispatcher.Invoke(() => { App.W_PracticeWindow.Topmost = false; });
@@ -599,7 +591,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 画笔点击事件
+        ///     画笔点击事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -619,8 +611,7 @@ namespace XHWK.WKTool
             else
             {
                 _isPressButton = true;
-                new Thread
-                (
+                new Thread(
                     () =>
                     {
                         Thread.Sleep(500);
@@ -633,8 +624,8 @@ namespace XHWK.WKTool
 
             BtnPenBlue.Visibility = Visibility.Collapsed;
             BtnPenRed.Visibility = Visibility.Visible;
-            BtnPenBlue_CL.Visibility = Visibility.Visible;
-            BtnPenRed_CL.Visibility = Visibility.Collapsed;
+            BtnPenBlueCl.Visibility = Visibility.Visible;
+            BtnPenRedCl.Visibility = Visibility.Collapsed;
             GetTimeStamp();
             try
             {
@@ -687,13 +678,11 @@ namespace XHWK.WKTool
                     flg = 11;
                     App.W_PracticeWindow.Blue();
                     App.W_PracticeWindow.Show();
-                    new Thread
-                    (
+                    new Thread(
                         () =>
                         {
                             Thread.Sleep(100);
-                            Dispatcher.Invoke
-                            (
+                            Dispatcher.Invoke(
                                 () =>
                                 {
                                     //Owner = APP.W_PracticeWindow;
@@ -713,24 +702,23 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 屏幕宽
+        ///     屏幕宽
         /// </summary>
         internal double pwidth = SystemParameters.PrimaryScreenWidth;
 
         /// <summary>
-        /// 屏幕高
+        ///     屏幕高
         /// </summary>
         internal double pHeight = SystemParameters.PrimaryScreenHeight;
 
         /// <summary>
-        /// 获取时间戳
+        ///     获取时间戳
         /// </summary>
         /// <returns></returns>
         public string GetTimeStamp()
         {
-            TimeSpan ts = DateTime.Now
-            - new DateTime
-            (
+            TimeSpan ts = DateTime.Now -
+            new DateTime(
                 1970,
                 1,
                 1,
@@ -747,17 +735,17 @@ namespace XHWK.WKTool
         #endregion 事件
 
         /// <summary>
-        /// 停止录屏
+        ///     停止录屏
         /// </summary>
         public delegate void StopRecordingScreen();
 
         /// <summary>
-        /// 停止录屏
+        ///     停止录屏
         /// </summary>
         public event StopRecordingScreen ClickStopRecordingScreen;
 
         /// <summary>
-        /// 红笔
+        ///     红笔
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -777,8 +765,7 @@ namespace XHWK.WKTool
             else
             {
                 _isPressButton = true;
-                new Thread
-                (
+                new Thread(
                     () =>
                     {
                         Thread.Sleep(500);
@@ -791,17 +778,15 @@ namespace XHWK.WKTool
 
             BtnPenBlue.Visibility = Visibility.Visible;
             BtnPenRed.Visibility = Visibility.Collapsed;
-            BtnPenBlue_CL.Visibility = Visibility.Collapsed;
-            BtnPenRed_CL.Visibility = Visibility.Visible;
+            BtnPenBlueCl.Visibility = Visibility.Collapsed;
+            BtnPenRedCl.Visibility = Visibility.Visible;
             string time = GetTimeStamp();
 
             #region 录屏批注取消画笔
 
             string imagePath = Path.Combine(_temppath, time + ".jpg");
-            ImageHelper.GetScreenshot
-            (
-                new Rectangle
-                (
+            ImageHelper.GetScreenshot(
+                new Rectangle(
                     0,
                     0,
                     0,
@@ -841,13 +826,11 @@ namespace XHWK.WKTool
                     flg = 10;
                     App.W_PracticeWindow.Red();
                     App.W_PracticeWindow.Show();
-                    new Thread
-                    (
+                    new Thread(
                         () =>
                         {
                             Thread.Sleep(100);
-                            Dispatcher.Invoke
-                            (
+                            Dispatcher.Invoke(
                                 () =>
                                 {
                                     //Owner = APP.W_PracticeWindow;
@@ -865,7 +848,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 返回主界面
+        ///     返回主界面
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -873,8 +856,7 @@ namespace XHWK.WKTool
         {
             if (_state == State.Pause || _state == State.Start)
             {
-                MessageBoxResult br = MessageWindow.Show
-                (
+                MessageBoxResult br = MessageWindow.Show(
                     "退出将结束并保存录制，是否继续？",
                     "提示",
                     MessageBoxButton.OKCancel
@@ -889,13 +871,11 @@ namespace XHWK.WKTool
             //APP.W_XHMicroLessonSystemWindow.InitPen();
             App.W_XHMicroLessonSystemWindow.InitTqlpPen();
             App.W_XHMicroLessonSystemWindow.Show();
-            new Thread
-            (
+            new Thread(
                 () =>
                 {
                     Thread.Sleep(700);
-                    Dispatcher.Invoke
-                    (
+                    Dispatcher.Invoke(
                         () =>
                         {
                             if (App.W_MinToolbar != null)
@@ -910,14 +890,14 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 修改笔状态
+        ///     修改笔状态
         /// </summary>
         public void ModifyState()
         {
             BtnPenBlue.Visibility = Visibility.Visible;
             BtnPenRed.Visibility = Visibility.Visible;
-            BtnPenBlue_CL.Visibility = Visibility.Collapsed;
-            BtnPenRed_CL.Visibility = Visibility.Collapsed;
+            BtnPenBlueCl.Visibility = Visibility.Collapsed;
+            BtnPenRedCl.Visibility = Visibility.Collapsed;
         }
 
         private void gridToobarTwo_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
@@ -933,17 +913,15 @@ namespace XHWK.WKTool
                     }
                     App.W_MinToolbar.Topmost = true;
                     double minToolTop = Top;
-                    new Thread
-                    (
+                    new Thread(
                         () =>
                         {
                             Thread.Sleep(500);
-                            Dispatcher.Invoke
-                            (
+                            Dispatcher.Invoke(
                                 () =>
                                 {
                                     MouseEventCommon.GetCursorPos(out MouseEventCommon.Point pointRecord);
-                                    if (pointRecord.X >= this.Left && pointRecord.X < this.Left + this.ActualWidth && pointRecord.Y >= this.Top && pointRecord.Y < this.Top + this.ActualHeight)
+                                    if (pointRecord.X >= Left && pointRecord.X < Left + ActualWidth && pointRecord.Y >= Top && pointRecord.Y < Top + ActualHeight)
                                     {
                                         //LblMessage.Content = "在区域内：("+ pointRecord.X+","+pointRecord.Y+") ("+ Left + ","+Top+")";
                                     }
@@ -962,4 +940,4 @@ namespace XHWK.WKTool
             }
         }
     }
-}
+}

XHWK.WKTool/Skin/SkinDictionary_TechnologyBlue.xaml

@@ -52,7 +52,7 @@
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/TechnologyBlue/HM_Close_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -80,11 +80,11 @@
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZ_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZ_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZ_N.png" />
@@ -115,11 +115,11 @@
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZZT_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZZT_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZZT_N.png" />
@@ -150,11 +150,11 @@
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_Save_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_Save_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_Save_N.png" />

XHWK.WKTool/Skin/SkinDictionary_White.xaml

@@ -78,11 +78,11 @@
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_N.png" />
@@ -113,11 +113,11 @@
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_N.png" />
@@ -148,11 +148,11 @@
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_MI.png" />
-                <Setter TargetName="Word" Property="Foreground" Value="#3f6fff" />
+                <Setter TargetName="Word" Property="Foreground" Value="#4597FF" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_N.png" />

XHWK.WKTool/UploadWindow.xaml

@@ -28,7 +28,7 @@
         <Grid
             x:Name="GridTitle"
             Grid.Row="0"
-            Background="#3f6fff"
+            Background="#4597FF"
             MouseLeftButtonDown="Window_MouseLeftButtonDown"
             Visibility="Visible">
             <TextBlock
@@ -37,7 +37,7 @@
                 Foreground="#FFFFFF"
                 Text="上传" />
             <Button
-                x:Name="btnDown"
+                x:Name="BtnDown"
                 Grid.Row="0"
                 Width="45"
                 Height="45"
@@ -49,7 +49,7 @@
                 Foreground="#FFFFFF" />
         </Grid>
         <Grid
-            x:Name="GridTitle_Black"
+            x:Name="GridTitleBlack"
             Grid.Row="0"
             Margin="0,0"
             Background="#FFE9E9E9"
@@ -61,7 +61,7 @@
                 Foreground="#FF333333"
                 Text="上传" />
             <Button
-                x:Name="btnDown_Black"
+                x:Name="BtnDownBlack"
                 Grid.Row="0"
                 Padding="10,0,10,0"
                 HorizontalAlignment="Right"
@@ -73,7 +73,7 @@
         </Grid>
         <!--  第三行 教材  -->
         <ComboBox
-            x:Name="book_list"
+            x:Name="BookList"
             Grid.Row="2"
             Width="400"
             Height="50"
@@ -97,7 +97,7 @@
         </ComboBox>
         <!--  章节  -->
         <ComboBox
-            x:Name="cmbTeachingMaterial"
+            x:Name="CmbTeachingMaterial"
             Grid.Row="3"
             Width="400"
             Height="50"
@@ -118,7 +118,7 @@
         </ComboBox>
         <!--  第四行 开始按钮  -->
         <Button
-            x:Name="btnStart"
+            x:Name="BtnStart"
             Grid.Row="4"
             Width="400"
             Height="42"
@@ -135,7 +135,7 @@
                         BorderBrush="{TemplateBinding Control.BorderBrush}"
                         BorderThickness="1"
                         CornerRadius="21">
-                        <Border.Background>#3f6fff</Border.Background>
+                        <Border.Background>#4597FF</Border.Background>
                         <ContentPresenter
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
@@ -145,7 +145,7 @@
             </Button.Template>
         </Button>
         <views:ZJClippingBorder
-            x:Name="tip_outer"
+            x:Name="TipOuter"
             Grid.Row="0"
             Grid.RowSpan="2"
             Margin="0"
@@ -160,7 +160,7 @@
                     Content="上传中..."
                     FontSize="16" />
                 <ProgressBar
-                    x:Name="pgbProcess"
+                    x:Name="PgbProcess"
                     Grid.Row="0"
                     Height="20"
                     Margin="50,20,50,0"
@@ -168,7 +168,7 @@
                     Foreground="#4597FF"
                     Visibility="Visible" />
                 <Label
-                    x:Name="lbProcess"
+                    x:Name="LbProcess"
                     Grid.Row="0"
                     Width="60"
                     Height="30"

XHWK.WKTool/UploadWindow.xaml.cs

@@ -15,37 +15,37 @@ using static XHWK.WKTool.MainWindow;
 namespace XHWK.WKTool
 {
     /// <summary>
-    /// UploadWindow.xaml 的交互逻辑
+    ///     UploadWindow.xaml 的交互逻辑
     /// </summary>
     public partial class UploadWindow
     {
         /// <summary>
-        /// 调用接口
+        ///     调用接口
         /// </summary>
         private readonly XhApi _xhapi = new XhApi();
 
         /// <summary>
-        /// 前台数据
+        ///     前台数据
         /// </summary>
         internal LoginPageData pageData = new LoginPageData();
 
         /// <summary>
-        /// 文件名
+        ///     文件名
         /// </summary>
         private string _resourcename = string.Empty;
 
         /// <summary>
-        /// 文件大小
+        ///     文件大小
         /// </summary>
         private long _resourcesize;
 
         /// <summary>
-        /// 文件类型
+        ///     文件类型
         /// </summary>
         private string _suffix = string.Empty;
 
         /// <summary>
-        /// 唯一编号
+        ///     唯一编号
         /// </summary>
         private string _guid = string.Empty;
 
@@ -53,7 +53,7 @@ namespace XHWK.WKTool
         public event ChangeTextHandlers ResultEvents;
 
         /// <summary>
-        /// 当前视频的下标
+        ///     当前视频的下标
         /// </summary>
         private int _i;
 
@@ -65,7 +65,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 初始化
+        ///     初始化
         /// </summary>
         public void Initialize
         (
@@ -76,17 +76,17 @@ namespace XHWK.WKTool
             int m
         )
         {
-            this._i = m;
-            this._resourcename = mResourcename;
-            this._resourcesize = mResourcesize;
-            this._suffix = mSuffix;
-            this._guid = mGuid;
-            tip_outer.Visibility = Visibility.Collapsed;
+            _i = m;
+            _resourcename = mResourcename;
+            _resourcesize = mResourcesize;
+            _suffix = mSuffix;
+            _guid = mGuid;
+            TipOuter.Visibility = Visibility.Collapsed;
             Tsubjectbook();
         }
 
         /// <summary>
-        /// 教材接口调用
+        ///     教材接口调用
         /// </summary>
         /// <returns>
         /// </returns>
@@ -97,8 +97,7 @@ namespace XHWK.WKTool
             {
                 for (int i = 0; i < App.TsubjectbookList.Count; i++)
                 {
-                    pageData.bookList.Add
-                    (
+                    pageData.bookList.Add(
                         new ComboBoxBean()
                         {
                             Key = App.TsubjectbookList[i].Lsbid,
@@ -107,7 +106,7 @@ namespace XHWK.WKTool
                         }
                     );
                 }
-                book_list.SelectedIndex = 0;
+                BookList.SelectedIndex = 0;
                 DataContext = pageData;
                 if (App.TsubjectbookList.Count > 0)
                 {
@@ -128,19 +127,18 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 章节接口调用
+        ///     章节接口调用
         /// </summary>
         private void Director()
         {
-            int selectIndex = book_list.SelectedIndex;
+            int selectIndex = BookList.SelectedIndex;
             if (selectIndex < 0)
             {
                 selectIndex = 0;
             }
             if (App.TsubjectbookList.Count > selectIndex)
             {
-                int code = _xhapi.DirectorList
-                (
+                int code = _xhapi.DirectorList(
                     App.TsubjectbookList[selectIndex].Lsbid,
                     4,
                     App.UserInfo.Userid
@@ -148,12 +146,19 @@ namespace XHWK.WKTool
                 if (code == 0)
                 {
                     pageData.zhangjieList.Clear();
-                    foreach (var item in App.DirectorList)
+                    foreach (ModelDirectorList item in App.DirectorList)
                     {
-                        pageData.zhangjieList.Add(new ComboBoxBean() { Key = item.directorid, Value = item.directorname, leaf = item.leaf });
+                        pageData.zhangjieList.Add(
+                            new ComboBoxBean()
+                            {
+                                Key = item.directorid,
+                                Value = item.directorname,
+                                leaf = item.leaf
+                            }
+                        );
                         AddChild(item);
                     }
-                    cmbTeachingMaterial.SelectedIndex = 0;
+                    CmbTeachingMaterial.SelectedIndex = 0;
                 }
                 else
                 {
@@ -163,7 +168,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 子章节递归
+        ///     子章节递归
         /// </summary>
         /// <param name="directorList">
         /// </param>
@@ -173,7 +178,14 @@ namespace XHWK.WKTool
             {
                 foreach (ModelDirectorList child in directorList.children)
                 {
-                    pageData.zhangjieList.Add(new ComboBoxBean() { Key = child.directorid, Value = GetSpace(child.directorlevel) + child.directorname, leaf = child.leaf });
+                    pageData.zhangjieList.Add(
+                        new ComboBoxBean()
+                        {
+                            Key = child.directorid,
+                            Value = GetSpace(child.directorlevel) + child.directorname,
+                            leaf = child.leaf
+                        }
+                    );
                     if (child.children != null && child.children.Count > 0)
                     {
                         AddChild(child);
@@ -183,7 +195,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 章节是否加空格符
+        ///     章节是否加空格符
         /// </summary>
         /// <param name="num">
         /// </param>
@@ -213,7 +225,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 教材下拉框改变事件
+        ///     教材下拉框改变事件
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -240,7 +252,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 上传到个人空间
+        ///     上传到个人空间
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -248,28 +260,26 @@ namespace XHWK.WKTool
         /// </param>
         private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
-            if (string.IsNullOrWhiteSpace(book_list.Text))
+            if (string.IsNullOrWhiteSpace(BookList.Text))
             {
                 MessageWindow.Show("请选择教材！");
                 return;
             }
-
-            if (cmbTeachingMaterial.SelectedIndex < pageData.zhangjieList.Count)
+            if (CmbTeachingMaterial.SelectedIndex < pageData.zhangjieList.Count)
             {
-                int leaf = pageData.zhangjieList[cmbTeachingMaterial.SelectedIndex].leaf;
+                int leaf = pageData.zhangjieList[CmbTeachingMaterial.SelectedIndex].leaf;
                 if (leaf != 1)
                 {
                     MessageWindow.Show("只能选择小节或全部进行上传！");
                     return;
                 }
             }
-
-            btnStart.IsEnabled = false;
-            book_list.IsEnabled = false;
-            cmbTeachingMaterial.IsEnabled = false;
+            BtnStart.IsEnabled = false;
+            BookList.IsEnabled = false;
+            CmbTeachingMaterial.IsEnabled = false;
             Thread myThread = new Thread(StartUpload);
             _num = 0;
-            tip_outer.Visibility = Visibility.Visible;
+            TipOuter.Visibility = Visibility.Visible;
             myThread.Start();
             _times = new System.Timers.Timer(100);
             _times.Elapsed += Times_ElapsedClick;
@@ -302,20 +312,19 @@ namespace XHWK.WKTool
                     //suffix: "mp4"
                     //uid: 80
                     ModelResourceAdd modelResourceAdd = new ModelResourceAdd();
-                    Dispatcher.Invoke
-                    (
+                    Dispatcher.Invoke(
                         () =>
                         {
                             modelResourceAdd = new ModelResourceAdd
                             {
                                 converted = 0,
                                 createid = App.UserInfo.Userid,
-                                directorid = cmbTeachingMaterial.SelectedValue.ToString(),
+                                directorid = CmbTeachingMaterial.SelectedValue.ToString(),
                                 duration = App.ResourceAddTwo.duration,
-                                subjectid = App.TsubjectbookList[book_list.SelectedIndex].Subjectid,
+                                subjectid = App.TsubjectbookList[BookList.SelectedIndex].Subjectid,
                                 imgUrl = "",
                                 level = 2,
-                                lsbid = book_list.SelectedValue.ToString(),
+                                lsbid = BookList.SelectedValue.ToString(),
                                 mp4code = App.ResourceAddTwo.mp4code,
                                 resourcebelong = 3,
                                 resourceclass = 5,
@@ -345,8 +354,7 @@ namespace XHWK.WKTool
                     int code = _xhapi.ResourceAdd(modelResourceAdd);
                     if (code == 0)
                     {
-                        Dispatcher.Invoke
-                        (
+                        Dispatcher.Invoke(
                             () =>
                             {
                                 foreach (ModelWkData vdata in App.WKDataList)
@@ -364,15 +372,15 @@ namespace XHWK.WKTool
                                         }
                                     }
                                 }
-                                btnStart.IsEnabled = true;
-                                book_list.IsEnabled = true;
-                                cmbTeachingMaterial.IsEnabled = true;
+                                BtnStart.IsEnabled = true;
+                                BookList.IsEnabled = true;
+                                CmbTeachingMaterial.IsEnabled = true;
                                 _num = 99;
                                 _times.Stop();
-                                pgbProcess.Value = 100;
-                                lbProcess.Content = "100%";
+                                PgbProcess.Value = 100;
+                                LbProcess.Content = "100%";
                                 Hide();
-                                tip_outer.Visibility = Visibility.Collapsed;
+                                TipOuter.Visibility = Visibility.Collapsed;
                                 MessageWindow.Show("视频上传成功！");
                                 if (ResultEvents != null)
                                 {
@@ -383,15 +391,14 @@ namespace XHWK.WKTool
                     }
                     else
                     {
-                        Dispatcher.Invoke
-                        (
+                        Dispatcher.Invoke(
                             () =>
                             {
-                                btnStart.IsEnabled = true;
-                                book_list.IsEnabled = true;
-                                cmbTeachingMaterial.IsEnabled = true;
+                                BtnStart.IsEnabled = true;
+                                BookList.IsEnabled = true;
+                                CmbTeachingMaterial.IsEnabled = true;
                                 _times.Stop();
-                                tip_outer.Visibility = Visibility.Collapsed;
+                                TipOuter.Visibility = Visibility.Collapsed;
                                 MessageWindow.Show(App.ServerMsg);
                             }
                         );
@@ -399,15 +406,14 @@ namespace XHWK.WKTool
                 }
                 else
                 {
-                    Dispatcher.Invoke
-                    (
+                    Dispatcher.Invoke(
                         () =>
                         {
-                            btnStart.IsEnabled = true;
-                            book_list.IsEnabled = true;
-                            cmbTeachingMaterial.IsEnabled = true;
+                            BtnStart.IsEnabled = true;
+                            BookList.IsEnabled = true;
+                            CmbTeachingMaterial.IsEnabled = true;
                             _times.Stop();
-                            tip_outer.Visibility = Visibility.Collapsed;
+                            TipOuter.Visibility = Visibility.Collapsed;
                             MessageWindow.Show(errMessage);
                         }
                     );
@@ -415,25 +421,27 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                Dispatcher.Invoke(() =>
-                {
-                    btnStart.IsEnabled = true;
-                    book_list.IsEnabled = true;
-                    cmbTeachingMaterial.IsEnabled = true;
-                    _times.Stop();
-                    tip_outer.Visibility = Visibility.Collapsed;
-                    MessageWindow.Show("无法上传视频，请检查与服务器链接状态！");
-                    App.IsUpLoad = false;
-                    Hide();
-                    LogHelper.Logerror.Error("【UploadWindow】(BtnStart_Click)" + ex.Message, ex);
-                });
+                Dispatcher.Invoke(
+                    () =>
+                    {
+                        BtnStart.IsEnabled = true;
+                        BookList.IsEnabled = true;
+                        CmbTeachingMaterial.IsEnabled = true;
+                        _times.Stop();
+                        TipOuter.Visibility = Visibility.Collapsed;
+                        MessageWindow.Show("无法上传视频，请检查与服务器链接状态！");
+                        App.IsUpLoad = false;
+                        Hide();
+                        LogHelper.Logerror.Error("【UploadWindow】(BtnStart_Click)" + ex.Message, ex);
+                    }
+                );
             }
         }
 
         private int _num;
 
         /// <summary>
-        /// 计时器
+        ///     计时器
         /// </summary>
         /// <param name="sender">
         /// </param>
@@ -441,21 +449,23 @@ namespace XHWK.WKTool
         /// </param>
         private void Times_ElapsedClick(object sender, System.Timers.ElapsedEventArgs e)
         {
-            Dispatcher.Invoke(() =>
-            {
-                pgbProcess.Value = _num;
-                lbProcess.Content = _num + "%";
-                if (_num < 99)
-                {
-                    _num++;
-                    // ReSharper disable once PossibleLossOfFraction
-                    _times.Interval += _num / 2;
-                }
-                else
+            Dispatcher.Invoke(
+                () =>
                 {
-                    _times.Stop();
+                    PgbProcess.Value = _num;
+                    LbProcess.Content = _num + "%";
+                    if (_num < 99)
+                    {
+                        _num++;
+                        // ReSharper disable once PossibleLossOfFraction
+                        _times.Interval += _num / 2;
+                    }
+                    else
+                    {
+                        _times.Stop();
+                    }
                 }
-            });
+            );
         }
     }
 
@@ -471,4 +481,4 @@ namespace XHWK.WKTool
             zhangjieList = new ObservableCollection<ComboBoxBean>();
         }
     }
-}
+}

XHWK.WKTool/VideoClipWindow.xaml

@@ -1,295 +1,99 @@
-<Window x:Class="XHWK.WKTool.VideoClipWindow" 
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:XHWK.WKTool"
-        mc:Ignorable="d"
-        Title="VideoClipWindow"  AllowsTransparency="True"
+<Window
+    x:Class="XHWK.WKTool.VideoClipWindow"
+    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"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="VideoClipWindow"
+    Width="1290"
+    Height="1036"
+    AllowsTransparency="True"
+    BorderThickness="7"
+    ResizeMode="CanMinimize"
     ShowInTaskbar="True"
     WindowStartupLocation="CenterScreen"
-    WindowStyle="None"  BorderThickness="7"  ResizeMode="CanMinimize" Height="1036" Width="1290" >
+    WindowStyle="None"
+    mc:Ignorable="d">
     <Window.Effect>
-        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+        <DropShadowEffect
+            BlurRadius="10"
+            Direction="80"
+            ShadowDepth="0"
+            Color="#bababa" />
     </Window.Effect>
-    <Window.Resources>
-        <SolidColorBrush x:Key="SliderThumb.Static.Foreground" Color="#FFE5E5E5"/>
-        <SolidColorBrush x:Key="SliderThumb.MouseOver.Background" Color="#FFDCECFC"/>
-        <SolidColorBrush x:Key="SliderThumb.MouseOver.Border" Color="#FF7Eb4EA"/>
-        <SolidColorBrush x:Key="SliderThumb.Pressed.Background" Color="#FFDAECFC"/>
-        <SolidColorBrush x:Key="SliderThumb.Pressed.Border" Color="#FF569DE5"/>
-        <SolidColorBrush x:Key="SliderThumb.Disabled.Background" Color="#FFF0F0F0"/>
-        <SolidColorBrush x:Key="SliderThumb.Disabled.Border" Color="#FFD9D9D9"/>
-        <SolidColorBrush x:Key="SliderThumb.Static.Background" Color="#FFF0F0F0"/>
-        <SolidColorBrush x:Key="SliderThumb.Static.Border" Color="#FFACACAC"/>
-        <ControlTemplate x:Key="SliderThumbHorizontalTop" TargetType="{x:Type Thumb}">
-            <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-                <Path x:Name="grip" Data="M 0,6 C0,6 5.5,0 5.5,0 5.5,0 11,6 11,6 11,6 11,18 11,18 11,18 0,18 0,18 0,18 0,6 0,6 z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" SnapsToDevicePixels="True" Stroke="{StaticResource SliderThumb.Static.Border}" StrokeThickness="1" UseLayoutRounding="True" VerticalAlignment="Center"/>
-            </Grid>
-            <ControlTemplate.Triggers>
-                <Trigger Property="IsMouseOver" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-                </Trigger>
-                <Trigger Property="IsDragging" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-                </Trigger>
-                <Trigger Property="IsEnabled" Value="false">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-                </Trigger>
-            </ControlTemplate.Triggers>
-        </ControlTemplate>
-        <ControlTemplate x:Key="SliderThumbHorizontalBottom" TargetType="{x:Type Thumb}">
-            <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-                <Path x:Name="grip" Data="M 0,12 C0,12 5.5,18 5.5,18 5.5,18 11,12 11,12 11,12 11,0 11,0 11,0 0,0 0,0 0,0 0,12 0,12 z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" SnapsToDevicePixels="True" Stroke="{StaticResource SliderThumb.Static.Border}" StrokeThickness="1" UseLayoutRounding="True" VerticalAlignment="Center"/>
-            </Grid>
-            <ControlTemplate.Triggers>
-                <Trigger Property="IsMouseOver" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-                </Trigger>
-                <Trigger Property="IsDragging" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-                </Trigger>
-                <Trigger Property="IsEnabled" Value="false">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-                </Trigger>
-            </ControlTemplate.Triggers>
-        </ControlTemplate>
-        <SolidColorBrush x:Key="SliderThumb.Track.Border" Color="#FFD6D6D6"/>
-        <SolidColorBrush x:Key="SliderThumb.Track.Background" Color="#FFE7EAEA"/>
-        <Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
-            <Setter Property="OverridesDefaultStyle" Value="true"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Focusable" Value="false"/>
-            <Setter Property="IsTabStop" Value="false"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type RepeatButton}">
-                        <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <ControlTemplate x:Key="SliderThumbHorizontalDefault" TargetType="{x:Type Thumb}">
-            <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-                <Path x:Name="grip" Data="M 0,0 C0,0 11,0 11,0 11,0 11,18 11,18 11,18 0,18 0,18 0,18 0,0 0,0 z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" SnapsToDevicePixels="True" Stroke="{StaticResource SliderThumb.Static.Border}" StrokeThickness="1" UseLayoutRounding="True" VerticalAlignment="Center"/>
-            </Grid>
-            <ControlTemplate.Triggers>
-                <Trigger Property="IsMouseOver" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-                </Trigger>
-                <Trigger Property="IsDragging" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-                </Trigger>
-                <Trigger Property="IsEnabled" Value="false">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-                </Trigger>
-            </ControlTemplate.Triggers>
-        </ControlTemplate>
-        <ControlTemplate x:Key="SliderHorizontal" TargetType="{x:Type Slider}">
-            <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed"/>
-                    <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed"/>
-                    <Border x:Name="TrackBackground" BorderBrush="{StaticResource SliderThumb.Track.Border}" BorderThickness="1" Background="{StaticResource SliderThumb.Track.Background}" Height="4.0" Margin="5,0" Grid.Row="1" VerticalAlignment="center">
-                        <Canvas Margin="-6,-1">
-                            <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Height="4.0" Visibility="Hidden"/>
-                        </Canvas>
-                    </Border>
-                    <Track x:Name="PART_Track" Grid.Row="1">
-                        <Track.DecreaseRepeatButton>
-                            <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource RepeatButtonTransparent}"/>
-                        </Track.DecreaseRepeatButton>
-                        <Track.Thumb>
-                            <Thumb x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumbHorizontalDefault}" VerticalAlignment="Center" Width="11"/>
-                        </Track.Thumb>
-                    </Track>
-                    <Track x:Name="PART_TrackLeft" Grid.Row="1">
-                        <Track.DecreaseRepeatButton>
-                            <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource RepeatButtonTransparent}"/>
-                        </Track.DecreaseRepeatButton>
-                        <Track.Thumb>
-                            <Thumb x:Name="ThumbLeft" Focusable="False" Height="10" OverridesDefaultStyle="True" Template="{StaticResource SliderThumbHorizontalDefault}" VerticalAlignment="Center" Width="8" BorderBrush="#FFF12525" Foreground="#FFF33333" Background="#FFE81A1A" AutomationProperties.IsOffscreenBehavior="Offscreen"/>
-                        </Track.Thumb>
-                    </Track>
-                </Grid>
-            </Border>
-            <ControlTemplate.Triggers>
-                <Trigger Property="TickPlacement" Value="TopLeft">
-                    <Setter Property="Visibility" TargetName="TopTick" Value="Visible"/>
-                    <Setter Property="Template" TargetName="Thumb" Value="{StaticResource SliderThumbHorizontalTop}"/>
-                    <Setter Property="Margin" TargetName="TrackBackground" Value="5,2,5,0"/>
-                </Trigger>
-                <Trigger Property="TickPlacement" Value="BottomRight">
-                    <Setter Property="Visibility" TargetName="BottomTick" Value="Visible"/>
-                    <Setter Property="Template" TargetName="Thumb" Value="{StaticResource SliderThumbHorizontalBottom}"/>
-                    <Setter Property="Margin" TargetName="TrackBackground" Value="5,0,5,2"/>
-                </Trigger>
-                <Trigger Property="TickPlacement" Value="Both">
-                    <Setter Property="Visibility" TargetName="TopTick" Value="Visible"/>
-                    <Setter Property="Visibility" TargetName="BottomTick" Value="Visible"/>
-                </Trigger>
-                <Trigger Property="IsSelectionRangeEnabled" Value="true">
-                    <Setter Property="Visibility" TargetName="PART_SelectionRange" Value="Visible"/>
-                </Trigger>
-                <Trigger Property="IsKeyboardFocused" Value="true">
-                    <Setter Property="Foreground" TargetName="Thumb" Value="Blue"/>
-                </Trigger>
-            </ControlTemplate.Triggers>
-        </ControlTemplate>
-        <ControlTemplate x:Key="SliderThumbVerticalLeft" TargetType="{x:Type Thumb}">
-            <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-                <Path x:Name="grip" Data="M 6,11 C6,11 0,5.5 0,5.5 0,5.5 6,0 6,0 6,0 18,0 18,0 18,0 18,11 18,11 18,11 6,11 6,11 z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" Stroke="{StaticResource SliderThumb.Static.Border}"/>
-            </Grid>
-            <ControlTemplate.Triggers>
-                <Trigger Property="IsMouseOver" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-                </Trigger>
-                <Trigger Property="IsDragging" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-                </Trigger>
-                <Trigger Property="IsEnabled" Value="false">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-                </Trigger>
-            </ControlTemplate.Triggers>
-        </ControlTemplate>
-        <ControlTemplate x:Key="SliderThumbVerticalRight" TargetType="{x:Type Thumb}">
-            <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-                <Path x:Name="grip" Data="M 12,11 C12,11 18,5.5 18,5.5 18,5.5 12,0 12,0 12,0 0,0 0,0 0,0 0,11 0,11 0,11 12,11 12,11 z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" Stroke="{StaticResource SliderThumb.Static.Border}"/>
-            </Grid>
-            <ControlTemplate.Triggers>
-                <Trigger Property="IsMouseOver" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-                </Trigger>
-                <Trigger Property="IsDragging" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-                </Trigger>
-                <Trigger Property="IsEnabled" Value="false">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-                </Trigger>
-            </ControlTemplate.Triggers>
-        </ControlTemplate>
-        <ControlTemplate x:Key="SliderThumbVerticalDefault" TargetType="{x:Type Thumb}">
-            <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-                <Path x:Name="grip" Data="M0.5,0.5 L18.5,0.5 18.5,11.5 0.5,11.5z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" Stroke="{StaticResource SliderThumb.Static.Border}"/>
-            </Grid>
-            <ControlTemplate.Triggers>
-                <Trigger Property="IsMouseOver" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-                </Trigger>
-                <Trigger Property="IsDragging" Value="true">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-                </Trigger>
-                <Trigger Property="IsEnabled" Value="false">
-                    <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-                    <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-                </Trigger>
-            </ControlTemplate.Triggers>
-        </ControlTemplate>
-        <ControlTemplate x:Key="SliderVertical" TargetType="{x:Type Slider}">
-            <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <TickBar x:Name="TopTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4"/>
-                    <TickBar x:Name="BottomTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4"/>
-                    <Border x:Name="TrackBackground" BorderBrush="{StaticResource SliderThumb.Track.Border}" BorderThickness="1" Background="{StaticResource SliderThumb.Track.Background}" Grid.Column="1" HorizontalAlignment="center" Margin="0,5" Width="4.0">
-                        <Canvas Margin="-1,-6">
-                            <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Visibility="Hidden" Width="4.0"/>
-                        </Canvas>
-                    </Border>
-                    <Track x:Name="PART_Track" Grid.Column="1">
-                        <Track.DecreaseRepeatButton>
-                            <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource RepeatButtonTransparent}"/>
-                        </Track.DecreaseRepeatButton>
-                        <Track.IncreaseRepeatButton>
-                            <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource RepeatButtonTransparent}"/>
-                        </Track.IncreaseRepeatButton>
-                        <Track.Thumb>
-                            <Thumb x:Name="Thumb" Focusable="False" Height="11" OverridesDefaultStyle="True" Template="{StaticResource SliderThumbVerticalDefault}" VerticalAlignment="Top" Width="18"/>
-                        </Track.Thumb>
-                    </Track>
-                </Grid>
-            </Border>
-            <ControlTemplate.Triggers>
-                <Trigger Property="TickPlacement" Value="TopLeft">
-                    <Setter Property="Visibility" TargetName="TopTick" Value="Visible"/>
-                    <Setter Property="Template" TargetName="Thumb" Value="{StaticResource SliderThumbVerticalLeft}"/>
-                    <Setter Property="Margin" TargetName="TrackBackground" Value="2,5,0,5"/>
-                </Trigger>
-                <Trigger Property="TickPlacement" Value="BottomRight">
-                    <Setter Property="Visibility" TargetName="BottomTick" Value="Visible"/>
-                    <Setter Property="Template" TargetName="Thumb" Value="{StaticResource SliderThumbVerticalRight}"/>
-                    <Setter Property="Margin" TargetName="TrackBackground" Value="0,5,2,5"/>
-                </Trigger>
-                <Trigger Property="TickPlacement" Value="Both">
-                    <Setter Property="Visibility" TargetName="TopTick" Value="Visible"/>
-                    <Setter Property="Visibility" TargetName="BottomTick" Value="Visible"/>
-                </Trigger>
-                <Trigger Property="IsSelectionRangeEnabled" Value="true">
-                    <Setter Property="Visibility" TargetName="PART_SelectionRange" Value="Visible"/>
-                </Trigger>
-                <Trigger Property="IsKeyboardFocused" Value="true">
-                    <Setter Property="Foreground" TargetName="Thumb" Value="Blue"/>
-                </Trigger>
-            </ControlTemplate.Triggers>
-        </ControlTemplate>
-    </Window.Resources>
-    <Grid Name="Main_Grid">
+    <Window.Resources />
+    <Grid Name="MainGrid">
         <Grid.RowDefinitions>
-            <RowDefinition Height="50*"></RowDefinition>
-            <RowDefinition Height="750*"></RowDefinition>
-            <RowDefinition Height="auto"></RowDefinition>
-            <RowDefinition Height="147*"></RowDefinition>
+            <RowDefinition Height="50*" />
+            <RowDefinition Height="750*" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="147*" />
         </Grid.RowDefinitions>
-        <Grid Background="#3f6fff" Grid.Row="0" MouseLeftButtonDown="Title_MouseLeftButtonDown">
-            <TextBlock Text="视频剪辑" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-            <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right"  Click="Button_Click"/>
+        <Grid
+            Grid.Row="0"
+            Background="#4597FF"
+            MouseLeftButtonDown="Title_MouseLeftButtonDown">
+            <TextBlock
+                Padding="10,13,0,0"
+                FontSize="16"
+                Foreground="#FFFFFF"
+                Text="视频剪辑" />
+            <Button
+                x:Name="BtnDown"
+                Grid.Row="0"
+                Padding="10,0,10,0"
+                HorizontalAlignment="Right"
+                Click="Button_Click"
+                Content="×"
+                Cursor="Hand"
+                FontSize="25"
+                Foreground="#FFFFFF" />
         </Grid>
-        <Grid x:Name="GridMovie" Grid.Row="1" Background="Black">
-            <MediaElement Stretch="Fill" LoadedBehavior="Manual" Name="QS_Movie" MediaOpened="Element_MediaOpened" Loaded="QS_Movie_Loaded" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.ColumnSpan="2" Volume="1"/>
+        <Grid
+            x:Name="GridMovie"
+            Grid.Row="1"
+            Background="Black">
+            <MediaElement
+                Name="QsMovie"
+                Grid.ColumnSpan="2"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Loaded="QS_Movie_Loaded"
+                LoadedBehavior="Manual"
+                MediaOpened="Element_MediaOpened"
+                Stretch="Fill"
+                Volume="1" />
             <!--<Button Name="LeftButton" Width="50" Height="50" HorizontalAlignment="Left" VerticalAlignment="Center" Click="Left_Click" Visibility="Hidden" Margin="0,147">上一个</Button>
             <Button Name="RightButton" Width="50" Height="50" HorizontalAlignment="Right" VerticalAlignment="Center" Click="Right_Click" Visibility="Hidden" Grid.Column="1" Margin="0,147">下一个</Button>-->
         </Grid>
         <!--<StackPanel Grid.Row="2" Orientation="Horizontal">-->
         <Grid Grid.Row="2">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="50*"/>
-                <ColumnDefinition Width="1796*"/>
-                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="50*" />
+                <ColumnDefinition Width="1796*" />
+                <ColumnDefinition Width="60*" />
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0">
-                <Button Cursor="Hand" x:Name="Play"  Margin="0" Click="Play_Click" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                <Button
+                    x:Name="Play"
+                    Margin="0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Click="Play_Click"
+                    Cursor="Hand">
                     <StackPanel Orientation="Vertical">
-                        <Image x:Name="ImgPlay" Source="/Images/Clip_Play.png" Visibility="Visible"/>
-                        <Image x:Name="ImgPause" Source="/Images/Clip_Pause.png" Visibility="Collapsed"/>
+                        <Image
+                            x:Name="ImgPlay"
+                            Source="/Images/Clip_Play.png"
+                            Visibility="Visible" />
+                        <Image
+                            x:Name="ImgPause"
+                            Source="/Images/Clip_Pause.png"
+                            Visibility="Collapsed" />
                     </StackPanel>
                 </Button>
-                <!--<Button Height="40" Width="40" x:Name="Pause" Click="Pause_Click" Margin="45,0,0,0">暂停</Button>-->
+
             </Grid>
             <!--<Grid Grid.Row="0" Grid.Column="1">
                 <Slider x:Name="timelineSlider" Minimum="0" VerticalAlignment="Center"  PreviewMouseLeftButtonDown="timelineMDown"  PreviewMouseLeftButtonUp="timelineMUp" BorderThickness="0,5,0,0" />
@@ -297,61 +101,156 @@
             <Grid Grid.Row="1" Grid.Column="1">
                 <local:UC_MultiRangeSlider x:Name="UcSlider" Minimum="0" Maximum="1000"  SilderWidth="1807" SliderTickFrequency="1" Grid.RowSpan="2" PreviewMouseLeftButtonDown="UcSlider_PreviewMouseLeftButtonDown" PreviewMouseLeftButtonUp="UcSlider_PreviewMouseLeftButtonUp" PreviewMouseMove="UcSlider_PreviewMouseMove"/>
             </Grid>-->
-            <Grid Name="Control_Progress" Grid.Column="1" Height="54">
-                <local:UC_MultiRangeSlider x:Name="UcSlider" Minimum="0" Maximum="1000"  Grid.Row="2" SilderWidth="1807" SliderTickFrequency="1" Margin="0,18,5,0" Grid.RowSpan="2" PreviewMouseLeftButtonDown="UcSlider_PreviewMouseLeftButtonDown" PreviewMouseLeftButtonUp="UcSlider_PreviewMouseLeftButtonUp" PreviewMouseMove="UcSlider_PreviewMouseMove" VerticalAlignment="Top"/>
-                <Slider x:Name="timelineSlider" Minimum="0" VerticalAlignment="Top"  PreviewMouseLeftButtonDown="timelineMDown"  PreviewMouseLeftButtonUp="timelineMUp" BorderThickness="0,5,0,0" Margin="12,5,7,0" />
+            <Grid
+                Name="ControlProgress"
+                Grid.Column="1"
+                Height="54">
+                <local:UC_MultiRangeSlider
+                    x:Name="UcSlider"
+                    Margin="0,18,5,0"
+                    VerticalAlignment="Top"
+                    Maximum="1000"
+                    Minimum="0"
+                    PreviewMouseLeftButtonDown="UcSlider_PreviewMouseLeftButtonDown"
+                    PreviewMouseLeftButtonUp="UcSlider_PreviewMouseLeftButtonUp"
+                    PreviewMouseMove="UcSlider_PreviewMouseMove"
+                    SilderWidth="1807"
+                    SliderTickFrequency="1" />
+                <Slider
+                    x:Name="TimelineSlider"
+                    Margin="12,5,7,0"
+                    VerticalAlignment="Top"
+                    BorderThickness="0,5,0,0"
+                    Minimum="0"
+                    PreviewMouseLeftButtonDown="TimelineMDown"
+                    PreviewMouseLeftButtonUp="TimelineMUp" />
             </Grid>
         </Grid>
         <!--</StackPanel>-->
-        <Grid Name="Movie_Control" Grid.Row="3" Margin="0">
+        <Grid
+            Name="MovieControl"
+            Grid.Row="3"
+            Margin="0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="53*"/>
-                <RowDefinition Height="100*"/>
+                <RowDefinition Height="53*" />
+                <RowDefinition Height="100*" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="5*"/>
-                <ColumnDefinition Width="90*"/>
-                <ColumnDefinition Width="1086*"/>
-                <ColumnDefinition Width="90*"/>
-                <ColumnDefinition Width="5*"/>
+                <ColumnDefinition Width="5*" />
+                <ColumnDefinition Width="90*" />
+                <ColumnDefinition Width="1086*" />
+                <ColumnDefinition Width="90*" />
+                <ColumnDefinition Width="5*" />
             </Grid.ColumnDefinitions>
             <Grid Grid.Row="0" Grid.Column="1">
-                <Label x:Name="LblProgress" Content="00:00:00" FontSize="{Binding WordSize18}" VerticalAlignment="Center"/>
+                <Label
+                    x:Name="LblProgress"
+                    VerticalAlignment="Center"
+                    Content="00:00:00"
+                    FontSize="{Binding WordSize18}" />
             </Grid>
             <Grid Grid.Row="0" Grid.Column="2">
-                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" Margin="0" HorizontalAlignment="Center">
-                    <Label Content="开始时间：" HorizontalAlignment="Left" Margin="10,0,0,0" VerticalAlignment="Center" FontSize="{Binding WordSize18}"/>
-                    <TextBox x:Name="TxbStartTime" HorizontalAlignment="Left" Margin="5,0,0,0" Text="00:00:00.000" VerticalAlignment="Center" Width="130" LostFocus="TxbStartTime_LostFocus" FontSize="{Binding WordSize18}"/>
+                <StackPanel
+                    Margin="0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal">
+                    <Label
+                        Margin="10,0,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Content="开始时间："
+                        FontSize="{Binding WordSize18}" />
+                    <TextBox
+                        x:Name="TxbStartTime"
+                        Width="130"
+                        Margin="5,0,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontSize="{Binding WordSize18}"
+                        LostFocus="TxbStartTime_LostFocus"
+                        Text="00:00:00.000" />
 
-                    <Label Content="结束时间：" HorizontalAlignment="Center" Margin="20,0,0,0" VerticalAlignment="Center" FontSize="{Binding WordSize18}"/>
-                    <TextBox x:Name="TxbEndTime" HorizontalAlignment="Center" Margin="5,0,0,0" Text="00:00:00.000" VerticalAlignment="Center" Width="130" LostFocus="TxbEndTime_LostFocus" FontSize="{Binding WordSize18}"/>
+                    <Label
+                        Margin="20,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Content="结束时间："
+                        FontSize="{Binding WordSize18}" />
+                    <TextBox
+                        x:Name="TxbEndTime"
+                        Width="130"
+                        Margin="5,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="{Binding WordSize18}"
+                        LostFocus="TxbEndTime_LostFocus"
+                        Text="00:00:00.000" />
 
-                    <Label Content="视频时长：" HorizontalAlignment="Right" Margin="20,0,0,0" VerticalAlignment="Center" FontSize="{Binding WordSize18}"/>
-                    <Label x:Name="LblVideoTime" Content="00:00:00.000" HorizontalAlignment="Right" Margin="5,0,10,0" VerticalAlignment="Center" FontSize="{Binding WordSize18}"/>
+                    <Label
+                        Margin="20,0,0,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Content="视频时长："
+                        FontSize="{Binding WordSize18}" />
+                    <Label
+                        x:Name="LblVideoTime"
+                        Margin="5,0,10,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Content="00:00:00.000"
+                        FontSize="{Binding WordSize18}" />
                 </StackPanel>
             </Grid>
-            <Grid Grid.Row="0" Grid.Column="3" >
+            <Grid Grid.Row="0" Grid.Column="3">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="30*"/>
-                    <ColumnDefinition Width="120*"/>
+                    <ColumnDefinition Width="30*" />
+                    <ColumnDefinition Width="120*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="27*"/>
-                    <RowDefinition Height="27*"/>
+                    <RowDefinition Height="27*" />
+                    <RowDefinition Height="27*" />
                 </Grid.RowDefinitions>
-                    <Image Grid.Column="0" Grid.Row="1" Source="/Images/Clip_Volunme.png" Name="Horn" Margin="0"/>
-                    <Slider Grid.Row="1" Grid.Column="1" Name="Volunme" Minimum="0" Maximum="1" Value="{Binding ElementName=QS_Movie,Path=Volume,Mode=TwoWay}" Margin="0" VerticalAlignment="Center" />
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,10,0">
-                </StackPanel>
+                <Image
+                    Name="Horn"
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="0"
+                    Source="/Images/Clip_Volunme.png" />
+                <Slider
+                    Name="Volunme"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="0"
+                    VerticalAlignment="Center"
+                    Maximum="1"
+                    Minimum="0"
+                    Value="{Binding ElementName=QsMovie, Path=Volume, Mode=TwoWay}" />
+
             </Grid>
             <Grid Grid.Row="1" Grid.Column="2">
 
-                <Button x:Name="BtnClip" Cursor="Hand" Content="  剪  辑  " Foreground="White" FontSize="{Binding WordSize20}" Click="BtnClip_Click"  HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Button
+                    x:Name="BtnClip"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Click="BtnClip_Click"
+                    Content="  剪  辑  "
+                    Cursor="Hand"
+                    FontSize="{Binding WordSize20}"
+                    Foreground="White">
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">
-                            <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="8" Padding="10,5">
-                                <Border.Background>#3f6fff</Border.Background>
-                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding ContentControl.Content}" />
+                            <Border
+                                Padding="10,5"
+                                BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="8">
+                                <Border.Background>#4597FF</Border.Background>
+                                <ContentPresenter
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding ContentControl.Content}" />
                             </Border>
                         </ControlTemplate>
                     </Button.Template>

XHWK.WKTool/VideoClipWindow.xaml.cs

@@ -1,6 +1,4 @@
-using Common.system;
-
-using System;
+using System;
 using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Input;
@@ -11,17 +9,18 @@ namespace XHWK.WKTool
     using system;
 
     /// <summary>
-    /// 视频剪辑
-    /// VideoClipWindow.xaml 的交互逻辑
+    ///     视频剪辑
+    ///     VideoClipWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class VideoClipWindow : Window
+    public partial class VideoClipWindow
     {
         /// <summary>
-        /// 视频地址
+        ///     视频地址
         /// </summary>
-        string VideoPath;
+        string _videoPath;
+
         /// <summary>
-        /// 视频剪辑
+        ///     视频剪辑
         /// </summary>
         public VideoClipWindow()
         {
@@ -29,24 +28,24 @@ namespace XHWK.WKTool
             Width = App.W_XHMicroLessonSystemWindow.ActualWidth;
             Height = App.W_XHMicroLessonSystemWindow.ActualHeight;
         }
-        public bool InitClipVideo(string _videoPath)
+
+        public bool InitClipVideo(string mVideoPath)
         {
-            if (FileToolsCommon.IsExistFile(_videoPath))
+            if (FileToolsCommon.IsExistFile(mVideoPath))
             {
-                VideoPath = _videoPath;
-                QS_Movie.Source = new Uri(VideoPath);
-
-                double Prop = (double)QS_Movie.NaturalVideoHeight / (double)QS_Movie.NaturalVideoWidth;
-                double gridWidth = GridMovie.ActualHeight / Prop;
+                _videoPath = mVideoPath;
+                QsMovie.Source = new Uri(_videoPath);
+                double prop = QsMovie.NaturalVideoHeight / (double)QsMovie.NaturalVideoWidth;
+                double gridWidth = GridMovie.ActualHeight / prop;
                 if (gridWidth <= GridMovie.ActualWidth)
                 {
-                    QS_Movie.Width = gridWidth;
-                    QS_Movie.Height = GridMovie.ActualHeight;
+                    QsMovie.Width = gridWidth;
+                    QsMovie.Height = GridMovie.ActualHeight;
                 }
                 else
                 {
-                    QS_Movie.Height = GridMovie.ActualWidth * Prop;
-                    QS_Movie.Width = GridMovie.ActualWidth;
+                    QsMovie.Height = GridMovie.ActualWidth * prop;
+                    QsMovie.Width = GridMovie.ActualWidth;
                 }
                 DataContext = App.PageContextData;
             }
@@ -56,19 +55,20 @@ namespace XHWK.WKTool
             }
             return true;
         }
+
         /// <summary>
-        /// 计时器
+        ///     计时器
         /// </summary>
-        DispatcherTimer dispatcherTimer = new System.Windows.Threading.DispatcherTimer(); // 定义一个DT
+        DispatcherTimer _dispatcherTimer = new System.Windows.Threading.DispatcherTimer(); // 定义一个DT
 
         /// <summary>
-        /// 播放/暂停
+        ///     播放/暂停
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void Play_Click(object sender, RoutedEventArgs e)
         {
-            if (IsPlay)
+            if (_isPlay)
             {
                 MoviePause();
             }
@@ -77,85 +77,93 @@ namespace XHWK.WKTool
                 MoviePlay();
             }
         }
+
         /// <summary>
-        /// 正在播放
+        ///     正在播放
         /// </summary>
-        bool IsPlay = false;
+        bool _isPlay;
+
         /// <summary>
-        /// 播放
+        ///     播放
         /// </summary>
         public void MoviePlay()
         {
-            IsPlay = true;
+            _isPlay = true;
             ImgPlay.Visibility = Visibility.Collapsed;
             ImgPause.Visibility = Visibility.Visible;
-            QS_Movie.Play();
+            QsMovie.Play();
         }
+
         /// <summary>
-        /// 暂停
+        ///     暂停
         /// </summary>
         public void MoviePause()
         {
-            IsPlay = false;
+            _isPlay = false;
             ImgPlay.Visibility = Visibility.Visible;
             ImgPause.Visibility = Visibility.Collapsed;
-            QS_Movie.Pause();
-        }
-        /// <summary>
-        /// 暂停
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Pause_Click(object sender, RoutedEventArgs e)
-        {
-            MoviePause();
+            QsMovie.Pause();
         }
+
         /// <summary>
-        /// slider滑动值随播放内容位置变化
+        ///     slider滑动值随播放内容位置变化
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void dispatcherTimer_Tick(object sender, EventArgs e)
         {
-            timelineSlider.Value = QS_Movie.Position.TotalMilliseconds; //slider滑动值随播放内容位置变化
-            LblProgress.Content = new TimeSpan(0, 0, 0, 0, (int)QS_Movie.Position.TotalMilliseconds).ToString(@"hh\:mm\:ss");
+            TimelineSlider.Value = QsMovie.Position.TotalMilliseconds; //slider滑动值随播放内容位置变化
+            LblProgress.Content = new TimeSpan(
+                0,
+                0,
+                0,
+                0,
+                (int)QsMovie.Position.TotalMilliseconds
+            ).ToString(@"hh\:mm\:ss");
         }
+
         /// <summary>
-        /// 拖动进度条
+        ///     拖动进度条
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void timelineMDown(object sender, EventArgs e)
+        private void TimelineMDown(object sender, EventArgs e)
         {
-            dispatcherTimer.Stop();
+            _dispatcherTimer.Stop();
         }
+
         /// <summary>
-        /// 拖动进度条
+        ///     拖动进度条
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void timelineMUp(object sender, EventArgs e)
+        private void TimelineMUp(object sender, EventArgs e)
         {
-            QS_Movie.Position = new TimeSpan(0, 0, 0, 0, (int)timelineSlider.Value);
-            dispatcherTimer.Start();
+            QsMovie.Position = new TimeSpan(
+                0,
+                0,
+                0,
+                0,
+                (int)TimelineSlider.Value
+            );
+            _dispatcherTimer.Start();
             MoviePlay();
         }
 
         /// <summary>
-        /// 加载视频
+        ///     加载视频
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void QS_Movie_Loaded(object sender, RoutedEventArgs e)
         {
             //GridMovie.Height
-            UcSlider.SilderWidth = (int)timelineSlider.ActualWidth;
+            UcSlider.SilderWidth = (int)TimelineSlider.ActualWidth;
             MoviePlay();
-            while (QS_Movie.NaturalVideoWidth == 0)
+            while (QsMovie.NaturalVideoWidth == 0)
             {
                 System.Threading.Thread.Sleep(50);
             }
-
             MoviePause();
 
             //new Thread(new ThreadStart(new Action(() =>
@@ -165,38 +173,47 @@ namespace XHWK.WKTool
             //});
             //}))).Start();
         }
+
         /// <summary>
-        /// 关闭
+        ///     关闭
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void Button_Click(object sender, RoutedEventArgs e)
         {
             //this.Close();
-            QS_Movie.Stop();
-            IsPlay = false;
+            QsMovie.Stop();
+            _isPlay = false;
             ImgPlay.Visibility = Visibility.Visible;
             ImgPause.Visibility = Visibility.Collapsed;
             UcSlider.StartValue = 0;
-            timelineSlider.Value = 0;
-            dispatcherTimer.Stop();
-            this.Hide();
+            TimelineSlider.Value = 0;
+            _dispatcherTimer.Stop();
+            Hide();
         }
-        double statime = 0;
+
+        double _statime;
+
         private void UcSlider_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             //dispatcherTimer.Stop();
-            statime = UcSlider.StartValue;
+            _statime = UcSlider.StartValue;
         }
 
         private void UcSlider_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
-            if (Math.Abs(UcSlider.StartValue - statime) > 100)
+            if (Math.Abs(UcSlider.StartValue - _statime) > 100)
             {
-                dispatcherTimer.Stop();
-                timelineSlider.Value = UcSlider.StartValue;
-                QS_Movie.Position = new TimeSpan(0, 0, 0, 0, (int)timelineSlider.Value);
-                dispatcherTimer.Start();
+                _dispatcherTimer.Stop();
+                TimelineSlider.Value = UcSlider.StartValue;
+                QsMovie.Position = new TimeSpan(
+                    0,
+                    0,
+                    0,
+                    0,
+                    (int)TimelineSlider.Value
+                );
+                _dispatcherTimer.Start();
                 UcSlider_PreviewMouseMove(null, null);
                 MoviePlay();
             }
@@ -204,17 +221,34 @@ namespace XHWK.WKTool
 
         private void UcSlider_PreviewMouseMove(object sender, MouseEventArgs e)
         {
-            TxbStartTime.Text = new TimeSpan(0, 0, 0, 0, (int)UcSlider.StartValue).ToString(@"hh\:mm\:ss\.fff");
-            TxbEndTime.Text = new TimeSpan(0, 0, 0, 0, (int)UcSlider.EndValue).ToString(@"hh\:mm\:ss\.fff");
-            LblVideoTime.Content = new TimeSpan(0, 0, 0, 0, ((int)UcSlider.EndValue - (int)UcSlider.StartValue)).ToString(@"hh\:mm\:ss\.fff");
+            TxbStartTime.Text = new TimeSpan(
+                0,
+                0,
+                0,
+                0,
+                (int)UcSlider.StartValue
+            ).ToString(@"hh\:mm\:ss\.fff");
+            TxbEndTime.Text = new TimeSpan(
+                0,
+                0,
+                0,
+                0,
+                (int)UcSlider.EndValue
+            ).ToString(@"hh\:mm\:ss\.fff");
+            LblVideoTime.Content = new TimeSpan(
+                0,
+                0,
+                0,
+                0,
+                ((int)UcSlider.EndValue - (int)UcSlider.StartValue)
+            ).ToString(@"hh\:mm\:ss\.fff");
             //LblStartTime.Content = new TimeSpan(0, 0, 0, 0, (int)UcSlider.StartValue).ToString(@"hh\:mm\:ss");
             //LblEndTime.Content = new TimeSpan(0, 0, 0, 0, (int)UcSlider.EndValue).ToString(@"hh\:mm\:ss");
             //LblVideoTime.Content = new TimeSpan(0, 0, 0, 0, ((int)(UcSlider.EndValue - (UcSlider.EndValue % 1000)) - (int)(UcSlider.StartValue - (UcSlider.StartValue % 1000)))).ToString(@"hh\:mm\:ss");
-
         }
 
         /// <summary>
-        /// 剪辑
+        ///     剪辑
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -225,32 +259,47 @@ namespace XHWK.WKTool
                 MessageWindow.Show("剪辑时间不得小于1秒！");
                 return;
             }
-            dispatcherTimer.Stop();
+            _dispatcherTimer.Stop();
             MoviePause();
-            string Extension = FileToolsCommon.GetIoExtension(VideoPath);
-            string FileName = FileToolsCommon.GetIoFileNameNoExtension(VideoPath);
+            string extension = FileToolsCommon.GetIoExtension(_videoPath);
+            string fileName = FileToolsCommon.GetIoFileNameNoExtension(_videoPath);
             System.Windows.Forms.SaveFileDialog saveDg = new System.Windows.Forms.SaveFileDialog();
-            saveDg.Filter = "(*" + Extension + ")|*" + Extension;// + "|(*.MP4)|*.MP4";
+            saveDg.Filter = @"(*" + extension + @")|*" + extension; // + "|(*.MP4)|*.MP4";
             //saveDg.FileName = tableName + DateTime.Now.ToString("yyyy-MM-dd_hh-mm-ss") + "";
-            saveDg.FileName = FileName + "剪辑";
+            saveDg.FileName = fileName + "剪辑";
             saveDg.AddExtension = true;
             saveDg.RestoreDirectory = true;
             if (saveDg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
                 string filePath = saveDg.FileName;
                 //duration.ToString(@"dd\.hh\:mm\:ss");
-                TimeSpan startTP = new TimeSpan(0, 0, 0, 0, (int)UcSlider.StartValue);
-                string startTime = startTP.ToString(@"hh\:mm\:ss\.fff");
-                TimeSpan EndTP = new TimeSpan(0, 0, 0, 0, (int)UcSlider.EndValue);
-                string EndTime = EndTP.ToString(@"hh\:mm\:ss\.fff");
-                App.FFmpeg.ClipVideo
-                (
-                    VideoPath,
+                TimeSpan startTp = new TimeSpan(
+                    0,
+                    0,
+                    0,
+                    0,
+                    (int)UcSlider.StartValue
+                );
+                string startTime = startTp.ToString(@"hh\:mm\:ss\.fff");
+                TimeSpan endTp = new TimeSpan(
+                    0,
+                    0,
+                    0,
+                    0,
+                    (int)UcSlider.EndValue
+                );
+                string endTime = endTp.ToString(@"hh\:mm\:ss\.fff");
+                App.FFmpeg.ClipVideo(
+                    _videoPath,
                     startTime,
-                    EndTime,
+                    endTime,
                     filePath
                 );
-                MessageBoxResult br = MessageWindow.Show("剪辑完成是否打开文件夹？", "剪辑", MessageBoxButton.OKCancel);
+                MessageBoxResult br = MessageWindow.Show(
+                    "剪辑完成是否打开文件夹？",
+                    "剪辑",
+                    MessageBoxButton.OKCancel
+                );
                 if (br == MessageBoxResult.OK)
                 {
                     //System.Diagnostics.Process.Start(FileToolsCommon.GetDirectoryName(filePath));
@@ -260,7 +309,7 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 输入开始时间
+        ///     输入开始时间
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -278,17 +327,17 @@ namespace XHWK.WKTool
                 MessageWindow.Show("开始时间不能大于结束时间！");
                 return;
             }
-            if (time.TotalMilliseconds > QS_Movie.NaturalDuration.TimeSpan.TotalMilliseconds - 1000 || time.TotalMilliseconds > UcSlider.EndValue - 1000)
+            if (time.TotalMilliseconds > QsMovie.NaturalDuration.TimeSpan.TotalMilliseconds - 1000 || time.TotalMilliseconds > UcSlider.EndValue - 1000)
             {
                 MessageWindow.Show("剪辑时间不能小于1秒！");
                 return;
             }
             UcSlider.StartValue = time.TotalMilliseconds;
-
             UcSlider_PreviewMouseLeftButtonUp(null, null);
         }
+
         /// <summary>
-        /// 输入结束时间
+        ///     输入结束时间
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -311,17 +360,17 @@ namespace XHWK.WKTool
                 MessageWindow.Show("剪辑时间不能小于1秒！");
                 return;
             }
-            if (time.TotalMilliseconds > QS_Movie.NaturalDuration.TimeSpan.TotalMilliseconds)
+            if (time.TotalMilliseconds > QsMovie.NaturalDuration.TimeSpan.TotalMilliseconds)
             {
                 MessageWindow.Show("结束时间不能超出视频总时长！");
                 return;
             }
             UcSlider.EndValue = time.TotalMilliseconds;
-
             UcSlider_PreviewMouseLeftButtonUp(null, null);
         }
+
         /// <summary>
-        /// string转TimeSpan
+        ///     string转TimeSpan
         /// </summary>
         /// <param name="str"></param>
         /// <returns></returns>
@@ -360,12 +409,19 @@ namespace XHWK.WKTool
             }
             catch (Exception)
             {
+                // ignored
             }
-            return new TimeSpan(day, hour, min, sec, mil);
+            return new TimeSpan(
+                day,
+                hour,
+                min,
+                sec,
+                mil
+            );
         }
 
         /// <summary>
-        /// 判断是否为时间格式
+        ///     判断是否为时间格式
         /// </summary>
         /// <param name="str"></param>
         /// <returns></returns>
@@ -381,8 +437,9 @@ namespace XHWK.WKTool
                 return false;
             }
         }
+
         /// <summary>
-        /// 鼠标点击移动
+        ///     鼠标点击移动
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -392,36 +449,43 @@ namespace XHWK.WKTool
         }
 
         /// <summary>
-        /// 启动定时器 同步进度条和视频进度
+        ///     启动定时器 同步进度条和视频进度
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void Element_MediaOpened(object sender, RoutedEventArgs e)
         {
-            timelineSlider.Maximum = QS_Movie.NaturalDuration.TimeSpan.TotalMilliseconds;  //设置slider最大值
-            UcSlider.Maximum = QS_Movie.NaturalDuration.TimeSpan.TotalMilliseconds;
+            TimelineSlider.Maximum = QsMovie.NaturalDuration.TimeSpan.TotalMilliseconds; //设置slider最大值
+            UcSlider.Maximum = QsMovie.NaturalDuration.TimeSpan.TotalMilliseconds;
             UcSlider.StartValue = 0;
-            UcSlider.EndValue = QS_Movie.NaturalDuration.TimeSpan.TotalMilliseconds;
+            UcSlider.EndValue = QsMovie.NaturalDuration.TimeSpan.TotalMilliseconds;
             UcSlider_PreviewMouseMove(null, null);
-            int sec = (int)QS_Movie.NaturalDuration.TimeSpan.TotalSeconds;
-            dispatcherTimer.Tick += new EventHandler(dispatcherTimer_Tick); //超过计时间隔时发生
-            dispatcherTimer.Interval = new TimeSpan(0, 0, 0, 0, 500); //DT间隔
-            dispatcherTimer.Start(); //DT启动 
+            _dispatcherTimer.Tick += dispatcherTimer_Tick; //超过计时间隔时发生
+            _dispatcherTimer.Interval = new TimeSpan(
+                0,
+                0,
+                0,
+                0,
+                500
+            ); //DT间隔
+            _dispatcherTimer.Start(); //DT启动 
 
             #region 调整视频大小
-            double Prop = (double)QS_Movie.NaturalVideoHeight / (double)QS_Movie.NaturalVideoWidth;
-            double gridWidth = GridMovie.ActualHeight / Prop;
+
+            double prop = QsMovie.NaturalVideoHeight / (double)QsMovie.NaturalVideoWidth;
+            double gridWidth = GridMovie.ActualHeight / prop;
             if (gridWidth <= GridMovie.ActualWidth)
             {
-                QS_Movie.Width = gridWidth;
-                QS_Movie.Height = GridMovie.ActualHeight;
+                QsMovie.Width = gridWidth;
+                QsMovie.Height = GridMovie.ActualHeight;
             }
             else
             {
-                QS_Movie.Height = GridMovie.ActualWidth * Prop;
-                QS_Movie.Width = GridMovie.ActualWidth;
+                QsMovie.Height = GridMovie.ActualWidth * prop;
+                QsMovie.Width = GridMovie.ActualWidth;
             }
+
             #endregion
         }
     }
-}
+}

XHWK.WKTool/View/UControl/UC_MultiRangeSlider.xaml

@@ -1,59 +1,74 @@
-<UserControl x:Class="XHWK.WKTool.UC_MultiRangeSlider"
-             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" Name="UC_Arrange" Loaded="UC_Arrange_Loaded">
-    <StackPanel Orientation="Horizontal" Height="{Binding ElementName=UC_Arrange,Path=SilderHeight}" >
-        <TextBox Text="{Binding  ElementName=SL_Bat1,Path=Value,Mode=TwoWay}"
-                 KeyUp="TextBox_KeyUp1" Visibility="Hidden"
-                 Width="10"
-                 Margin="0,3" BorderBrush="CornflowerBlue" HorizontalAlignment="Left" VerticalAlignment="Center" />
-        <Canvas Width="{Binding ElementName=UC_Arrange,Path=SilderWidth}" Margin="0">
-            <Slider Name="SL_Bat1"
-                Value="{Binding ElementName=UC_Arrange,Path=StartValue}"
-                Minimum="{Binding ElementName=UC_Arrange,Path=Minimum}"
-                Maximum="{Binding ElementName=UC_Arrange,Path=Maximum}"
-                SelectionStart="{Binding ElementName=UC_Arrange,Path=StartValue}"
-                SelectionEnd="{Binding ElementName=UC_Arrange,Path=EndValue}"
-                Width="{Binding ElementName=UC_Arrange,Path=SilderWidth}"
-                TickFrequency="{Binding ElementName=UC_Arrange,Path=SliderTickFrequency}"
+<UserControl
+    x:Class="XHWK.WKTool.UC_MultiRangeSlider"
+    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"
+    Name="UC_Arrange"
+    Loaded="UC_Arrange_Loaded"
+    mc:Ignorable="d">
+    <StackPanel Height="{Binding ElementName=UC_Arrange, Path=SilderHeight}" Orientation="Horizontal">
+        <TextBox
+            Width="10"
+            Margin="0,3"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            BorderBrush="CornflowerBlue"
+            KeyUp="TextBox_KeyUp1"
+            Text="{Binding ElementName=SL_Bat1, Path=Value, Mode=TwoWay}"
+            Visibility="Hidden" />
+        <Canvas Width="{Binding ElementName=UC_Arrange, Path=SilderWidth}" Margin="0">
+            <Slider
+                Name="SL_Bat1"
+                Width="{Binding ElementName=UC_Arrange, Path=SilderWidth}"
+                Margin="2"
+                VerticalAlignment="Center"
                 FocusVisualStyle="{x:Null}"
                 IsSelectionRangeEnabled="True"
-                TickPlacement="TopLeft"
                 IsSnapToTickEnabled="True"
-                VerticalAlignment="Center"
-                Margin="2"
-                ValueChanged="SL_Bat1_ValueChanged">
+                Maximum="{Binding ElementName=UC_Arrange, Path=Maximum}"
+                Minimum="{Binding ElementName=UC_Arrange, Path=Minimum}"
+                SelectionEnd="{Binding ElementName=UC_Arrange, Path=EndValue}"
+                SelectionStart="{Binding ElementName=UC_Arrange, Path=StartValue}"
+                TickFrequency="{Binding ElementName=UC_Arrange, Path=SliderTickFrequency}"
+                TickPlacement="TopLeft"
+                ValueChanged="SL_Bat1_ValueChanged"
+                Value="{Binding ElementName=UC_Arrange, Path=StartValue}">
                 <Slider.Clip>
-                    <RectangleGeometry Rect="{Binding ElementName=UC_Arrange,Path=StartRect}" />
+                    <RectangleGeometry Rect="{Binding ElementName=UC_Arrange, Path=StartRect}" />
                 </Slider.Clip>
             </Slider>
-            <Slider Name="SL_Bat2"
-                Value="{Binding ElementName=UC_Arrange,Path=EndValue}"
-                Minimum="{Binding ElementName=UC_Arrange,Path=Minimum}"
-                Maximum="{Binding ElementName=UC_Arrange,Path=Maximum}"
-                SelectionStart="{Binding ElementName=UC_Arrange,Path=StartValue}"
-                SelectionEnd="{Binding ElementName=UC_Arrange,Path=EndValue}"
-                Width="{Binding ElementName=UC_Arrange,Path=SilderWidth}"
-                TickFrequency="{Binding ElementName=UC_Arrange,Path=SliderTickFrequency}"
+            <Slider
+                Name="SL_Bat2"
+                Width="{Binding ElementName=UC_Arrange, Path=SilderWidth}"
+                Margin="2"
+                VerticalAlignment="Center"
                 FocusVisualStyle="{x:Null}"
                 IsSelectionRangeEnabled="True"
-                TickPlacement="TopLeft"
                 IsSnapToTickEnabled="True"
-                VerticalAlignment="Center"
-                Margin="2"
-                ValueChanged="SL_Bat2_ValueChanged">
+                Maximum="{Binding ElementName=UC_Arrange, Path=Maximum}"
+                Minimum="{Binding ElementName=UC_Arrange, Path=Minimum}"
+                SelectionEnd="{Binding ElementName=UC_Arrange, Path=EndValue}"
+                SelectionStart="{Binding ElementName=UC_Arrange, Path=StartValue}"
+                TickFrequency="{Binding ElementName=UC_Arrange, Path=SliderTickFrequency}"
+                TickPlacement="TopLeft"
+                ValueChanged="SL_Bat2_ValueChanged"
+                Value="{Binding ElementName=UC_Arrange, Path=EndValue}">
                 <Slider.Clip>
-                    <RectangleGeometry Rect="{Binding ElementName=UC_Arrange,Path=EndRect}" />
+                    <RectangleGeometry Rect="{Binding ElementName=UC_Arrange, Path=EndRect}" />
                 </Slider.Clip>
             </Slider>
         </Canvas>
-        <TextBox   KeyUp="TextBox_KeyUp2" Visibility="Hidden"
-                  Text="{Binding  ElementName=SL_Bat2,Path=Value,Mode=TwoWay}"
-                 Width="10" Margin="0,3"
-                 BorderBrush="CornflowerBlue" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+        <TextBox
+            Width="10"
+            Margin="0,3"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Center"
+            BorderBrush="CornflowerBlue"
+            KeyUp="TextBox_KeyUp2"
+            Text="{Binding ElementName=SL_Bat2, Path=Value, Mode=TwoWay}"
+            Visibility="Hidden" />
     </StackPanel>
 
 </UserControl>

XHWK.WKTool/View/UControl/Uc_VideoItem.xaml

@@ -91,7 +91,7 @@
                         x:Name="TbName"
                         VerticalAlignment="Center"
                         FontSize="{Binding WordSize18}"
-                        Foreground="#3f6fff"
+                        Foreground="#4597FF"
                         MouseLeftButtonDown="TextBlock_MouseLeftButtonDown"
                         Text="一二三四五六七八九十一..."
                         TextAlignment="Center"
@@ -165,7 +165,7 @@
                                 Height="30"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
-                                Background="#3f6fff"
+                                Background="#4597FF"
                                 Click="BtnUpload_Click"
                                 Content="上传"
                                 Cursor="Hand"

XHWK.WKTool/Welcome.xaml

@@ -3,7 +3,6 @@
     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"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="Welcome"
     Width="100"

XHWK.WKTool/Welcome.xaml.cs

@@ -1,12 +1,11 @@
 using System.IO;
-using System.Windows;
 
 namespace XHWK.WKTool
 {
     /// <summary>
-    /// Welcome.xaml 的交互逻辑
+    ///     Welcome.xaml 的交互逻辑
     /// </summary>
-    public partial class Welcome : Window
+    public partial class Welcome
     {
         public Welcome()
         {
@@ -26,4 +25,4 @@ namespace XHWK.WKTool
             }
         }
     }
-}
+}

XHWK.WKTool/XHWK.WKTool.csproj

@@ -214,7 +214,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AESHelper.cs" />
+    <Compile Include="Utils\AESHelper.cs" />
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
@@ -362,8 +362,8 @@
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="CreateAMicroLessonWindow.xaml.cs">
-      <DependentUpon>CreateAMicroLessonWindow.xaml</DependentUpon>
+    <Compile Include="CreateWin.xaml.cs">
+      <DependentUpon>CreateWin.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <ApplicationDefinition Include="App.xaml">
@@ -378,7 +378,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="CreateAMicroLessonWindow.xaml">
+    <Page Include="CreateWin.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>