Merge remote-tracking branch 'origin/zyy' into zhangxueyang

# Conflicts:
#	XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

Common/system/ImageHelper.cs

@@ -104,6 +104,7 @@ namespace Common.system
         }
 
         #endregion 获取RGB
+
         #region 截图统一方法
         /// <summary>
         /// 截图通用方法 创建人：赵耀 创建时间：2020年8月11日

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -24,12 +24,12 @@ namespace XHWK.WKTool
         /// 计时器
         /// </summary>
         System.Timers.Timer timer;
-        int ImgNum = 3;
+        int ImgNum = 9;
         public void Initialize(int changeTime=650)
         {
-            timer.Interval = changeTime;
+            timer.Interval = changeTime/3;
             timer.Enabled = true; //启动计时器
-            ImgNum = 3;
+            ImgNum = 9;
         }
 
         private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
@@ -42,10 +42,13 @@ namespace XHWK.WKTool
             else
             {
                 timer.Enabled = false;
-                Dispatcher.Invoke(() =>
-                {
-                    Hide();
-                });
+                Dispatcher.Invoke(
+                  DispatcherPriority.Send,
+                  new Action(() =>
+                  {
+                      imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_3.png"));
+                      Hide();
+                  }));
             }
         }
         /// <summary>
@@ -60,21 +63,63 @@ namespace XHWK.WKTool
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => { 
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_1.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_1.png"));
                       }));
                     break;
                 case 2:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_2.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_2.png"));
                       }));
                     break;
                 case 3:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_3.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_3.png"));
+                      }));
+                    break;
+                case 4:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_1.png"));
+                      }));
+                    break;
+                case 5:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_2.png"));
+                      }));
+                    break;
+                case 6:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_3.png"));
+                      }));
+                    break;
+                case 7:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
+                      }));
+                    break;
+                case 8:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_2.png"));
+                      }));
+                    break;
+                case 9:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_3.png"));
                       }));
                     break;
                 default:

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -92,24 +92,26 @@ namespace XHWK.WKTool
             FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Text);
             APP.WKData.WkName = txbExplainName.Text;
             APP.WKData.WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            //判断微课是否存在，存在则询问
-            if (APP.WKDataList != null&& APP.WKDataList.Count>0)
-            {
-                if (APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
-                {
-                    MessageBoxResult dr = System.Windows.MessageBox.Show("此微课已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
-                    if (dr == MessageBoxResult.OK)
-                    {
-                        FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
-                        FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-                        APP.WKDataList.RemoveAll(x => x.WkName == APP.WKData.WkName);
-                    }
-                    else
-                    {
-                        return;
-                    }
-                }
-            }
+            #region 微课不允许有多个视频 废弃
+            ////判断微课是否存在，存在则询问
+            //if (APP.WKDataList != null&& APP.WKDataList.Count>0)
+            //{
+            //    if (APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
+            //    {
+            //        MessageBoxResult dr = System.Windows.MessageBox.Show("此微课已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
+            //        if (dr == MessageBoxResult.OK)
+            //        {
+            //            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
+            //            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+            //            APP.WKDataList.RemoveAll(x => x.WkName == APP.WKData.WkName);
+            //        }
+            //        else
+            //        {
+            //            return;
+            //        }
+            //    }
+            //}
+            #endregion
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -1,5 +1,7 @@
 using Common.system;
+
 using Org.BouncyCastle.Asn1.Crmf;
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -8,6 +10,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+
 using XHWK.Model;
 using XHWK.WKTool.DAL;
 
@@ -21,7 +24,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 视频模型
         /// </summary>
-        List<Model_Video> model_VideoList =null;
+        List<Model_Video> model_VideoList = null;
         /// <summary>
         /// 数据列表
         /// </summary>
@@ -41,7 +44,7 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
             Initialize();
-        } 
+        }
         /// <summary>
         /// 初始化
         /// </summary>
@@ -71,7 +74,7 @@ namespace XHWK.WKTool
                 //videoinfo.VidePath;
 
                 string colour = "#FFFFFF";
-                if (isColour==true)
+                if (isColour == true)
                 {
                     colour = "#FFFFFF";
                     isColour = false;
@@ -83,10 +86,10 @@ namespace XHWK.WKTool
                 }
                 string vis = "Visible";
                 string cos = "Collapsed";
-                if(!videoinfo.IsUpload)
+                if (!videoinfo.IsUpload)
                 {
-                    vis= "Collapsed";
-                    cos= "Visible";
+                    vis = "Collapsed";
+                    cos = "Visible";
                 }
                 pageData.menuList.Add(new FileDirectoryModel()
                 {
@@ -104,7 +107,7 @@ namespace XHWK.WKTool
                     Coll = cos,
                     FileGuid = videoinfo.FileGuid,
                     VideoType = videoinfo.VideoType.ToString()
-                }); ; 
+                }); ;
                 i++;
             }
             txbSum.Text = pageData.menuList.Count.ToString();
@@ -124,15 +127,15 @@ namespace XHWK.WKTool
                         continue;
                     foreach (Model_Video videoinfo in Vdata.VideoList)
                     {
-                        if (!string.IsNullOrWhiteSpace(videoinfo.VideoPath))
+                        if (string.IsNullOrWhiteSpace(videoinfo.VideoPath))
                         {
-                            if (string.IsNullOrWhiteSpace(videoinfo.VideoSize) || videoinfo.VideoSize == "0 MB")
-                            {
-                                videoinfo.VideoSize = FileToolsCommon.GetFileSizeByMB(videoinfo.VideoPath).ToString() + " MB";
-                            }
-
-                            model_VideoList.Add(videoinfo);
+                            continue;
+                        }
+                        if (string.IsNullOrWhiteSpace(videoinfo.VideoSize) || videoinfo.VideoSize == "0 MB")
+                        {
+                            videoinfo.VideoSize = FileToolsCommon.GetFileSizeByMB(videoinfo.VideoPath).ToString() + " MB";
                         }
+                        model_VideoList.Add(videoinfo);
                     }
                 }
             }
@@ -164,7 +167,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void BtnUpload_Click(object sender, RoutedEventArgs e) 
+        private void BtnUpload_Click(object sender, RoutedEventArgs e)
         {
             pageData.menuList[Subscript].IsEnabled = false;
             List<Button> buttons = FindChilds<Button>(listView1, "btnUpload");
@@ -187,7 +190,7 @@ namespace XHWK.WKTool
                     {
                         MessageBox.Show(ErrMessage);
                     }
-                    
+
 
                 }
             }
@@ -209,7 +212,7 @@ namespace XHWK.WKTool
                     {
                         if (wKData.VideoList == null)
                             continue;
-                        if(wKData.VideoList.Exists(x=>x.FileGuid==pageData.menuList[i].FileGuid))
+                        if (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[i].FileGuid))
                         {
                             try
                             {
@@ -221,7 +224,7 @@ namespace XHWK.WKTool
                             }
                             catch (Exception ex)
                             {
-                                MessageBox.Show("无法删除视频！"+ex.Message);
+                                MessageBox.Show("无法删除视频！" + ex.Message);
                                 return;
                             }
                         }
@@ -312,11 +315,10 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnModify_Click(object sender, RoutedEventArgs e)
         {
-            if(IsModify)
+            if (IsModify)
             {
                 pageData.menuList[Subscript].IsEnabled = false;
             }
-
             List<Button> buttons = FindChilds<Button>(listView1, "btnModify");
             for (int i = 0; i < buttons.Count; i++)
             {
@@ -336,20 +338,19 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
         {
-            //if(IsModify)
+            //if (IsModify)
             //{
-            //    if(MouseNumber>0&& pageData.menuList.Count> Subscript)
+            //    if (MouseNumber > 0 && pageData.menuList.Count > Subscript)
             //    {
             //        pageData.menuList[Subscript].IsEnabled = false;
             //        try
             //        {
-            //            if(!pageData.menuList[Subscript].Name.Equals(pageData.menuList[Subscript].VideoName))
+            //            if (!pageData.menuList[Subscript].Name.Equals(pageData.menuList[Subscript].VideoName))
             //            {
-
             //                string tempPath = pageData.menuList[Subscript].VideoName + pageData.menuList[Subscript].VideoType;
             //                tempPath = pageData.menuList[Subscript].Path.Replace(tempPath, "").Trim();
             //                tempPath = tempPath + pageData.menuList[Subscript].Name;
-            //                FileToolsCommon.MoveDirectory(pageData.menuList[Subscript].Path, tempPath,out string Message);
+            //                FileToolsCommon.MoveDirectory(pageData.menuList[Subscript].Path, tempPath, out string Message);
             //            }
             //        }
             //        catch (Exception ex)
@@ -364,58 +365,68 @@ namespace XHWK.WKTool
 
         private void Window_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
-            //if (IsModify)
-            //{
-            //    if (MouseNumber > 2 && pageData.menuList.Count > Subscript)
+            //    if (IsModify)
             //    {
-            //        pageData.menuList[Subscript].IsEnabled = false;
-            //        try
+            //        if (MouseNumber > 0 && pageData.menuList.Count > Subscript)
             //        {
-            //            if (!pageData.menuList[Subscript].Name.Equals(pageData.menuList[Subscript].VideoName))
+            //        MouseNumber = 0;
+            //            pageData.menuList[Subscript].IsEnabled = false;
+            //            try
             //            {
-            //                MouseNumber = 0;
-            //                string tempPath = pageData.menuList[Subscript].FilePath + pageData.menuList[Subscript].VideoName+"."+ pageData.menuList[Subscript].VideoType;
-            //                if(FileToolsCommon.IsExistFile(tempPath))
+            //                if (!pageData.menuList[Subscript].Name.Equals(pageData.menuList[Subscript].VideoName))
             //                {
-            //                    MessageBox.Show("文件名已存在！");
-            //                    return;
-            //                }
-            //                foreach (Model_WKData wKData in APP.WKDataList)
-            //                {
-            //                    if (wKData.VideoList == null)
-            //                        continue;
-            //                    if (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[Subscript].FileGuid))
+            //                    MouseNumber = 0;
+            //                    string tempPath = pageData.menuList[Subscript].FilePath + pageData.menuList[Subscript].VideoName + "." + pageData.menuList[Subscript].VideoType;
+            //                    if (FileToolsCommon.IsExistFile(tempPath))
             //                    {
-            //                        try
-            //                        {
-            //                            //FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid).VideoPath);
-            //                            //FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid).ThumbnailPath);
-            //                            //wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid));
-            //                            //Initialize();
-            //                            //return;
-            //                        }
-            //                        catch (Exception ex)
+            //                        MessageBox.Show("文件名已存在！");
+            //                        return;
+            //                    }
+            //                    foreach (Model_WKData wKData in APP.WKDataList)
+            //                    {
+            //                        if (wKData.VideoList == null)
+            //                            continue;
+            //                        if (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[Subscript].FileGuid))
             //                        {
-            //                            MessageBox.Show("无法删除视频！" + ex.Message);
-            //                            return;
+            //                            try
+            //                            {
+            //                                //FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid).VideoPath);
+            //                                //FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid).ThumbnailPath);
+            //                                //wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid));
+            //                                //Initialize();
+            //                                //return;
+            //                            }
+            //                            catch (Exception ex)
+            //                            {
+            //                                MessageBox.Show("无法删除视频！" + ex.Message);
+            //                                return;
+            //                            }
             //                        }
             //                    }
+            //                    FileToolsCommon.Copy(pageData.menuList[Subscript].Path, tempPath);
             //                }
-
-
-            //                FileToolsCommon.Copy(pageData.menuList[Subscript].Path, tempPath); 
+            //            }
+            //            catch (Exception ex)
+            //            {
+            //                MessageBox.Show("无法修改视频名称！" + ex.Message);
+            //                return;
             //            }
             //        }
-            //        catch (Exception ex)
-            //        {
-            //            MessageBox.Show("无法修改视频名称！" + ex.Message);
-            //            return;
-            //        }
+            //        MouseNumber++;
             //    }
-            //    MouseNumber++;
-            //}
         }
     }
+
+    ///// <summary>
+    ///// 修改文件名
+    ///// </summary>
+    ///// <param name="Guid">唯一编号</param>
+    ///// <param name="NewName">文件名带后缀 不带路径</param>
+    ///// <returns></returns>
+    //bool ModifyPathName(string Guid,string NewName)
+    //{
+
+    //}
     public class FileDirectoryData : NotifyModel
     {
         public ObservableCollection<FileDirectoryModel> menuList { get; set; }
@@ -432,7 +443,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 序号
         /// </summary>
-        public int SerialNumber 
+        public int SerialNumber
         {
             get => _serialNumber;
             set
@@ -493,7 +504,7 @@ namespace XHWK.WKTool
                 OnPropertyChanged("VideoTime");
             }
         }
-        private string _colour; 
+        private string _colour;
         /// <summary>
         /// 颜色
         /// </summary>
@@ -549,7 +560,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 唯一编号
         /// </summary>
-        public string FileGuid { get; set; } 
+        public string FileGuid { get; set; }
         /// <summary>
         /// 视频类型
         /// </summary>

XHWK.WKTool/LoginWindow.xaml.cs

@@ -107,27 +107,29 @@ namespace XHWK.WKTool
                 //读取微课数据
                 APP.ReadWkData();
                 APP.ReadDrawData();
-                APP.WKData.WkPath += APP.UserInfo.Username + "/";
-                //判断微课是否存在，存在则询问
-                if (APP.WKDataList != null)
-                {
-                    if(APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
-                    {
-                        MessageBoxResult dr = System.Windows.MessageBox.Show("此微课已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
-                        if (dr == MessageBoxResult.OK)
-                        {
-                            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
-                            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-                            APP.WKDataList.RemoveAll(x => x.WkName == APP.WKData.WkName);
-                        }
-                        else
-                        {
-                            APP.W_CreateAMicroLessonWindow.Owner = this;
-                            //APP.W_CreateAMicroLessonWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-                            APP.W_CreateAMicroLessonWindow.ShowDialog();
-                        }
-                    }
-                }
+                #region 登陆后 根据用户名设置微课路径 废弃
+                //APP.WKData.WkPath += APP.UserInfo.Username + "/";
+                ////判断微课是否存在，存在则询问
+                //if (APP.WKDataList != null)
+                //{
+                //    if(APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
+                //    {
+                //        MessageBoxResult dr = System.Windows.MessageBox.Show("此微课已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
+                //        if (dr == MessageBoxResult.OK)
+                //        {
+                //            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
+                //            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+                //            APP.WKDataList.RemoveAll(x => x.WkName == APP.WKData.WkName);
+                //        }
+                //        else
+                //        {
+                //            APP.W_CreateAMicroLessonWindow.Owner = this;
+                //            //APP.W_CreateAMicroLessonWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                //            APP.W_CreateAMicroLessonWindow.ShowDialog();
+                //        }
+                //    }
+                //}
+                #endregion
                 this.Hide();
             }
             else

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -20,10 +20,6 @@ namespace XHWK.WKTool
     {
         #region 初始变量
         /// <summary>
-        /// 视频存储路径
-        /// </summary>
-        string RecordingPath;
-        /// <summary>
         /// 视频保存名称
         /// </summary>
         string VideoSavePathName;
@@ -158,7 +154,23 @@ namespace XHWK.WKTool
         {
             _state = State.End;
         }
-        #region 录制
+        #region 录屏
+        /// <summary>
+        /// 设置录屏文件地址
+        /// </summary>
+        void SetUpVideoPathName()
+        {
+            //FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
+            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
+            VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+            int num = 1;
+            while(FileToolsCommon.IsExistFile(VideoSavePathName))
+            {
+                VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_"+ num + "." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+                num++;
+            }
+        }
         /// <summary>
         /// 开始或暂停录制
         /// </summary>
@@ -174,10 +186,7 @@ namespace XHWK.WKTool
                     VideoInfo = new Model_Video();
                     VideoInfo.VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"));
                     VideoInfo.WkType = Enum_WKVidetype.RecordingScreen;
-                    RecordingPath = APP.WKData.WkPath;
-                    //FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
-                    FileToolsCommon.CreateDirectory(RecordingPath);
-                    VideoSavePathName = RecordingPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+                    SetUpVideoPathName();
                     IsFirstRS = false;
                 }
                 IsSuspend = false;

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -263,27 +263,29 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnScreenRecording_Click(object sender, RoutedEventArgs e)
         {
-            string RecordScreenPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
-            if (FileToolsCommon.IsExistFile(RecordScreenPathName))
-            {
-                MessageBoxResult dr = System.Windows.MessageBox.Show("已存在录屏，是否覆盖？", "提示", MessageBoxButton.OKCancel);
-                if (dr == MessageBoxResult.OK)
-                {
-                    try
-                    {
-                        FileToolsCommon.DeleteFile(RecordScreenPathName);
-                        APP.VideoList.RemoveAll(x => x.VideoPath == RecordScreenPathName);
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteErrLog("【录屏】（BtnRecordingScreen_Click）无法移除视频，" + ex.Message, ex);
-                    }
-                }
-                else
-                {
-                    return;
-                }
-            }
+            #region 限制只允许录制一个录屏  废弃
+            //string RecordScreenPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+            //if (FileToolsCommon.IsExistFile(RecordScreenPathName))
+            //{
+            //    MessageBoxResult dr = System.Windows.MessageBox.Show("已存在录屏，是否覆盖？", "提示", MessageBoxButton.OKCancel);
+            //    if (dr == MessageBoxResult.OK)
+            //    {
+            //        try
+            //        {
+            //            FileToolsCommon.DeleteFile(RecordScreenPathName);
+            //            APP.VideoList.RemoveAll(x => x.VideoPath == RecordScreenPathName);
+            //        }
+            //        catch (Exception ex)
+            //        {
+            //            LogHelper.WriteErrLog("【录屏】（BtnRecordingScreen_Click）无法移除视频，" + ex.Message, ex);
+            //        }
+            //    }
+            //    else
+            //    {
+            //        return;
+            //    }
+            //}
+            #endregion   
             if (APP.W_ScreenRecordingToolbarWindow == null)
             {
                 APP.W_ScreenRecordingToolbarWindow = new ScreenRecordingToolbarWindow
@@ -304,7 +306,7 @@ namespace XHWK.WKTool
             APP.W_ScreenRecordingToolbarWindow.Topmost = true;
             APP.W_ScreenRecordingToolbarWindow.Show();
             Hide();
-            TxbRecordScreenWord.Text = "已录屏";
+            TxbRecordScreenWord.Text = "录屏";
         }
         /// <summary>
         /// 上传事件
@@ -373,7 +375,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnSave_Click(object sender, RoutedEventArgs e)
         {
-            //#region 合法性判断
+            #region 合法性判断
             //if (string.IsNullOrWhiteSpace(txbStoragePath.Text.Trim()))
             //{
             //    System.Windows.MessageBox.Show("路径不可为空！");
@@ -399,8 +401,7 @@ namespace XHWK.WKTool
             //    //创建文件夹
             //    FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
             //}
-            //#endregion
-
+            #endregion
 
             if (rbnMP4.IsChecked == true)
             {
@@ -982,7 +983,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 视频保存路径
         /// </summary>
-        string RecordingPath;
+        //string RecordingPath;
         /// <summary>
         /// 图片保存路径
         /// </summary>
@@ -1019,7 +1020,6 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnRecord_Click(object sender, RoutedEventArgs e)
         {
-
             blackboard_canvas.Visibility = Visibility.Visible;
             StartRecord();
         }
@@ -1034,6 +1034,13 @@ namespace XHWK.WKTool
             EndRecord();
         }
         System.Timers.Timer timer;
+
+        /// <summary>
+        /// 设置录屏文件地址
+        /// </summary>
+        void SetUpVideoPathName()
+        {
+        }
         /// <summary>
         /// 开始录制和暂停录制
         /// </summary>
@@ -1046,37 +1053,45 @@ namespace XHWK.WKTool
                     VideoInfo = new Model_Video();
                     VideoInfo.VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"));
                     VideoInfo.WkType = Enum_WKVidetype.RecordingLessons;
-                    RecordingPath = APP.WKData.WkPath;
+
                     ImgPath = APP.WKData.WkPath + "temp/Image/";
                     AudioPathName = APP.WKData.WkPath + "temp/audio/";
                     FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
-                    FileToolsCommon.CreateDirectory(RecordingPath);
+                    FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
                     FileToolsCommon.CreateDirectory(ImgPath);
                     FileToolsCommon.CreateDirectory(AudioPathName);
                     AudioPathName += APP.WKData.WkName + ".MP3";
-                    VideoSavePathName = RecordingPath + APP.WKData.WkName + "_录制." + VideoInfo.VideoType.ToString();
-
-                    if (FileToolsCommon.IsExistFile(VideoSavePathName))
+                    VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制." + VideoInfo.VideoType.ToString();
+                    int num = 1;
+                    while (FileToolsCommon.IsExistFile(VideoSavePathName))
                     {
-                        MessageBoxResult dr = System.Windows.MessageBox.Show("课程已录制，是否覆盖？", "提示", MessageBoxButton.OKCancel);
-                        if (dr == MessageBoxResult.OK)
-                        {
-                            try
-                            {
-                                FileToolsCommon.DeleteFile(VideoSavePathName);
-                                APP.VideoList.RemoveAll(x => x.VideoPath == VideoSavePathName);
-                            }
-                            catch (Exception ex)
-                            {
-                                LogHelper.WriteErrLog("【录制】（StartRecord）无法移除视频，" + ex.Message, ex);
-                            }
-                        }
-                        else
-                        {
-                            return;
-                        }
+                        VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制_" + num + "." + VideoInfo.VideoType.ToString();
+                        num++;
                     }
 
+                    #region 设置录屏唯一  废弃
+                    //if (FileToolsCommon.IsExistFile(VideoSavePathName))
+                    //{
+                    //    MessageBoxResult dr = System.Windows.MessageBox.Show("课程已录制，是否覆盖？", "提示", MessageBoxButton.OKCancel);
+                    //    if (dr == MessageBoxResult.OK)
+                    //    {
+                    //        try
+                    //        {
+                    //            FileToolsCommon.DeleteFile(VideoSavePathName);
+                    //            APP.VideoList.RemoveAll(x => x.VideoPath == VideoSavePathName);
+                    //        }
+                    //        catch (Exception ex)
+                    //        {
+                    //            LogHelper.WriteErrLog("【录制】（StartRecord）无法移除视频，" + ex.Message, ex);
+                    //        }
+                    //    }
+                    //    else
+                    //    {
+                    //        return;
+                    //    }
+                    //}
+                    #endregion
+
                     #region 禁用按钮
                     ImgPrint.Visibility = Visibility.Collapsed;//录制中不可打印
                     ImgPrintTwo.Visibility = Visibility.Visible;
@@ -1406,7 +1421,6 @@ namespace XHWK.WKTool
 
             //}
         }
-        /// <summary>
         /// 上一页
         /// </summary>
         /// <param name="sender"></param>

XHWK.WKTool/XHWK.WKTool.csproj

@@ -1298,18 +1298,6 @@
     <Resource Include="Images\microLessonSystem_8.png" />
     <Resource Include="Images\microLessonSystem_9.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\countdown.gif" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\countdown_2.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\countdown_3.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\countdown_1.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\Toobar0.png" />
     <Resource Include="Images\Toobar1.png" />
@@ -1497,5 +1485,16 @@
   <ItemGroup>
     <Resource Include="256.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\countdown1_1.png" />
+    <Resource Include="Images\countdown1_2.png" />
+    <Resource Include="Images\countdown1_3.png" />
+    <Resource Include="Images\countdown2_1.png" />
+    <Resource Include="Images\countdown2_2.png" />
+    <Resource Include="Images\countdown2_3.png" />
+    <Resource Include="Images\countdown3_1.png" />
+    <Resource Include="Images\countdown3_2.png" />
+    <Resource Include="Images\countdown3_3.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>