解决截图软件未最小化的问题

解决录屏未合并直接开始录制的问题

XHWK.WKTool/App.config

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

XHWK.WKTool/App.xaml

@@ -1,5 +1,5 @@
 <Application
-    x:Class="XHWK.WKTool.APP"
+    x:Class="XHWK.WKTool.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     StartupUri="Welcome.xaml">

XHWK.WKTool/App.xaml.cs

@@ -1,7 +1,5 @@
 using ComeCapture;
-
 using Common.system;
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -11,14 +9,13 @@ 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;
 
 namespace XHWK.WKTool
 {
-    public partial class APP : Application
+    public partial class App
     {
         #region 全局变量
 
@@ -46,7 +43,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 服务地址
         /// </summary>
-        public static Model_ServiceAddress ServiceAddress = null;
+        public static Model_ServiceAddress ServiceAddress;
 
         /// <summary>
         /// 接口地址
@@ -136,7 +133,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 用户信息
         /// </summary>
-        public static Model_UserInfo UserInfo = null;
+        public static Model_UserInfo UserInfo;
 
         /// <summary>
         /// 接口返回消息
@@ -180,17 +177,17 @@ namespace XHWK.WKTool
         /// <summary>
         /// 用户微课列表模型
         /// </summary>
-        public static List<Model_WKData> WKDataList = null;
+        public static List<Model_WKData> WKDataList;
 
         /// <summary>
         /// 微课模型
         /// </summary>
-        public static Model_WKData WKData = null;
+        public static Model_WKData WKData;
 
         /// <summary>
         /// 微课视频列表
         /// </summary>
-        public static List<Model_Video> VideoList = null;
+        public static List<Model_Video> VideoList;
 
         /// <summary>
         /// 画板模型
@@ -259,12 +256,7 @@ namespace XHWK.WKTool
         public static MainWindow W_XHMicroLessonSystemWindow = null;
 
         /// <summary>
-        /// 创建微课页面
-        /// </summary>
-        public static CreateAMicroLessonWindow W_CreateAMicroLessonWindow = null;
-
-        /// <summary>
-        /// 开始录像
+        /// 倒计时窗口
         /// </summary>
         public static CountdownWindow W_CountdownWindow = null;
 
@@ -317,15 +309,13 @@ namespace XHWK.WKTool
 
         #endregion 全局变量
 
-        public APP()
+        public App()
         {
-            Console.WriteLine("初始化APP");
+            Console.WriteLine(@"初始化APP");
             LogHelper.InitLog4Net();
-
             myloading = new LoadDialog();
             StopSameProcess();
             Killffmpeg();
-
             try
             {
                 UserInfo = new Model_UserInfo();
@@ -341,15 +331,15 @@ namespace XHWK.WKTool
 
                 try
                 {
-                    if (Directory.Exists(AppDomain.CurrentDomain.BaseDirectory + "Temp"))//清除临时文件
+                    if (Directory.Exists(AppDomain.CurrentDomain.BaseDirectory + "Temp")) //清除临时文件
                     {
                         Directory.Delete(AppDomain.CurrentDomain.BaseDirectory + "Temp", true);
                     }
                 }
                 catch (Exception)
                 {
+                    // ignored
                 }
-
                 if (principal.IsInRole(WindowsBuiltInRole.Administrator))
                 {
                     SkinConfig.InitSkin();
@@ -380,8 +370,8 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                string ErrMessage = "【进程】(Main):进程意外关闭。 " + ex.Message;
-                LogHelper.WriteErrLog(ErrMessage, ex);
+                string errMessage = "【进程】(Main):进程意外关闭。 " + ex.Message;
+                LogHelper.WriteErrLog(errMessage, ex);
             }
         }
 
@@ -406,6 +396,7 @@ namespace XHWK.WKTool
                         }
                         catch (Exception)
                         {
+                            // ignored
                         }
                     }
                 }
@@ -417,10 +408,10 @@ namespace XHWK.WKTool
         /// </summary>
         public static void Killffmpeg()
         {
-            Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            foreach (Process KillProcess in KillProcessArray)
+            Process[] killProcessArray = Process.GetProcessesByName("ffmpeg");
+            foreach (Process killProcess in killProcessArray)
             {
-                KillProcess.Kill();
+                killProcess.Kill();
             }
         }
 
@@ -429,7 +420,7 @@ namespace XHWK.WKTool
         private void RegisterEvents()
         {
             //Task线程内未捕获异常处理事件
-            TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;//Task异常
+            TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException; //Task异常
 
             //UI线程未捕获异常处理事件（UI主线程）
             DispatcherUnhandledException += App_DispatcherUnhandledException;
@@ -473,10 +464,6 @@ namespace XHWK.WKTool
             {
                 HandleException(ex);
             }
-            finally
-            {
-                //ignore
-            }
         }
 
         //UI线程未捕获异常处理事件（UI主线程）
@@ -523,13 +510,12 @@ namespace XHWK.WKTool
                     WKDataList = new List<Model_WKData>();
                 }
                 WKDataList.Add(WKData);
-
-                string WkDateXmlStr = XmlUtilHelper.XmlSerialize(WKDataList);
-                string SavePath = FileToolsCommon.GetFileAbsolutePath("/Data/");
-                FileToolsCommon.CreateDirectory(SavePath);
-                string SaveName = SavePath + "WkDate.d";
-                FileToolsCommon.DeleteFile(SaveName);
-                FileToolsCommon.WriteText(SaveName, WkDateXmlStr);
+                string wkDateXmlStr = XmlUtilHelper.XmlSerialize(WKDataList);
+                string savePath = FileToolsCommon.GetFileAbsolutePath("/Data/");
+                FileToolsCommon.CreateDirectory(savePath);
+                string saveName = savePath + "WkDate.d";
+                FileToolsCommon.DeleteFile(saveName);
+                FileToolsCommon.WriteText(saveName, wkDateXmlStr);
             }
             catch (Exception ex)
             {
@@ -540,26 +526,26 @@ namespace XHWK.WKTool
         /// <summary>
         /// 读取微课信息
         /// </summary>
-        public static void ReadWkData(string WkPath)
+        public static void ReadWkData(string wkPath)
         {
             try
             {
-                string SavePath = FileToolsCommon.GetFileAbsolutePath("/Data/");
-                FileToolsCommon.CreateDirectory(SavePath);
-                string SaveName = SavePath + "WkDate.d";
+                string savePath = FileToolsCommon.GetFileAbsolutePath("/Data/");
+                FileToolsCommon.CreateDirectory(savePath);
+                string saveName = savePath + "WkDate.d";
                 //文件若存在则读取
-                if (FileToolsCommon.IsExistFile(SaveName))
+                if (FileToolsCommon.IsExistFile(saveName))
                 {
-                    string WkDateXmlStr = FileToolsCommon.FileToString(SaveName);
-                    WKDataList = XmlUtilHelper.DESerializer<List<Model_WKData>>(WkDateXmlStr);
+                    string wkDateXmlStr = FileToolsCommon.FileToString(saveName);
+                    WKDataList = XmlUtilHelper.DESerializer<List<Model_WKData>>(wkDateXmlStr);
                     foreach (Model_WKData wklist in WKDataList)
                     {
                         //移除找不到视频的微课数据
                         wklist.VideoList.RemoveAll(x => !FileToolsCommon.IsExistFile(x.VideoPath));
                     }
-                    if (WKDataList.Exists(x => x.WkPath == WkPath))
+                    if (WKDataList.Exists(x => x.WkPath == wkPath))
                     {
-                        WKData = WKDataList.Find(x => x.WkPath == WkPath);
+                        WKData = WKDataList.Find(x => x.WkPath == wkPath);
                         VideoList = new List<Model_Video>();
                         WKData.VideoList = WKData.VideoList.Where((x, i) => WKData.VideoList.FindIndex(z => z.FileGuid == x.FileGuid) == i).ToList();
                         VideoList = WKData.VideoList;
@@ -588,10 +574,10 @@ namespace XHWK.WKTool
                     return;
                 }
                 FileToolsCommon.CreateDirectory(WKData.WkPath);
-                string SavePath = WKData.WkPath + "PageData.xml";
-                FileToolsCommon.DeleteFile(SavePath);
-                string PageDataXmlStr = XmlUtilHelper.XmlSerialize(PageDrawList);
-                FileToolsCommon.WriteText(SavePath, PageDataXmlStr);
+                string savePath = WKData.WkPath + "PageData.xml";
+                FileToolsCommon.DeleteFile(savePath);
+                string pageDataXmlStr = XmlUtilHelper.XmlSerialize(PageDrawList);
+                FileToolsCommon.WriteText(savePath, pageDataXmlStr);
             }
             catch (Exception ex)
             {
@@ -607,11 +593,11 @@ namespace XHWK.WKTool
             try
             {
                 PageDrawList = new List<Model_DrawData>();
-                string SavePath = WKData.WkPath + "PageData.xml";
-                if (FileToolsCommon.IsExistFile(SavePath))
+                string savePath = WKData.WkPath + "PageData.xml";
+                if (FileToolsCommon.IsExistFile(savePath))
                 {
-                    string PageDataXmlStr = FileToolsCommon.FileToString(SavePath);
-                    PageDrawList = XmlUtilHelper.DESerializer<List<Model_DrawData>>(PageDataXmlStr);
+                    string pageDataXmlStr = FileToolsCommon.FileToString(savePath);
+                    PageDrawList = XmlUtilHelper.DESerializer<List<Model_DrawData>>(pageDataXmlStr);
                 }
                 else
                 {
@@ -639,15 +625,13 @@ namespace XHWK.WKTool
                 {
                     return;
                 }
-                string DateXmlStr = XmlUtilHelper.XmlSerialize(ServiceAddress);
-                string SavePath = DataPath;
-                FileToolsCommon.CreateDirectory(SavePath);
-
-                string SaveName = SavePath + (isDebug ? "ServiceAddress_debug.xml" : "ServiceAddress_release.xml");
-
-                Console.WriteLine("保存路径为:");
-                FileToolsCommon.DeleteFile(SaveName);
-                FileToolsCommon.WriteText(SaveName, DateXmlStr);
+                string dateXmlStr = XmlUtilHelper.XmlSerialize(ServiceAddress);
+                string savePath = DataPath;
+                FileToolsCommon.CreateDirectory(savePath);
+                string saveName = savePath + (isDebug ? "ServiceAddress_debug.xml" : "ServiceAddress_release.xml");
+                Console.WriteLine(@"保存路径为:");
+                FileToolsCommon.DeleteFile(saveName);
+                FileToolsCommon.WriteText(saveName, dateXmlStr);
             }
             catch (Exception ex)
             {
@@ -662,14 +646,14 @@ namespace XHWK.WKTool
         {
             try
             {
-                string SavePath = DataPath;
-                FileToolsCommon.CreateDirectory(SavePath);
-                string SaveName = SavePath + (isDebug ? "ServiceAddress_debug.xml" : "ServiceAddress_release.xml");
+                string savePath = DataPath;
+                FileToolsCommon.CreateDirectory(savePath);
+                string saveName = savePath + (isDebug ? "ServiceAddress_debug.xml" : "ServiceAddress_release.xml");
                 //文件若存在则读取
-                if (FileToolsCommon.IsExistFile(SaveName))
+                if (FileToolsCommon.IsExistFile(saveName))
                 {
-                    string DateXmlStr = FileToolsCommon.FileToString(SaveName);
-                    ServiceAddress = XmlUtilHelper.DESerializer<Model_ServiceAddress>(DateXmlStr);
+                    string dateXmlStr = FileToolsCommon.FileToString(saveName);
+                    ServiceAddress = XmlUtilHelper.DESerializer<Model_ServiceAddress>(dateXmlStr);
                     SwitchAddress();
                 }
             }
@@ -709,4 +693,4 @@ namespace XHWK.WKTool
             base.OnStartup(e);
         }
     }
-}
+}

XHWK.WKTool/AppUpdateWin.xaml.cs

@@ -49,8 +49,7 @@ namespace XHWK.WKTool
 
         private void gengxinClick(object sender, RoutedEventArgs e)
         {
-            string fileUrl = APP.showImageUrl + pageData.appModel.versionpath;
-
+            string fileUrl = App.showImageUrl + pageData.appModel.versionpath;
             string path = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
             DirectoryInfo info = new DirectoryInfo(path);
             if (!info.Exists)
@@ -112,4 +111,4 @@ namespace XHWK.WKTool
             MessageWindow.Show(msg);
         }
     }
-}
+}

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -1,30 +1,47 @@
-using Common.system;
-
-using System;
-using System.Threading;
+using System;
 using System.Windows;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 
 namespace XHWK.WKTool
 {
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+
     /// <summary>
     /// 录屏等待 CountdownWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class CountdownWindow : Window
+    public partial class CountdownWindow
     {
+        private readonly List<BitmapImage> _images = new List<BitmapImage>();
+
         public CountdownWindow()
         {
             InitializeComponent();
+            foreach (var imgName in _imgNames)
+            {
+                _images.Add(new BitmapImage(new Uri("pack://application:,,/Images/" + imgName)));
+            }
         }
 
         /// <summary>
         /// 计时器
         /// </summary>
-        private int ImgNum = 22;
-        public void Initialize(bool ShowlblShortcut = false, int changeTime = 3000)
+        private int _imgNum = 22;
+
+        public void Initialize(bool showlblShortcut = false, int changeTime = 3000)
         {
-            if (ShowlblShortcut)
+            imgLoding.Opacity = 0.1;
+            imgLoding.Source = _images.Last();
+            Init(showlblShortcut, changeTime);
+        }
+
+        private System.Timers.Timer _timer;
+
+        private async void Init(bool showlblShortcut, int changeTime)
+        {
+            if (showlblShortcut)
             {
                 lblShortcut.Visibility = Visibility.Visible;
                 borShortcut.Visibility = Visibility.Visible;
@@ -34,254 +51,72 @@ namespace XHWK.WKTool
                 lblShortcut.Visibility = Visibility.Hidden;
                 borShortcut.Visibility = Visibility.Hidden;
             }
-            ImgNum = 22;
-            bool IsStart = true;
-            new Thread(new ThreadStart(new Action(() =>
-            {
-                while (IsStart)
-                {
-                    try
-                    {
-                        if (ImgNum >= 0)
-                        {
-                            loadingImg(ImgNum);
-                            ImgNum--;
-                            Thread.Sleep(changeTime / 22);
-                        }
-                        else
-                        {
-                            IsStart = false;
-                            Dispatcher.Invoke(
-                                      DispatcherPriority.Send,
-                                      new Action(() =>
-                                      {
-                                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
-                                          Hide();
-                                      }));
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteErrLog("【录屏等待】(Initialize)" + ex.Message, ex);
-                    }
-                }
-            }))).Start();
-
+            _imgNum = 22;
+            _timer = new System.Timers.Timer();
+            _timer.Enabled = true;
+            _timer.Interval = 1.0 * changeTime / 22;
+            _timer.Elapsed += Timer_Elapsed;
+            _timer.Start();
+            await Task.Delay(300);
+            imgLoding.Opacity = 1;
         }
 
         private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
-            if (ImgNum >= 1)
+            if (_imgNum >= 0)
             {
-                loadingImg(ImgNum);
-                ImgNum--;
+                Dispatcher.Invoke
+                (
+                    () =>
+                    {
+                        // 执行操作
+                        imgLoding.Source = _images[_imgNum];
+                    },
+                    DispatcherPriority.Send
+                );
+                _imgNum--;
             }
             else
             {
-                //timer.Enabled = false;
-                Dispatcher.Invoke(
-                  DispatcherPriority.Send,
-                  new Action(() =>
-                  {
-                      imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
-                      Hide();
-                  }));
-            }
-        }
-
-        /// <summary>
-        /// 加载图片
-        /// </summary>
-        /// <param name="num"></param>
-        private void loadingImg(int num)
-        {
-            switch (num)
-            {
-                case 1:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_7.png"));
-                      }));
-                    break;
-                case 2:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_6.png"));
-                      }));
-                    break;
-                case 3:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_5.png"));
-                      }));
-                    break;
-                case 4:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_4.png"));
-                      }));
-                    break;
-                case 5:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_3.png"));
-                      }));
-                    break;
-                case 6:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_2.png"));
-                      }));
-                    break;
-                case 7:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_1.png"));
-                      }));
-                    break;
-                case 8:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_7.png"));
-                      }));
-                    break;
-                case 9:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_6.png"));
-                      }));
-                    break;
-                case 10:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_5.png"));
-                      }));
-                    break;
-                case 11:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_4.png"));
-                      }));
-                    break;
-                case 12:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_3.png"));
-                      }));
-                    break;
-                case 13:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_2.png"));
-                      }));
-                    break;
-                case 14:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_1.png"));
-                      }));
-                    break;
-                case 15:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_8.png"));
-                      }));
-                    break;
-                case 16:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_7.png"));
-                      }));
-                    break;
-                case 17:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_6.png"));
-                      }));
-                    break;
-                case 18:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_5.png"));
-                      }));
-                    break;
-                case 19:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_4.png"));
-                      }));
-                    break;
-                case 20:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_3.png"));
-                      }));
-                    break;
-                case 21:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_2.png"));
-                      }));
-                    break;
-                case 22:
-                    Dispatcher.Invoke(
-                      DispatcherPriority.Send,
-                      new Action(() =>
-                      {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
-                      }));
-                    break;
-                default:
-                    break;
+                _timer.Stop();
+                Dispatcher.Invoke
+                (
+                    () =>
+                    {
+                        // 执行操作
+                        imgLoding.Source = _images.Last();
+                        Hide();
+                    },
+                    DispatcherPriority.Send
+                );
             }
         }
 
-        private void Window_ContentRendered(object sender, EventArgs e)
+        readonly string[] _imgNames =
         {
-
-        }
-
+            "countdown1_7.png",
+            "countdown1_6.png",
+            "countdown1_5.png",
+            "countdown1_4.png",
+            "countdown1_3.png",
+            "countdown1_2.png",
+            "countdown1_1.png",
+            "countdown2_7.png",
+            "countdown2_6.png",
+            "countdown2_5.png",
+            "countdown2_4.png",
+            "countdown2_3.png",
+            "countdown2_2.png",
+            "countdown2_1.png",
+            "countdown3_8.png",
+            "countdown3_7.png",
+            "countdown3_6.png",
+            "countdown3_5.png",
+            "countdown3_4.png",
+            "countdown3_3.png",
+            "countdown3_2.png",
+            "countdown3_1.png",
+            "countdown3_1.png",
+        };
     }
 }

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -249,10 +249,10 @@ namespace XHWK.WKTool
                 try
                 {
                     //读取微课数据
-                    APP.ReadWkData(wkpath);
-                    if (APP.WKData == null)
+                    App.ReadWkData(wkpath);
+                    if (App.WKData == null)
                     {
-                        APP.WKData = new Model_WKData
+                        App.WKData = new Model_WKData
                         {
                             WkPath = wkpath,
                             WkName = wkName,
@@ -263,7 +263,7 @@ namespace XHWK.WKTool
                     try
                     {
                         //创建文件夹
-                        FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+                        FileToolsCommon.CreateDirectory(App.WKData.WkPath);
                         FileToolsCommon.DeleteDirectory(wkpath + "temp");
                         FileToolsCommon.DeleteDirectory(wkpath + "_temppath");
                     }
@@ -274,21 +274,18 @@ namespace XHWK.WKTool
 
                     //存储文件
                     FileToolsCommon.SetConfigValue("VideoSavePath", storagePath);
-
-                    APP.ReadDrawData();
+                    App.ReadDrawData();
                 }
                 catch (Exception ex)
                 {
                     LogHelper.WriteErrLog("【微课创建课程】读取课堂数据失败：" + ex.Message, ex);
                 }
             });
-
-            if (APP.W_XHMicroLessonSystemWindow == null)
+            if (App.W_XHMicroLessonSystemWindow == null)
             {
-                APP.W_XHMicroLessonSystemWindow = new MainWindow();
+                App.W_XHMicroLessonSystemWindow = new MainWindow();
             }
-
-            APP.W_XHMicroLessonSystemWindow.Show();
+            App.W_XHMicroLessonSystemWindow.Show();
             LblCreate.Visibility = Visibility.Hidden;
             Hide();
         }
@@ -315,16 +312,14 @@ namespace XHWK.WKTool
             new Thread(o =>
             {
                 //读取本地
-                APP.ReadServiceAddressData();
+                App.ReadServiceAddressData();
                 int versionThis = int.Parse(FileToolsCommon.GetConfigValue("VersionCode"));
                 if (versionThis < 0)
                 {
                     //软件是否更新，版本号小于0不更新
                     return;
                 }
-
-                string url = APP.apiUrl + "/sapi/apprecord/get_new";
-
+                string url = App.apiUrl + "/sapi/apprecord/get_new";
                 string result = HttpHelper.PostAndRespStr(url, "{}");
                 var resultObj = JsonHelper.JsonToObj<ResultVo<Model_App>>(result);
                 if (result != null && resultObj.code == 0)
@@ -378,4 +373,4 @@ namespace XHWK.WKTool
             Environment.Exit(0);
         }
     }
-}
+}

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -16,7 +16,7 @@ namespace XHWK.WKTool.DAL
     /// </summary>
     public class DalUpload
     {
-        private readonly string _fileRequestAddress = APP.uploadUrl;
+        private readonly string _fileRequestAddress = App.uploadUrl;
 
         //private string schoolfileRequestAddress = APP.showImageUrl;
         /// <summary>
@@ -53,8 +53,7 @@ namespace XHWK.WKTool.DAL
 
                         Model.ResultVo<Model_ResourceAddTwo> resultObj =
                             JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString());
-
-                        APP.ResourceAddTwo = resultObj.obj;
+                        App.ResourceAddTwo = resultObj.obj;
                         //已存在 不允许上传
                         return false;
                     }
@@ -109,11 +108,11 @@ namespace XHWK.WKTool.DAL
                         return false;
                     }
                     Model.ResultVo<Model_ResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString());
-                    APP.ResourceAddTwo = new Model_ResourceAddTwo();
+                    App.ResourceAddTwo = new Model_ResourceAddTwo();
                     //0成功，1失败
                     if (resultObj.code == 0 && resultObj.obj != null)
                     {
-                        APP.ResourceAddTwo = resultObj.obj;
+                        App.ResourceAddTwo = resultObj.obj;
                         return true;
                     }
                     else
@@ -147,13 +146,12 @@ namespace XHWK.WKTool.DAL
             try
             {
                 Model_Video videoInfo = null;
-                foreach (Model_WKData vdata in APP.WKDataList)
+                foreach (Model_WKData vdata in App.WKDataList)
                 {
                     if (vdata.VideoList == null)
                     {
                         continue;
                     }
-
                     foreach (Model_Video videoinfo in vdata.VideoList)
                     {
                         if (videoinfo.FileGuid == videoGuid)
@@ -162,7 +160,6 @@ namespace XHWK.WKTool.DAL
                             break;
                         }
                     }
-
                     if (videoInfo != null)
                     {
                         break;
@@ -203,13 +200,12 @@ namespace XHWK.WKTool.DAL
             try
             {
                 Model_Video videoInfo = null;
-                foreach (Model_WKData vdata in APP.WKDataList)
+                foreach (Model_WKData vdata in App.WKDataList)
                 {
                     if (vdata.VideoList == null)
                     {
                         continue;
                     }
-
                     foreach (Model_Video videoinfo in vdata.VideoList)
                     {
                         if (videoinfo.FileGuid == videoGuid)
@@ -218,7 +214,6 @@ namespace XHWK.WKTool.DAL
                             break;
                         }
                     }
-
                     if (videoInfo != null)
                     {
                         break;
@@ -266,10 +261,12 @@ namespace XHWK.WKTool.DAL
                             #region 合并文件
 
                             //合并文件
-                            bool isres =
-                                ReportFileMerge(
-                                    APP.UserInfo.cloudcode + "/" + APP.UserInfo.Schoolid.ToString() + "/resource",
-                                    videoInfo.FileGuid, out errMessage);
+                            bool isres = ReportFileMerge
+                            (
+                                App.UserInfo.cloudcode + "/" + App.UserInfo.Schoolid.ToString() + "/resource",
+                                videoInfo.FileGuid,
+                                out errMessage
+                            );
                             if (isres)
                             {
                                 videoInfo.IsUpload = true;
@@ -350,10 +347,12 @@ namespace XHWK.WKTool.DAL
                         #region 合并文件
 
                         //合并文件
-                        bool isres =
-                            ReportFileMerge(
-                                APP.UserInfo.cloudcode + "/" + APP.UserInfo.Schoolid.ToString() + "/resource",
-                                videoInfo.FileGuid, out errMessage);
+                        bool isres = ReportFileMerge
+                        (
+                            App.UserInfo.cloudcode + "/" + App.UserInfo.Schoolid.ToString() + "/resource",
+                            videoInfo.FileGuid,
+                            out errMessage
+                        );
                         if (isres)
                         {
                             //VideoInfo.IsUpload = true;
@@ -375,4 +374,4 @@ namespace XHWK.WKTool.DAL
             return false;
         }
     }
-}
+}

XHWK.WKTool/DAL/XHApi.cs

@@ -24,7 +24,7 @@ namespace XHWK.WKTool.DAL
         {
             try
             {
-                string url = APP.certapiUrl + "/activation/add";//地址
+                string url = App.certapiUrl + "/activation/add"; //地址
                 Dictionary<string, object> dic = new Dictionary<string, object>
                 {
                     { "mac", mac },
@@ -37,7 +37,7 @@ namespace XHWK.WKTool.DAL
 
                 if (string.IsNullOrEmpty(xmlDoc))
                 {
-                    APP.ServerMsg = "网络异常！";
+                    App.ServerMsg = "网络异常！";
                     return 1;
                 }
                 else
@@ -47,19 +47,23 @@ namespace XHWK.WKTool.DAL
                     {
                         if (obj["code"].ToString().Equals("0"))
                         {
-                            APP.Signature = obj["obj"].ToString();
-                            if (!Directory.Exists(APP.DataPath))
+                            App.Signature = obj["obj"].ToString();
+                            if (!Directory.Exists(App.DataPath))
                             {
-                                Directory.CreateDirectory(APP.DataPath);
+                                Directory.CreateDirectory(App.DataPath);
                             }
-                            string ApplicationData = APP.DataPath + "signature.txt";
-
-                            System.IO.File.WriteAllText(ApplicationData, APP.Signature, Encoding.Default);//存放签名
+                            string ApplicationData = App.DataPath + "signature.txt";
+                            System.IO.File.WriteAllText
+                            (
+                                ApplicationData,
+                                App.Signature,
+                                Encoding.Default
+                            ); //存放签名
                             return 0;
                         }
                         else
                         {
-                            APP.ServerMsg = obj["msg"].ToString();
+                            App.ServerMsg = obj["msg"].ToString();
                             return Convert.ToInt32(obj["code"].ToString());
                         }
                     }
@@ -71,7 +75,7 @@ namespace XHWK.WKTool.DAL
             }
             catch (Exception ex)
             {
-                APP.ServerMsg = "网络异常！";
+                App.ServerMsg = "网络异常！";
                 LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
                 return 1;
             }
@@ -88,11 +92,8 @@ namespace XHWK.WKTool.DAL
         {
             try
             {
-                string url = APP.certapiUrl + "/activation/add_history";
-                Dictionary<string, object> dic = new Dictionary<string, object>
-                {
-                    { "sign", APP.Signature }
-                };
+                string url = App.certapiUrl + "/activation/add_history";
+                Dictionary<string, object> dic = new Dictionary<string, object> { { "sign", App.Signature } };
                 string body = JsonHelper.ToJson(dic);
                 string xmlDoc = HttpHelper.HttpPost(body, url);
 
@@ -106,7 +107,7 @@ namespace XHWK.WKTool.DAL
                     JObject obj = JObject.Parse(xmlDoc);
                     if (obj != null)
                     {
-                        APP.ServerMsg = obj["msg"].ToString();
+                        App.ServerMsg = obj["msg"].ToString();
                         return Convert.ToInt32(obj["code"].ToString());
                     }
                     else
@@ -132,7 +133,7 @@ namespace XHWK.WKTool.DAL
         public int Login(string loginname, string loginpwd)
         {
             Console.WriteLine(FileToolsCommon.GetConfigValue("APIRequestAddress"));
-            string url = APP.apiUrl + "/suser/user/login";//地址
+            string url = App.apiUrl + "/suser/user/login"; //地址
 
             //1.193.37.200
             string Address = "";//河南 郑州
@@ -150,18 +151,18 @@ namespace XHWK.WKTool.DAL
             ResultVo<Model_UserInfo> result = HttpHelper.PostAndRespSignle<ResultVo<Model_UserInfo>>(url, postData: body);
             if (result != null)
             {
-                APP.UserInfo = new Model_UserInfo();
-                APP.ServerMsg = result.msg;
+                App.UserInfo = new Model_UserInfo();
+                App.ServerMsg = result.msg;
                 if (result.obj != null)
                 {
-                    APP.UserInfo = result.obj;
+                    App.UserInfo = result.obj;
                 }
                 return result.code;
             }
             else
             {
-                APP.ServerMsg = "网络异常！";
-                APP.UserInfo = new Model_UserInfo();
+                App.ServerMsg = "网络异常！";
+                App.UserInfo = new Model_UserInfo();
                 return 1;
             }
         }
@@ -177,7 +178,7 @@ namespace XHWK.WKTool.DAL
         /// </returns>
         public bool DownloadAvatar(string headPortrait, string SavePath)
         {
-            string url = APP.showImageUrl + headPortrait;
+            string url = App.showImageUrl + headPortrait;
             bool result = HttpHelper.GetDataGetHtml(url, SavePath, "");
             return result;
         }
@@ -191,25 +192,22 @@ namespace XHWK.WKTool.DAL
         /// </returns>
         public int TsubjectbookList()
         {
-            APP.TsubjectbookList = new List<Model_TsubjectbookList>();
+            App.TsubjectbookList = new List<Model_TsubjectbookList>();
             try
             {
-                string url = APP.apiUrl + "/sstudy/tsubjectbook/list";//地址
-                Dictionary<string, int> dic = new Dictionary<string, int>
-                {
-                    { "teacherid",APP.UserInfo.Userid}
-                };
+                string url = App.apiUrl + "/sstudy/tsubjectbook/list"; //地址
+                Dictionary<string, int> dic = new Dictionary<string, int> { { "teacherid", App.UserInfo.Userid } };
                 string body = JsonHelper.ToJson(dic);
                 ResultVo<List<Model_TsubjectbookList>> result = HttpHelper.PostAndRespSignle<ResultVo<List<Model_TsubjectbookList>>>(url, postData: body);
                 if (result != null)
                 {
-                    APP.ServerMsg = result.msg;
-                    APP.TsubjectbookList = result.obj;
+                    App.ServerMsg = result.msg;
+                    App.TsubjectbookList = result.obj;
                     return result.code;
                 }
                 else
                 {
-                    APP.ServerMsg = "网络异常！";
+                    App.ServerMsg = "网络异常！";
                     return 1;
                 }
             }
@@ -229,10 +227,10 @@ namespace XHWK.WKTool.DAL
         /// </returns>
         public int DirectorList(string lsbid, int belong, int createid)
         {
-            APP.DirectorList = new List<Model_DirectorList>();
+            App.DirectorList = new List<Model_DirectorList>();
             try
             {
-                string url = APP.apiUrl + "/sstudy/director/list";//地址
+                string url = App.apiUrl + "/sstudy/director/list"; //地址
                 Dictionary<string, string> dic = new Dictionary<string, string>
                 {
                     { "lsbid", lsbid },
@@ -243,13 +241,13 @@ namespace XHWK.WKTool.DAL
                 ResultVo<List<Model_DirectorList>> result = HttpHelper.PostAndRespSignle<ResultVo<List<Model_DirectorList>>>(url, postData: body);
                 if (result != null)
                 {
-                    APP.ServerMsg = result.msg;
-                    APP.DirectorList = result.obj;
+                    App.ServerMsg = result.msg;
+                    App.DirectorList = result.obj;
                     return result.code;
                 }
                 else
                 {
-                    APP.ServerMsg = "网络异常！";
+                    App.ServerMsg = "网络异常！";
                     return 1;
                 }
             }
@@ -269,10 +267,10 @@ namespace XHWK.WKTool.DAL
         /// </returns>
         public int ResourceAdd(Model_ResourceAdd model)
         {
-            APP.DirectorList = new List<Model_DirectorList>();
+            App.DirectorList = new List<Model_DirectorList>();
             try
             {
-                string url = APP.apiUrl + "/sstudy/resource/add";//地址
+                string url = App.apiUrl + "/sstudy/resource/add"; //地址
                 Dictionary<string, object> dic = new Dictionary<string, object>
                 {
                     //            converted: 0
@@ -322,18 +320,18 @@ namespace XHWK.WKTool.DAL
                 JObject obj = JObject.Parse(xmlDoc);
                 if (obj != null)
                 {
-                    APP.ServerMsg = obj["msg"].ToString();
+                    App.ServerMsg = obj["msg"].ToString();
                     return Convert.ToInt32(obj["code"].ToString());
                 }
                 else
                 {
-                    APP.ServerMsg = "网络异常！";
+                    App.ServerMsg = "网络异常！";
                     return 1;
                 }
             }
             catch (Exception ex)
             {
-                APP.ServerMsg = "网络异常！";
+                App.ServerMsg = "网络异常！";
                 LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
                 return 1;
             }
@@ -348,8 +346,7 @@ namespace XHWK.WKTool.DAL
         /// </returns>
         public bool GetServiceAddress(string Schoolcode, out string Message)
         {
-            string url = APP.certapiUrl + "/school/find_code";//地址
-
+            string url = App.certapiUrl + "/school/find_code"; //地址
             Dictionary<string, object> dic = new Dictionary<string, object>
             {
                 { "schoolcode", Schoolcode}
@@ -363,8 +360,8 @@ namespace XHWK.WKTool.DAL
                     if (result.obj != null)
                     {
                         Message = result.msg;
-                        APP.ServiceAddress = result.obj;
-                        APP.SaveServiceAddressData();
+                        App.ServiceAddress = result.obj;
+                        App.SaveServiceAddressData();
                         return true;
                     }
                     else
@@ -386,4 +383,4 @@ namespace XHWK.WKTool.DAL
             }
         }
     }
-}
+}

XHWK.WKTool/DeviceWindow.xaml.cs

@@ -93,7 +93,7 @@ namespace XHWK.WKTool
             if (allCamera.Count > 0)
             {
                 CmbCameraList.SelectedIndex = 0;
-                APP.CameraName = allCamera[0].MonikerString;
+                App.CameraName = allCamera[0].MonikerString;
             }
         }
 
@@ -118,7 +118,7 @@ namespace XHWK.WKTool
                 if (CmbCameraList.SelectedIndex >= 0)
                 {
                     var info = CmbCameraList.SelectedItem as FilterInfo;
-                    APP.CameraName = info.MonikerString;
+                    App.CameraName = info.MonikerString;
                     _camera = new VideoCaptureDevice(info.MonikerString);
                     //配置录像参数(宽,高,帧率,比特率等参数)VideoCapabilities这个属性会返回摄像头支持哪些配置
                     _camera.VideoResolution = _camera.VideoCapabilities[0];
@@ -455,4 +455,4 @@ namespace XHWK.WKTool
 
         #endregion 事件
     }
-}
+}

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -126,8 +126,8 @@ namespace ComeCapture
             {
                 k_hook.Stop();
                 Current.OnCancel();
-                APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
-                APP.W_XHMicroLessonSystemWindow.WindowType();
+                App.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
+                App.W_XHMicroLessonSystemWindow.WindowType();
                 Hide();
             }
         }
@@ -261,9 +261,9 @@ namespace ComeCapture
             {
                 Directory.CreateDirectory(tempPath);
             }
-            APP.ImgPath = string.Empty;
+            App.ImgPath = string.Empty;
             string imagePath = Path.Combine(tempPath, time + ".jpg");
-            APP.ImgPath = imagePath;
+            App.ImgPath = imagePath;
             //LogHelper.WriteInfoLog(imagePath);
             //this.Close();
             //string imagePath = ImageHelper.GetImagePath(out string serverSavePath);
@@ -544,4 +544,4 @@ namespace ComeCapture
         /// </summary>
         public event CloseJietuWindowClick click_closeJietuWindowClick;
     }
-}
+}

XHWK.WKTool/KeyVerification.xaml.cs

@@ -49,7 +49,7 @@ namespace XHWK.WKTool
                 TxbKey.Text = _projectcode.Substring(0, 8);
                 return;
             }
-            APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddServering, InvokeActivationAddServerCompate);
+            App.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddServering, InvokeActivationAddServerCompate);
         }
 
         private string _projectcode = string.Empty;
@@ -64,7 +64,7 @@ namespace XHWK.WKTool
             string device = "pcwk";
             string mac = GetMacAddress();
             _serverReturnCode = _registerController.ActivationAdd(mac, device, _projectcode);
-            return APP.ServerMsg;
+            return App.ServerMsg;
         }
 
         /// <summary>
@@ -77,22 +77,23 @@ namespace XHWK.WKTool
             if (_serverReturnCode == 0)
             {
                 MessageWindow.Show("产品激活成功");
-                APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering,
-                    InvokeActivationAddHistoryServerCompate);
-                Dispatcher.Invoke(() =>
-                {
-                    Hide();
-                    CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
-                    //win.Topmost = true;
-                    win.Show();
-
-                    Thread.Sleep(200);
-                    Close();
-                });
+                App.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering, InvokeActivationAddHistoryServerCompate);
+                Dispatcher.Invoke
+                (
+                    () =>
+                    {
+                        Hide();
+                        CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
+                        //win.Topmost = true;
+                        win.Show();
+                        Thread.Sleep(200);
+                        Close();
+                    }
+                );
             }
             else
             {
-                MessageWindow.Show(APP.ServerMsg);
+                MessageWindow.Show(App.ServerMsg);
             }
         }
 
@@ -104,7 +105,7 @@ namespace XHWK.WKTool
         private object InvokeActivationAddHistoryServering()
         {
             _serverReturnCode = _registerController.ActivationAddHistory();
-            return APP.ServerMsg;
+            return App.ServerMsg;
         }
 
         /// <summary>
@@ -114,12 +115,11 @@ namespace XHWK.WKTool
         /// </returns>
         public void InvokeActivationAddHistoryServerCompate(object obj)
         {
-            if (!Directory.Exists(APP.DataPath))
+            if (!Directory.Exists(App.DataPath))
             {
-                Directory.CreateDirectory(APP.DataPath);
+                Directory.CreateDirectory(App.DataPath);
             }
-
-            string applicationData = APP.DataPath + "signatureTime.txt";
+            string applicationData = App.DataPath + "signatureTime.txt";
             string currentTime = DateTime.Now.ToLongDateString(); //当前时间
             File.WriteAllText(applicationData, currentTime, Encoding.Default); //存放签名验证日期
         }
@@ -161,8 +161,8 @@ namespace XHWK.WKTool
 
         private void CloseAction()
         {
-            APP.myloading.Show();
+            App.myloading.Show();
             new Thread(o => { Dispatcher.Invoke(() => { Environment.Exit(0); }); }).Start();
         }
     }
-}
+}

XHWK.WKTool/LoginWindow.xaml.cs

@@ -32,16 +32,16 @@ namespace XHWK.WKTool
 
         public void Initialize()
         {
-            if (FileToolsCommon.IsExistFile(APP.DataPath + "accountNumber.txt"))
+            if (FileToolsCommon.IsExistFile(App.DataPath + "accountNumber.txt"))
             {
-                string accountNumber = System.IO.File.ReadAllText(APP.DataPath + "accountNumber.txt", Encoding.Default);
+                string accountNumber = System.IO.File.ReadAllText(App.DataPath + "accountNumber.txt", Encoding.Default);
                 if (!string.IsNullOrWhiteSpace(accountNumber))
                 {
                     TxbAccountNumber.Text = accountNumber;
                     CkSaveName.IsChecked = true;
                 }
             }
-            DataContext = APP.PageContextData;
+            DataContext = App.PageContextData;
         }
 
         /// <summary>
@@ -69,7 +69,7 @@ namespace XHWK.WKTool
         {
             #region 获取服务接口地址 --2021年7月9日赵耀
 
-            if (APP.ServiceAddress == null)
+            if (App.ServiceAddress == null)
             {
                 MessageWindow.Show("首次使用需设置服务地址。");
                 BtnServiceAddress_Click(null, null);
@@ -98,7 +98,7 @@ namespace XHWK.WKTool
                 MessageWindow.Show("密码长度不能高于16位");
                 return;
             }
-            APP.myloading.Show();
+            App.myloading.Show();
             Login();
         }
 
@@ -115,8 +115,8 @@ namespace XHWK.WKTool
             int code = xhapi.Login(accountNumber, password);
             if (code == 0)
             {
-                FileToolsCommon.CreateDirectory(APP.DataPath);
-                string applicationData = APP.DataPath + "accountNumber.txt";
+                FileToolsCommon.CreateDirectory(App.DataPath);
+                string applicationData = App.DataPath + "accountNumber.txt";
                 if (CkSaveName.IsChecked == true)
                 {
                     string accountNumbers = TxbAccountNumber.Text;
@@ -137,20 +137,19 @@ namespace XHWK.WKTool
                         Encoding.Default
                     ); //存放账号
                 }
-
-                APP.myloading.Hide();
+                App.myloading.Hide();
                 //UpdateSettingString("userName", txbAccountNumber.Text);
-                APP.IsLoginType = true;
+                App.IsLoginType = true;
                 TxbAccountNumber.Text = string.Empty;
                 pobPassword.Password = string.Empty;
 
                 #region 下载头像
 
-                string HeadpicPath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + ".png");
-                if (!string.IsNullOrWhiteSpace(APP.UserInfo.Headpic))
+                string HeadpicPath = FileToolsCommon.GetFileAbsolutePath("/Data/" + App.UserInfo.Username + ".png");
+                if (!string.IsNullOrWhiteSpace(App.UserInfo.Headpic))
                 {
                     //FileToolsCommon.
-                    xhapi.DownloadAvatar(APP.UserInfo.Headpic, HeadpicPath);
+                    xhapi.DownloadAvatar(App.UserInfo.Headpic, HeadpicPath);
                 }
 
                 #endregion 下载头像
@@ -159,9 +158,9 @@ namespace XHWK.WKTool
             }
             else
             {
-                APP.IsLoginType = false;
-                APP.myloading.Hide();
-                MessageWindow.Show(APP.ServerMsg);
+                App.IsLoginType = false;
+                App.myloading.Hide();
+                MessageWindow.Show(App.ServerMsg);
             }
         }
 
@@ -295,9 +294,8 @@ namespace XHWK.WKTool
             {
                 if (xhapi.GetServiceAddress(TbxServiceAddress.Text, out string Message))
                 {
-                    APP.SaveServiceAddressData();
-                    APP.SwitchAddress();
-
+                    App.SaveServiceAddressData();
+                    App.SwitchAddress();
                     MessageWindow.Show("设置成功！");
                     BtnCancel_Click(null, null);
                 }
@@ -322,11 +320,11 @@ namespace XHWK.WKTool
         /// </param>
         private void RbnIsOutsideSchool_Checked(object sender, RoutedEventArgs e)
         {
-            APP.IsOutsideSchool = true;
+            App.IsOutsideSchool = true;
             FileToolsCommon.SetConfigValue("IsOutsideSchool", "1");
-            if (APP.ServiceAddress != null)
+            if (App.ServiceAddress != null)
             {
-                APP.SwitchAddress();
+                App.SwitchAddress();
             }
         }
 
@@ -339,11 +337,11 @@ namespace XHWK.WKTool
         /// </param>
         private void RbnSchool_Checked(object sender, RoutedEventArgs e)
         {
-            APP.IsOutsideSchool = false;
+            App.IsOutsideSchool = false;
             FileToolsCommon.SetConfigValue("IsOutsideSchool", "0");
-            if (APP.ServiceAddress != null)
+            if (App.ServiceAddress != null)
             {
-                APP.SwitchAddress();
+                App.SwitchAddress();
             }
         }
 
@@ -351,4 +349,4 @@ namespace XHWK.WKTool
 
         #endregion 服务地址
     }
-}
+}

XHWK.WKTool/MinToolbar.xaml.cs

@@ -6,7 +6,7 @@ namespace XHWK.WKTool
     /// <summary>
     /// 最小化工具栏
     /// </summary>
-    public partial class MinToolbar : Window
+    public partial class MinToolbar
     {
         /// <summary>
         /// 屏幕宽
@@ -24,43 +24,26 @@ namespace XHWK.WKTool
             Topmost = true;
 
         }
+
         /// <summary>
         /// 初始化隐藏工具栏位置颜色
         /// </summary>
         /// <param name="top"></param>
-        /// <param name="ColorType"></param>
-        public void Initialize(double top,double ThisHeight)
+        /// <param name="thisHeight"></param>
+        public void Initialize(double top, double thisHeight)
         {
             var desktopWorkingArea = System.Windows.SystemParameters.WorkArea;
             Left = desktopWorkingArea.Right - this.Width + 7;
             Top = top;
+            // ReSharper disable once PossibleNullReferenceException
             BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FF638AFF"));
-            Height = ThisHeight;
-            //if (ColorType == 0)//Blue
-            //{
-            //    BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#3f6fff"));
-            //}
-            //else if (ColorType == 1)//Black
-            //{
-            //    BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#364044"));
-            //}
-            //else
-            //{
-            //    BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#3f6fff"));
-            //}
-            // + 330;
-            //Console.WriteLine(this.Top + "min");
+            Height = thisHeight;
         }
 
         private void buttonMin_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
         {
             this.Hide();
-            APP.W_ScreenRecordingToolbarWindow.MaxToobar();
-        }
-
-        private void buttonMin_MouseEnter_1(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-
+            App.W_ScreenRecordingToolbarWindow.MaxToobar();
         }
     }
 }

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -273,13 +273,13 @@ namespace XHWK.WKTool
 
         private void blackboard_canvas_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
-            if (APP.W_ScreenRecordingToolbarWindow.flg == 10)
+            if (App.W_ScreenRecordingToolbarWindow.flg == 10)
             {
-                APP.W_ScreenRecordingToolbarWindow.flg = 0;
+                App.W_ScreenRecordingToolbarWindow.flg = 0;
             }
             else
             {
-                APP.W_ScreenRecordingToolbarWindow.flg = 1;
+                App.W_ScreenRecordingToolbarWindow.flg = 1;
             }
 
             ReturnPractice();
@@ -296,13 +296,13 @@ namespace XHWK.WKTool
             blackboard_canvas.Strokes.Clear();
             new Thread(() =>
             {
-                Dispatcher.Invoke(() => { APP.W_ScreenRecordingToolbarWindow.ModifyState(); });
+                Dispatcher.Invoke(() => { App.W_ScreenRecordingToolbarWindow.ModifyState(); });
                 _flg = 0;
                 Thread.Sleep(500);
                 Dispatcher.Invoke(() =>
                 {
                     Owner = null;
-                    APP.W_PracticeWindow.Hide();
+                    App.W_PracticeWindow.Hide();
                 });
             }).Start();
         }
@@ -356,13 +356,13 @@ namespace XHWK.WKTool
         /// </summary>
         public void InitTqlpPen()
         {
-            if (APP.TQLPenevents == null)
+            if (App.TQLPenevents == null)
             {
-                APP.TQLPenevents = new PenEvents(2);
+                App.TQLPenevents = new PenEvents(2);
             }
             else
             {
-                APP.TQLPenevents.InToType = 2;
+                App.TQLPenevents.InToType = 2;
             }
         }
 
@@ -372,7 +372,7 @@ namespace XHWK.WKTool
         public void TqlDown()
         {
             _isTqlPenDown = true;
-            APP.W_ScreenRecordingToolbarWindow.PenPractice();
+            App.W_ScreenRecordingToolbarWindow.PenPractice();
             if (_strokes != null && _strokes.StylusPoints.Count > 1)
             {
                 _isFirst = true;
@@ -485,4 +485,4 @@ namespace XHWK.WKTool
 
         #endregion 腾千里手写笔
     }
-}
+}

XHWK.WKTool/ProductVerification.xaml.cs

@@ -28,7 +28,7 @@ namespace XHWK.WKTool
             InitializeComponent();
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
             Topmost = true;
-            APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationDecryptServering, InvokeActivationDecryptServerCompate);
+            App.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationDecryptServering, InvokeActivationDecryptServerCompate);
         }
         /// <summary>
         /// 激活信息--验证签名是否过期-调用
@@ -36,7 +36,7 @@ namespace XHWK.WKTool
         /// <returns></returns>
         private object InvokeActivationDecryptServering()
         {
-            return APP.ServerMsg;
+            return App.ServerMsg;
         }
 
         /// <summary>
@@ -48,20 +48,20 @@ namespace XHWK.WKTool
             //解析
             try
             {
-                APP.Signature = System.IO.File.ReadAllText(APP.DataPath + "signature.txt", Encoding.Default);
-                string decrypt = DataProvider.TripleDESDecrypt(APP.Signature, APP.secretKey);
+                App.Signature = System.IO.File.ReadAllText(App.DataPath + "signature.txt", Encoding.Default);
+                string decrypt = DataProvider.TripleDESDecrypt(App.Signature, App.secretKey);
                 decrypt = decrypt.Replace("\u0001", "").Replace("\u0007", "").Trim();
                 Model_Signatures msgBean = JsonHelper.JsonToObj<Model_Signatures>(decrypt);
                 long currentTimeTimestamp = DataProvider.TimestampTotalSeconds(); //当前时间 时间戳
                 if (msgBean.endtime > currentTimeTimestamp)//条件成立  解析成功 code 在有效期内
                 {
-                    if (File.Exists(APP.DataPath + "signatureTime.txt"))
+                    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 signatureTime = System.IO.File.ReadAllText(App.DataPath + "signatureTime.txt", Encoding.Default);
+                        string currentTime = DateTime.Now.ToLongDateString().ToString(); //当前时间  
                         if (signatureTime != currentTime)
                         {
-                            APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering, InvokeActivationAddHistoryServerCompate);
+                            App.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering, InvokeActivationAddHistoryServerCompate);
                         }
                     }
                     Dispatcher.Invoke(new Action(() =>
@@ -109,7 +109,7 @@ namespace XHWK.WKTool
         private object InvokeActivationAddHistoryServering()
         {
             serverReturnCode = registerController.ActivationAddHistory();
-            return APP.ServerMsg;
+            return App.ServerMsg;
         }
 
         /// <summary>
@@ -118,11 +118,11 @@ namespace XHWK.WKTool
         /// <returns></returns>
         public void InvokeActivationAddHistoryServerCompate(object obj)
         {
-            if (!Directory.Exists(APP.DataPath))
+            if (!Directory.Exists(App.DataPath))
             {
-                Directory.CreateDirectory(APP.DataPath);
+                Directory.CreateDirectory(App.DataPath);
             }
-            string ApplicationData = APP.DataPath + "signatureTime.txt";
+            string ApplicationData = App.DataPath + "signatureTime.txt";
             string currentTime = DateTime.Now.ToLongDateString().ToString();//当前时间
             System.IO.File.WriteAllText(ApplicationData, currentTime, Encoding.Default);//存放签名验证日期
         }

XHWK.WKTool/Skin/SkinConfig.cs

@@ -36,10 +36,10 @@ namespace XHWK.WKTool.Skin
             int Index = 0;
             try
             {
-                Index = int.Parse(APP.SkinStyle);
+                Index = int.Parse(App.SkinStyle);
             }
-            catch (Exception) {}
-            ChangeSkinResource(SkinList[int.Parse(APP.SkinStyle)]);
+            catch (Exception) { }
+            ChangeSkinResource(SkinList[int.Parse(App.SkinStyle)]);
         }
 
         /// <summary>
@@ -50,11 +50,9 @@ namespace XHWK.WKTool.Skin
         {
             if (Index < SkinList.Count)
             {
-                APP.SkinStyle = Index.ToString();
-
-                FileToolsCommon.SetConfigValue("SkinStyle", APP.SkinStyle);
-                ChangeSkinResource(SkinList[int.Parse(APP.SkinStyle)]);
-
+                App.SkinStyle = Index.ToString();
+                FileToolsCommon.SetConfigValue("SkinStyle", App.SkinStyle);
+                ChangeSkinResource(SkinList[int.Parse(App.SkinStyle)]);
             }
 
         }

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -60,9 +60,9 @@ namespace XHWK.WKTool.UControl
         public Uc_VideoItem(Model_Video model_Video)
         {
             InitializeComponent();
-            APP.IsUpLoad = false;
+            App.IsUpLoad = false;
             VideoModel = model_Video;
-            DataContext = APP.PageContextData;
+            DataContext = App.PageContextData;
             if (FileToolsCommon.IsExistFile(VideoModel.ThumbnailPath))
             {
                 ImgVideo.Source = ImageHelper.ReadBitmapImageFile(VideoModel.ThumbnailPath);// new BitmapImage(new Uri(VideoModel.ThumbnailPath));
@@ -169,12 +169,11 @@ namespace XHWK.WKTool.UControl
         private bool ModifyPathName(string FileGuid, string NewName, out string Errmessage)
         {
             Errmessage = "";
-            foreach (Model_WKData WKData in APP.WKDataList)
+            foreach (Model_WKData WKData in App.WKDataList)
             {
                 if (WKData.VideoList.Exists(x => x.FileGuid == FileGuid))
                 {
                     Model_Video model_Video = WKData.VideoList.Find(x => x.FileGuid == FileGuid);
-
                     string filePathName = model_Video.VideoPath;
                     string filePath = FileToolsCommon.GetDirectoryName(filePathName);
                     string newFilePathName = filePath + NewName;
@@ -197,7 +196,7 @@ namespace XHWK.WKTool.UControl
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
                         FileToolsCommon.Copy(model_Video.ThumbnailPath, ThumbnailPathName);
                         model_Video.ThumbnailPath = ThumbnailPathName;
-                        APP.SaveWkData();
+                        App.SaveWkData();
                         return true;
                     }
                 }
@@ -224,7 +223,7 @@ namespace XHWK.WKTool.UControl
             MessageBoxResult dr = MessageWindow.Show("确定删除该视频？", "提示", MessageBoxButton.OKCancel);
             if (dr == MessageBoxResult.OK)
             {
-                foreach (Model_WKData wKData in APP.WKDataList)
+                foreach (Model_WKData wKData in App.WKDataList)
                 {
                     if (wKData.VideoList == null)
                     {
@@ -311,42 +310,46 @@ namespace XHWK.WKTool.UControl
         /// <param name="e"></param>
         private void BtnUpload_Click(object sender, RoutedEventArgs e)
         {
-            if (APP.IsLoginType == false)
+            if (App.IsLoginType == false)
             {
                 //登录
                 Click_UploadLogin();
-                if (APP.IsLoginType == false)
+                if (App.IsLoginType == false)
                 {
                     return;
                 }
             }
-            if (!APP.IsUpLoad)
+            if (!App.IsUpLoad)
             {
-                APP.IsUpLoad = true;
+                App.IsUpLoad = true;
                 //BtnUpload.IsEnabled = false;
                 //BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
                 //BtnUpload.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#999999"));
                 DalUpload dAL_Upload = new DalUpload();
-
                 if (dAL_Upload.UploadVideo(VideoModel.FileGuid, out string ErrMessage))
                 {
-                    APP.IsUpLoad = false;
+                    App.IsUpLoad = false;
                     //MessageWindow.Show("视频上传服务器成功！");
                     if (W_UploadWindow == null)
                     {
-                        W_UploadWindow = new UploadWindow
-                        {
-                            Owner = APP.W_XHMicroLessonSystemWindow
-                        };
-                        W_UploadWindow.ChangeTextEvents += frm_ChangeTextEvents; ;
+                        W_UploadWindow = new UploadWindow { Owner = App.W_XHMicroLessonSystemWindow };
+                        W_UploadWindow.ChangeTextEvents += frm_ChangeTextEvents;
+                        ;
                     }
 
                     //long size = Convert.ToInt64(FileToolsCommon.GetFileSizeByMB(pageData.menuList[i].FilePath));
-                    W_UploadWindow.Initialize(TbName.Text, VideoModel.VideoSizebyte, VideoModel.VideoType.ToString(), VideoModel.FileGuid, 0);
+                    W_UploadWindow.Initialize
+                    (
+                        TbName.Text,
+                        VideoModel.VideoSizebyte,
+                        VideoModel.VideoType.ToString(),
+                        VideoModel.FileGuid,
+                        0
+                    );
                 }
                 else
                 {
-                    APP.IsUpLoad = false;
+                    App.IsUpLoad = false;
                     MessageWindow.Show(ErrMessage);
                 }
             }
@@ -374,14 +377,14 @@ namespace XHWK.WKTool.UControl
         /// <param name="e"></param>
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            if (APP.W_VideoClipWindow == null)
+            if (App.W_VideoClipWindow == null)
             {
-                APP.W_VideoClipWindow = new VideoClipWindow();
+                App.W_VideoClipWindow = new VideoClipWindow();
             }
-            if (APP.W_VideoClipWindow.InitClipVideo(VideoModel.VideoPath))
+            if (App.W_VideoClipWindow.InitClipVideo(VideoModel.VideoPath))
             {
-                APP.W_VideoClipWindow.ShowDialog();
+                App.W_VideoClipWindow.ShowDialog();
             }
         }
     }
-}
+}

XHWK.WKTool/UploadWindow.xaml.cs

@@ -88,33 +88,35 @@ namespace XHWK.WKTool
             int code = xhapi.TsubjectbookList();
             if (code == 0)
             {
-                for (int i = 0; i < APP.TsubjectbookList.Count; i++)
+                for (int i = 0; i < App.TsubjectbookList.Count; i++)
                 {
-                    pageData.bookList.Add(new ComboBoxBean()
-                    {
-                        Key = APP.TsubjectbookList[i].Lsbid,
-                        //Value = $"{APP.TsubjectbookList[i].Subjectname}  {APP.TsubjectbookList[i].Bookname}"
-                        Value = $"{APP.TsubjectbookList[i].Subjectname}  {APP.TsubjectbookList[i].Versionname}  {APP.TsubjectbookList[i].Lsbname}"
-                    });
+                    pageData.bookList.Add
+                    (
+                        new ComboBoxBean()
+                        {
+                            Key = App.TsubjectbookList[i].Lsbid,
+                            //Value = $"{APP.TsubjectbookList[i].Subjectname}  {APP.TsubjectbookList[i].Bookname}"
+                            Value = $"{App.TsubjectbookList[i].Subjectname}  {App.TsubjectbookList[i].Versionname}  {App.TsubjectbookList[i].Lsbname}"
+                        }
+                    );
                 }
                 book_list.SelectedIndex = 0;
                 DataContext = pageData;
-
-                if (APP.TsubjectbookList.Count > 0)
+                if (App.TsubjectbookList.Count > 0)
                 {
                     Director();
                     ShowDialog();
                 }
                 else
                 {
-                    APP.IsUpLoad = false;
+                    App.IsUpLoad = false;
                     Hide();
                     MessageWindow.Show("暂无章节！");
                 }
             }
             else
             {
-                MessageWindow.Show(APP.ServerMsg);
+                MessageWindow.Show(App.ServerMsg);
             }
         }
 
@@ -128,34 +130,45 @@ namespace XHWK.WKTool
             {
                 selectIndex = 0;
             }
-            if (APP.TsubjectbookList.Count > selectIndex)
+            if (App.TsubjectbookList.Count > selectIndex)
             {
-                int code = xhapi.DirectorList(APP.TsubjectbookList[selectIndex].Lsbid, 4, APP.UserInfo.Userid);
+                int code = xhapi.DirectorList
+                (
+                    App.TsubjectbookList[selectIndex].Lsbid,
+                    4,
+                    App.UserInfo.Userid
+                );
                 if (code == 0)
                 {
                     pageData.zhangjieList.Clear();
-                    pageData.zhangjieList.Add(new ComboBoxBean()
-                    {
-                        Key = "0",
-                        Value = "全部",
-                        leaf = 1
-                    });
-                    for (int i = 0; i < APP.DirectorList.Count; i++)
-                    {
-                        Model_DirectorList item = APP.DirectorList[i];
-                        pageData.zhangjieList.Add(new ComboBoxBean()
+                    pageData.zhangjieList.Add
+                    (
+                        new ComboBoxBean()
                         {
-                            Key = item.directorid,
-                            Value = item.directorname,
-                            leaf = item.leaf
-                        });
+                            Key = "0",
+                            Value = "全部",
+                            leaf = 1
+                        }
+                    );
+                    for (int i = 0; i < App.DirectorList.Count; i++)
+                    {
+                        Model_DirectorList item = App.DirectorList[i];
+                        pageData.zhangjieList.Add
+                        (
+                            new ComboBoxBean()
+                            {
+                                Key = item.directorid,
+                                Value = item.directorname,
+                                leaf = item.leaf
+                            }
+                        );
                         addChild(item);
                     }
                     cmbTeachingMaterial.SelectedIndex = 0;
                 }
                 else
                 {
-                    MessageWindow.Show(APP.ServerMsg);
+                    MessageWindow.Show(App.ServerMsg);
                 }
             }
         }
@@ -220,21 +233,21 @@ namespace XHWK.WKTool
         /// </param>
         private void toolbar_list_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (APP.TsubjectbookList.Count > 0)
+            if (App.TsubjectbookList.Count > 0)
             {
                 Director();
             }
             else
             {
                 MessageWindow.Show("暂无章节！");
-                APP.IsUpLoad = false;
+                App.IsUpLoad = false;
                 Hide();
             }
         }
 
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
-            APP.IsUpLoad = false;
+            App.IsUpLoad = false;
             Hide();
         }
 
@@ -307,22 +320,22 @@ namespace XHWK.WKTool
                         model_ResourceAdd = new Model_ResourceAdd
                         {
                             converted = 0,
-                            createid = APP.UserInfo.Userid,
+                            createid = App.UserInfo.Userid,
                             directorid = cmbTeachingMaterial.SelectedValue.ToString(),
-                            duration = APP.ResourceAddTwo.duration,
-                            subjectid = APP.TsubjectbookList[book_list.SelectedIndex].Subjectid,
+                            duration = App.ResourceAddTwo.duration,
+                            subjectid = App.TsubjectbookList[book_list.SelectedIndex].Subjectid,
                             imgUrl = "",
                             level = 2,
                             lsbid = book_list.SelectedValue.ToString(),
-                            mp4code = APP.ResourceAddTwo.mp4code,
+                            mp4code = App.ResourceAddTwo.mp4code,
                             resourcebelong = 3,
                             resourceclass = 5,
-                            resourcecover = APP.ResourceAddTwo.coverpath,
+                            resourcecover = App.ResourceAddTwo.coverpath,
                             resourcename = Resourcename,
                             resourcesize = Resourcesize,
                             resourcetype = 10,
-                            resourceurl = APP.ResourceAddTwo.videopath,
-                            schoolid = APP.UserInfo.Schoolid
+                            resourceurl = App.ResourceAddTwo.videopath,
+                            schoolid = App.UserInfo.Schoolid
                         };
                     });
 
@@ -346,13 +359,12 @@ namespace XHWK.WKTool
                     {
                         Dispatcher.Invoke(() =>
                         {
-                            foreach (Model_WKData Vdata in APP.WKDataList)
+                            foreach (Model_WKData Vdata in App.WKDataList)
                             {
                                 if (Vdata.VideoList == null)
                                 {
                                     continue;
                                 }
-
                                 foreach (Model_Video videoinfo in Vdata.VideoList)
                                 {
                                     if (videoinfo.FileGuid == Guid)
@@ -385,7 +397,7 @@ namespace XHWK.WKTool
                             cmbTeachingMaterial.IsEnabled = true;
                             times.Stop();
                             tip_outer.Visibility = Visibility.Collapsed;
-                            MessageWindow.Show(APP.ServerMsg);
+                            MessageWindow.Show(App.ServerMsg);
                         });
                     }
                 }
@@ -412,7 +424,7 @@ namespace XHWK.WKTool
                     times.Stop();
                     tip_outer.Visibility = Visibility.Collapsed;
                     MessageWindow.Show("无法上传视频，请检查与服务器链接状态！");
-                    APP.IsUpLoad = false;
+                    App.IsUpLoad = false;
                     Hide();
                     LogHelper.WriteErrLog("【UploadWindow】(BtnStart_Click)" + ex.Message, ex);
                 });
@@ -459,4 +471,4 @@ namespace XHWK.WKTool
             zhangjieList = new ObservableCollection<ComboBoxBean>();
         }
     }
-}
+}

XHWK.WKTool/Utils/ImageOperationUtil.cs

@@ -105,18 +105,17 @@ namespace XHWK.WKTool.Utils
             {
                 System.Windows.Point point = e.GetPosition(imgCanvas);
                 imgCanvas.Margin = new Thickness(imgCanvas.Margin.Left + (point.X - initialPoint.X), imgCanvas.Margin.Top + (point.Y - initialPoint.Y), 0, 0);
-                APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
+                App.PageDrawList[App.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
                 {
                     X = imgCanvas.Margin.Left,
                     Y = imgCanvas.Margin.Top
                 };
-                APP.PageDrawList[APP.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
+                App.PageDrawList[App.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
                 {
                     CenterX = imgCanvas.ActualWidth,
                     CenterY = imgCanvas.ActualHeight
                 };
-
-                APP.PageDrawList[APP.PageContextData.currpage - 1].IsImageLocation = false;
+                App.PageDrawList[App.PageContextData.currpage - 1].IsImageLocation = false;
             }
         }
 
@@ -369,17 +368,17 @@ namespace XHWK.WKTool.Utils
                         default:
                             break;
                     }
-                    APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
+                    App.PageDrawList[App.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
                     {
                         X = imgCanvas.Margin.Left,
                         Y = imgCanvas.Margin.Top
                     };
-                    APP.PageDrawList[APP.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
+                    App.PageDrawList[App.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
                     {
                         CenterX = imgCanvas.ActualWidth,
                         CenterY = imgCanvas.ActualHeight
                     };
-                    APP.PageDrawList[APP.PageContextData.currpage - 1].IsImageLocation = false;
+                    App.PageDrawList[App.PageContextData.currpage - 1].IsImageLocation = false;
                 }
             }
             catch (Exception)
@@ -422,4 +421,4 @@ namespace XHWK.WKTool.Utils
 
         #endregion 图片拉伸移动
     }
-}
+}

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

@@ -89,18 +89,18 @@ namespace XHWK.WKTool
             {
                 if (bConnected)
                 {
-                    APP.TQLPenStatus = true;
+                    App.TQLPenStatus = true;
                     //form.AddLog("智能笔已连接！");
-                    if (APP.W_XHMicroLessonSystemWindow != null)
-                        APP.W_XHMicroLessonSystemWindow.UpdateDevStatus();
+                    if (App.W_XHMicroLessonSystemWindow != null)
+                        App.W_XHMicroLessonSystemWindow.UpdateDevStatus();
                 }
                 else
                 {
-                    APP.TQLPenStatus = false;
+                    App.TQLPenStatus = false;
                     //form.DisConnect();
                     //form.AddLog("智能笔已断开连接！");
-                    if (APP.W_XHMicroLessonSystemWindow != null)
-                        APP.W_XHMicroLessonSystemWindow.UpdateDevStatus();
+                    if (App.W_XHMicroLessonSystemWindow != null)
+                        App.W_XHMicroLessonSystemWindow.UpdateDevStatus();
                 }
             }
             catch (Exception)
@@ -331,17 +331,17 @@ namespace XHWK.WKTool
                 }
                 else if (dot.type == DotType.PEN_DOWN)
                 {
-                    APP.W_XHMicroLessonSystemWindow.TqlDown();
+                    App.W_XHMicroLessonSystemWindow.TqlDown();
                 }
                 else if (dot.type == DotType.PEN_UP)
                 {
-                    APP.W_XHMicroLessonSystemWindow.TqlUp();
+                    App.W_XHMicroLessonSystemWindow.TqlUp();
                 }
                 else if (dot.type == DotType.PEN_MOVE)
                 {
                     double CX = (double)dot.x + (double)dot.fx / 100.00;
                     double CY = (double)dot.y + (double)dot.fy / 100.00;
-                    APP.W_XHMicroLessonSystemWindow.TqlPenWrite
+                    App.W_XHMicroLessonSystemWindow.TqlPenWrite
                     (
                         CX,
                         CY,
@@ -359,17 +359,17 @@ namespace XHWK.WKTool
                 }
                 else if (dot.type == DotType.PEN_DOWN)
                 {
-                    APP.W_PracticeWindow.TqlDown();
+                    App.W_PracticeWindow.TqlDown();
                 }
                 else if (dot.type == DotType.PEN_UP)
                 {
-                    APP.W_PracticeWindow.TqlUp();
+                    App.W_PracticeWindow.TqlUp();
                 }
                 else if (dot.type == DotType.PEN_MOVE)
                 {
                     double CX = (double)dot.x + (double)dot.fx / 100.00;
                     double CY = (double)dot.y + (double)dot.fy / 100.00;
-                    APP.W_PracticeWindow.TqlPenWrite
+                    App.W_PracticeWindow.TqlPenWrite
                     (
                         CX,
                         CY,

XHWK.WKTool/Utils/pen/luobo/LuoBoPenUtil.cs

@@ -80,7 +80,7 @@ namespace XHWK.WKTool.Utils.luobo
 
         private void luobo_searchModeEvt(int modeType)
         {
-            if (APP.IsOutputInfoLog)
+            if (App.IsOutputInfoLog)
             {
                 if (modeType == 1)
                 {
@@ -184,7 +184,7 @@ namespace XHWK.WKTool.Utils.luobo
         {
             if (modeType == 1)
             {
-                if (APP.IsOutputInfoLog)
+                if (App.IsOutputInfoLog)
                 {
                     LogHelper.WriteInfoLog("当前为笔模式");
                 }
@@ -195,7 +195,7 @@ namespace XHWK.WKTool.Utils.luobo
             }
             else
             {
-                if (APP.IsOutputInfoLog)
+                if (App.IsOutputInfoLog)
                 {
                     LogHelper.WriteInfoLog("当前为鼠标模式");
                 }
@@ -239,12 +239,20 @@ namespace XHWK.WKTool.Utils.luobo
         private void luobo_deviceChangeEvt(bool bStatus, ushort uPid)
         {
             //throw new NotImplementedException();
-            Console.WriteLine("luobo_deviceChangeEvt");
+            Console.WriteLine(@"luobo_deviceChangeEvt");
             try
             {
-                if (APP.IsOutputInfoLog)
+                if (App.IsOutputInfoLog)
                 {
-                    LogHelper.WriteInfoLog(string.Format("设备状态{0} PID = {1}", bStatus, uPid));
+                    LogHelper.WriteInfoLog
+                    (
+                        string.Format
+                        (
+                            "设备状态{0} PID = {1}",
+                            bStatus,
+                            uPid
+                        )
+                    );
                 }
             }
             catch (Exception)
@@ -287,7 +295,7 @@ namespace XHWK.WKTool.Utils.luobo
             usbIsConnected = false;
             Thread.Sleep(200);
             int nDeviceCount = robotpenController.GetInstance()._GetDeviceCount();
-            if (APP.IsOutputInfoLog)
+            if (App.IsOutputInfoLog)
             {
                 LogHelper.WriteInfoLog(string.Format("当前有 {0} 个设备", nDeviceCount));
             }
@@ -316,8 +324,7 @@ namespace XHWK.WKTool.Utils.luobo
                             }
 
                             robotpenController.GetInstance()._Send(cmdId.GetConfig);
-
-                            APP.BoardStatus = true;
+                            App.BoardStatus = true;
                             try
                             {
                                 int banWidth = robotpenController.GetInstance().getWidth();
@@ -335,10 +342,17 @@ namespace XHWK.WKTool.Utils.luobo
                                         m_nDeviceH = banWidth;
                                     }
                                 }
-
-                                if (APP.IsOutputInfoLog)
+                                if (App.IsOutputInfoLog)
                                 {
-                                    LogHelper.WriteInfoLog(string.Format("手写板宽度为：{0} 高度为：{1}", m_nDeviceW, m_nDeviceH));
+                                    LogHelper.WriteInfoLog
+                                    (
+                                        string.Format
+                                        (
+                                            "手写板宽度为：{0} 高度为：{1}",
+                                            m_nDeviceW,
+                                            m_nDeviceH
+                                        )
+                                    );
                                 }
                             }
                             catch (Exception ex)
@@ -346,7 +360,7 @@ namespace XHWK.WKTool.Utils.luobo
                                 LogHelper.WriteErrLog("手写板大小获取失败：" + ex.Message, ex);
                             }
                             UpdateDevStatus();
-                            if (APP.IsOutputInfoLog)
+                            if (App.IsOutputInfoLog)
                             {
                                 LogHelper.WriteInfoLog(string.Format("设备类型：{0}", deviceType.ToString()));
                             }
@@ -363,7 +377,7 @@ namespace XHWK.WKTool.Utils.luobo
             }
             else
             {
-                APP.BoardStatus = false;
+                App.BoardStatus = false;
                 UpdateDevStatus();
             }
         }
@@ -467,4 +481,4 @@ namespace XHWK.WKTool.Utils.luobo
 
         #endregion 罗博智慧笔
     }
-}
+}

XHWK.WKTool/VideoClipWindow.xaml.cs

@@ -24,8 +24,8 @@ namespace XHWK.WKTool
         public VideoClipWindow()
         {
             InitializeComponent();
-            Width = APP.W_XHMicroLessonSystemWindow.ActualWidth;
-            Height = APP.W_XHMicroLessonSystemWindow.ActualHeight;
+            Width = App.W_XHMicroLessonSystemWindow.ActualWidth;
+            Height = App.W_XHMicroLessonSystemWindow.ActualHeight;
         }
         public bool InitClipVideo(string _videoPath)
         {
@@ -46,7 +46,7 @@ namespace XHWK.WKTool
                     QS_Movie.Height = GridMovie.ActualWidth * Prop;
                     QS_Movie.Width = GridMovie.ActualWidth;
                 }
-                DataContext = APP.PageContextData;
+                DataContext = App.PageContextData;
             }
             else
             {
@@ -241,7 +241,13 @@ namespace XHWK.WKTool
                 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, filePath);
+                App.FFmpeg.ClipVideo
+                (
+                    VideoPath,
+                    startTime,
+                    EndTime,
+                    filePath
+                );
                 MessageBoxResult br = MessageWindow.Show("剪辑完成是否打开文件夹？", "剪辑", MessageBoxButton.OKCancel);
                 if (br == MessageBoxResult.OK)
                 {

XHWK.WKTool/Welcome.xaml.cs

@@ -14,8 +14,7 @@ namespace XHWK.WKTool
 
             //new DeviceWindow().Show();
             //Close();
-
-            if (!File.Exists(APP.DataPath + "signature.txt"))//上次登录时间为空 或者签名为空 或者上次登录时间不是今天   都需要输入密匙验证 ，否则只验证本地的签名
+            if (!File.Exists(App.DataPath + "signature.txt")) //上次登录时间为空 或者签名为空 或者上次登录时间不是今天   都需要输入密匙验证 ，否则只验证本地的签名
             {
                 new KeyVerification().Show();
                 Close();
@@ -27,4 +26,4 @@ namespace XHWK.WKTool
             }
         }
     }
-}
+}

XHWK.WKTool/XHWK.WKTool.csproj.user

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