代码优化

XHWK.WKTool/DAL/DalUpload.cs

@@ -135,7 +135,7 @@ namespace XHWK.WKTool.DAL
         /// </returns>
         public bool UploadVideo(string videoGuid, out string errMessage)
         {
-            errMessage = "";
+            errMessage = "上传视频失败";
             try
             {
                 ModelVideo videoInfo = null;

XHWK.WKTool/MainWindow.xaml

@@ -1500,11 +1500,12 @@
                         <Label
                             x:Name="LblVideoMess"
                             Grid.Row="0"
-                            Margin="0,0,0,100"
+                            Margin="0,0,0,0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Content="暂无微课录制信息，请录制并等待保存完成后重试！"
+                            Content="暂无微课录制"
                             FontSize="20"
+                            Foreground="#999"
                             Visibility="Hidden" />
                         <Button
                             x:Name="BtnVideoUpPage"

XHWK.WKTool/MainWindow.xaml.cs

@@ -15,7 +15,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -351,14 +350,7 @@ namespace XHWK.WKTool
             if (App.IsLoginType)
             {
                 string headpicPath = FileToolsCommon.GetFileAbsolutePath("/Data/" + App.UserInfo.Username + ".png");
-                if (FileToolsCommon.IsExistFile(headpicPath))
-                {
-                    ImgHead.ImageSource = new BitmapImage(new Uri(headpicPath));
-                }
-                else
-                {
-                    ImgHead.ImageSource = new BitmapImage(new Uri("pack://application:,,,/BlackImages/HM_HeadImg.png"));
-                }
+                ImgHead.ImageSource = FileToolsCommon.IsExistFile(headpicPath) ? new BitmapImage(new Uri(headpicPath)) : new BitmapImage(new Uri("pack://application:,,,/BlackImages/HM_HeadImg.png"));
                 TxbLoginType.Text = App.UserInfo.Username;
                 ImgHeadImgN.Visibility = Visibility.Collapsed;
                 ImgHeadImg.Visibility = Visibility.Visible;
@@ -1968,9 +1960,8 @@ namespace XHWK.WKTool
                 }
                 else if (!string.IsNullOrEmpty(childName))
                 {
-                    FrameworkElement frameworkElement = child as FrameworkElement;
                     // 如果控件名称符合参数条件
-                    if (frameworkElement != null && frameworkElement.Name == childName)
+                    if (child is FrameworkElement frameworkElement && frameworkElement.Name == childName)
                     {
                         list.Add((T)child);
                     }
@@ -2857,14 +2848,7 @@ namespace XHWK.WKTool
                     () =>
                     {
                         _srTime = _srTime.AddMilliseconds(200);
-                        if (_srTime.Hour > 0)
-                        {
-                            TxbTime.Text = _srTime.ToString("HH:mm:ss");
-                        }
-                        else
-                        {
-                            TxbTime.Text = _srTime.ToString("mm:ss");
-                        }
+                        TxbTime.Text = _srTime.ToString(_srTime.Hour > 0 ? "HH:mm:ss" : "mm:ss");
                     }
                 );
                 ThreadPool.QueueUserWorkItem(
@@ -3495,14 +3479,7 @@ namespace XHWK.WKTool
         {
             _wit = wit;
             _hei = hei;
-            if (!string.IsNullOrWhiteSpace(imgPath))
-            {
-                ImgPri.Source = new BitmapImage(new Uri(imgPath));
-            }
-            else
-            {
-                ImgPri.Source = null;
-            }
+            ImgPri.Source = !string.IsNullOrWhiteSpace(imgPath) ? new BitmapImage(new Uri(imgPath)) : null;
             GridPrintMask.Visibility = Visibility.Collapsed;
         }
 
@@ -3626,7 +3603,6 @@ namespace XHWK.WKTool
                     // ignored
                 }
                 _document.Open();
-                iTextSharp.text.Image image;
                 for (int i = 0; i < App.PageDrawList.Count; i++)
                 {
                     long ii = Timestamp();
@@ -3645,7 +3621,7 @@ namespace XHWK.WKTool
                         filePathOutPut,
                         rectangleFs
                     );
-                    image = iTextSharp.text.Image.GetInstance(filePathOutPut);
+                    iTextSharp.text.Image image = iTextSharp.text.Image.GetInstance(filePathOutPut);
                     if (string.IsNullOrEmpty(App.PageDrawList[i].PageImagePath)) //没有图片
                     { }
                     else if (App.PageDrawList[i].ImgDocumentation && !App.PageDrawList[i].Type.Equals("ppt"))
@@ -3678,14 +3654,7 @@ namespace XHWK.WKTool
                             filePathOutPut,
                             rectangleF
                         );
-                        if (isImg)
-                        {
-                            image = iTextSharp.text.Image.GetInstance(filePathOutPut);
-                        }
-                        else
-                        {
-                            image = iTextSharp.text.Image.GetInstance(App.PageDrawList[i].PageImagePath);
-                        }
+                        image = iTextSharp.text.Image.GetInstance(isImg ? filePathOutPut : App.PageDrawList[i].PageImagePath);
                     }
                     if (image.Height > iTextSharp.text.PageSize.A4.Height)
                     {
@@ -3732,10 +3701,10 @@ namespace XHWK.WKTool
                     try
                     {
                         // 腾千里会根据原PDF的页数生成多个PDF文件
-                        for (int i = 0; i < strs.Count(); i++)
+                        for (int i = 0; i < strs.Length; i++)
                         {
                             _timesPrint.Stop();
-                            _printMsg = "正在打印第" + (i + 1) + "/" + strs.Count() + "页中";
+                            _printMsg = "正在打印第" + (i + 1) + "/" + strs.Length + "页中";
                             _msgnum = 0;
                             _num = 0;
                             _timesPrint.Interval = 100;