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

XHWK.Model/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.1.3.0")]
+[assembly: AssemblyFileVersion("1.1.3.0")]

XHWK.WKTool/App.config

@@ -4,7 +4,7 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
   <appSettings>
-    <add key="IsDebug" value="1"/>
+    <add key="IsDebug" value="0"/>
     <!--图片压缩等级-->
     <add key="ImageCompressionLevel" value="30" />
     <!--文件存放路径  路径\账户名\讲解名称_x.MP4-->
@@ -32,7 +32,7 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1"/>
     <!--版本号-->
-    <add key="VersionCode" value="12"/>
-    <add key="VersionName" value="1.1.1"/>
+    <add key="VersionCode" value="14"/>
+    <add key="VersionName" value="1.1.3"/>
   </appSettings>
 </configuration>

XHWK.WKTool/UploadWindow.xaml.cs

@@ -8,6 +8,7 @@ using System.Windows.Input;
 
 using XHWK.Model;
 using XHWK.WKTool.DAL;
+using static XHWK.WKTool.XHMicroLessonSystemWindow;
 
 namespace XHWK.WKTool
 {
@@ -40,6 +41,12 @@ namespace XHWK.WKTool
         /// 唯一编号
         /// </summary>
         private string Guid = string.Empty;
+        //定义事件
+        public event ChangeTextHandlers ChangeTextEvents;
+        /// <summary>
+        /// 当前视频的下标
+        /// </summary>
+       private int i = 0;
         public UploadWindow()
         {
             InitializeComponent();
@@ -47,8 +54,9 @@ namespace XHWK.WKTool
         /// <summary>
         /// 初始化
         /// </summary>
-        public void Initialize(string _resourcename, long _resourcesize, string _suffix, string _guid)
+        public void Initialize(string _resourcename, long _resourcesize, string _suffix, string _guid,int _i)
         {
+            i = _i;
             Resourcename = _resourcename;
             Resourcesize = _resourcesize;
             Suffix = _suffix;
@@ -247,6 +255,7 @@ namespace XHWK.WKTool
                     if (code == 0)
                     {
                         MessageWindow.Show("视频上传成功！");
+                        ChangeTextEvents("上传成功",i);
                         Hide();
                     }
                     else

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -52,6 +52,8 @@ namespace XHWK.WKTool
         public event ChangeTextHandler ChangeTextEvent;
         //定义委托
         public delegate void ChangeTextHandler(string text);
+        //定义委托
+        public delegate void ChangeTextHandlers(string text, int i); 
 
         /// <summary>
         /// 图片
@@ -113,6 +115,7 @@ namespace XHWK.WKTool
         public XHMicroLessonSystemWindow()
         {
             new Aspose.Pdf.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
+            new Aspose.Slides.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
             InitializeComponent();
             double proportion = 1036.0 / 1290.0;
             Width = (PrimaryScreen.ScaleWorkingAreaSize.Height) / proportion - (BorderThickness.Left + BorderThickness.Right);
@@ -459,86 +462,95 @@ namespace XHWK.WKTool
         {
             if (!TxbRecordingWord.Text.Equals("暂停"))
             {
-                GridMain.Visibility = Visibility.Collapsed;
-                gridSetUp.Visibility = Visibility.Visible;
-                gridUpload.Visibility = Visibility.Collapsed;
-                txbStoragePath.Content = APP.WKData.WkPath;
-                //ImgRecord.Visibility = Visibility.Collapsed;//设置时不可录制
-                //ImgRecordTwo.Visibility = Visibility.Visible;//设置时不可录制
-                //BtnRecord.IsEnabled = false;//设置时不可录制
-
-
-
-                #region 读取用户配置
-                //接口地址
-                if (!File.Exists(APP.dataPath + "interfaceAddress.txt")) //若为空
-                {
-                    txbInterfaceAddress.Text = APP.apiUrl.Replace("http://", "").Trim();
-                }
-                else
+                if(gridSetUp.Visibility==Visibility.Collapsed)
                 {
-                    txbInterfaceAddress.Text = System.IO.File.ReadAllText(APP.dataPath + "interfaceAddress.txt", Encoding.Default).Replace("http://", "").Trim();
-                }
-                //上传地址
-                if (!File.Exists(APP.dataPath + "imageUploadAddress.txt")) //若为空
-                {
-                    txbImageUploadAddress.Text = APP.uploadUrl.Replace("http://", "").Replace("/", "").Trim();
-                }
-                else
-                {
-                    txbImageUploadAddress.Text = System.IO.File.ReadAllText(APP.dataPath + "imageUploadAddress.txt", Encoding.Default).Replace("http://", "").Replace("/", "").Trim();
-                }
-                //下载地址
-                if (!File.Exists(APP.dataPath + "pictureShowsAddress.txt")) //若为空
-                {
-                    txbPictureShowsAddress.Text = APP.showImageUrl.Replace("http://", "").Replace("/", "").Replace("static", "").Trim();
-                }
-                else
-                {
-                    txbPictureShowsAddress.Text = System.IO.File.ReadAllText(APP.dataPath + "pictureShowsAddress.txt", Encoding.Default).Replace("http://", "").Replace("/", "").Replace("static", "").Trim();
-                }
-           
+                    GridMain.Visibility = Visibility.Collapsed;
+                    gridSetUp.Visibility = Visibility.Visible;
+                    gridUpload.Visibility = Visibility.Collapsed;
+                    txbStoragePath.Content = APP.WKData.WkPath;
+
+                    #region 读取用户配置
+                    //接口地址
+                    if (!File.Exists(APP.dataPath + "interfaceAddress.txt")) //若为空
+                    {
+                        txbInterfaceAddress.Text = APP.apiUrl.Replace("http://", "").Trim();
+                    }
+                    else
+                    {
+                        txbInterfaceAddress.Text = System.IO.File.ReadAllText(APP.dataPath + "interfaceAddress.txt", Encoding.Default).Replace("http://", "").Trim();
+                    }
+                    //上传地址
+                    if (!File.Exists(APP.dataPath + "imageUploadAddress.txt")) //若为空
+                    {
+                        txbImageUploadAddress.Text = APP.uploadUrl.Replace("http://", "").Replace("/", "").Trim();
+                    }
+                    else
+                    {
+                        txbImageUploadAddress.Text = System.IO.File.ReadAllText(APP.dataPath + "imageUploadAddress.txt", Encoding.Default).Replace("http://", "").Replace("/", "").Trim();
+                    }
+                    //下载地址
+                    if (!File.Exists(APP.dataPath + "pictureShowsAddress.txt")) //若为空
+                    {
+                        txbPictureShowsAddress.Text = APP.showImageUrl.Replace("http://", "").Replace("/", "").Replace("static", "").Trim();
+                    }
+                    else
+                    {
+                        txbPictureShowsAddress.Text = System.IO.File.ReadAllText(APP.dataPath + "pictureShowsAddress.txt", Encoding.Default).Replace("http://", "").Replace("/", "").Replace("static", "").Trim();
+                    }
 
-                ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
-                if ("1".Equals(APP.CameraPosition))
-                {
-                    rbnRight.IsChecked = true;
-                }
-                else if ("2".Equals(APP.CameraPosition))
-                {
-                    rbnLeft.IsChecked = true;
-                }
-                else if ("3".Equals(APP.CameraPosition))
-                {
-                    rbnRightUnder.IsChecked = true;
-                }
-                else if ("4".Equals(APP.CameraPosition))
-                {
-                    rbnLeftUnder.IsChecked = true;
-                }
-                string type = FileToolsCommon.GetConfigValue("VideoType");//<!--视频格式 1、MP4 2、FlV 3、AVI-->
-                if ("1".Equals(type))
-                {
-                    rbnMP4.IsChecked = true;
-                }
-                else if ("2".Equals(type))
-                {
-                    rbnFLV.IsChecked = true;
-                }
-                else if ("3".Equals(type))
-                {
-                    rbnAVI.IsChecked = true;
-                }
-                string isSound = FileToolsCommon.GetConfigValue("IsSound");//<!--声音 true 有 false 无-->
-                if (isSound == "true")
-                {
-                    rbnY.IsChecked = true;
+
+                    ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
+                    if ("1".Equals(APP.CameraPosition))
+                    {
+                        rbnRight.IsChecked = true;
+                    }
+                    else if ("2".Equals(APP.CameraPosition))
+                    {
+                        rbnLeft.IsChecked = true;
+                    }
+                    else if ("3".Equals(APP.CameraPosition))
+                    {
+                        rbnRightUnder.IsChecked = true;
+                    }
+                    else if ("4".Equals(APP.CameraPosition))
+                    {
+                        rbnLeftUnder.IsChecked = true;
+                    }
+                    string type = FileToolsCommon.GetConfigValue("VideoType");//<!--视频格式 1、MP4 2、FlV 3、AVI-->
+                    if ("1".Equals(type))
+                    {
+                        rbnMP4.IsChecked = true;
+                    }
+                    else if ("2".Equals(type))
+                    {
+                        rbnFLV.IsChecked = true;
+                    }
+                    else if ("3".Equals(type))
+                    {
+                        rbnAVI.IsChecked = true;
+                    }
+                    string isSound = FileToolsCommon.GetConfigValue("IsSound");//<!--声音 true 有 false 无-->
+                    if (isSound == "true")
+                    {
+                        rbnY.IsChecked = true;
+                    }
+                    else
+                    {
+                        rbnN.IsChecked = true;
+                    }
+                    #endregion
                 }
                 else
                 {
-                    rbnN.IsChecked = true;
+                    GridMain.Visibility = Visibility.Visible;
+                    gridSetUp.Visibility = Visibility.Collapsed;
+                    gridUpload.Visibility = Visibility.Collapsed;
+                    if (APP.pageData.pagenum > 0)
+                    {
+                        gridPage.Visibility = Visibility.Visible;
+                    }
+                    DataContext = APP.pageData;
                 }
-                #endregion
             }
         }
         /// <summary>
@@ -548,34 +560,6 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnSave_Click(object sender, RoutedEventArgs e)
         {
-            #region 合法性判断
-            //if (string.IsNullOrWhiteSpace(txbStoragePath.Text.Trim()))
-            //{
-            //    MessageWindow.Show("路径不可为空！");
-            //    return;
-            //}
-            //string temp = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + APP.WKData.WkName.Trim() + "/";
-            //if (!APP.WKData.WkPath.Equals(temp))
-            //{
-            //    APP.WKData.WkPath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + APP.WKData.WkName.Trim() + "/";
-            //    if (FileToolsCommon.IsExistDirectory(APP.WKData.WkPath))
-            //    {
-            //        //微课已存在
-            //        MessageBoxResult dr = MessageWindow.Show("讲解已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
-            //        if (dr == MessageBoxResult.OK)
-            //        {
-            //            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
-            //        }
-            //        else
-            //        {
-            //            return;
-            //        }
-            //    }
-            //    //创建文件夹
-            //    FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-            //}
-            #endregion
-
             ImgRecord.Visibility = Visibility.Visible;//设置结束时可录制
             ImgRecordTwo.Visibility = Visibility.Collapsed;//设置结束时可录制
             BtnRecord.IsEnabled = true;//设置结束时可录制
@@ -985,7 +969,7 @@ namespace XHWK.WKTool
                 ofd = new System.Windows.Forms.OpenFileDialog
                 {
                     //Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
-                    Filter = "文档|*.docx;*.doc;*.pptx",
+                    Filter = "文档|*.docx;*.doc;*.ppt;*.pptx;*.pdf",
                     InitialDirectory = desktopPath,
                     Multiselect = false,
                     AddExtension = true,
@@ -1027,13 +1011,15 @@ namespace XHWK.WKTool
                     #region PPT转PDF
                     string filepath = ofd.FileName;
                     string path = ofd.SafeFileName.Replace(".ppt", "").Replace(".pptx", "").Trim();
-                    string type = ofd.SafeFileName.Replace(".ppt", "typezsygppt").Replace(".pptx", "typezsygppt").Trim();
+                    string type = ofd.SafeFileName.Replace(".ppt", "typezsygppt").Replace(".pptx", "typezsygppt").Replace(".pdf", "typepdf").Trim();
                     if (type.Contains("typezsygppt"))//ppt
                     {
                         try
                         {
                             string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
                             path = pathTemp + path + ".pdf";
+                            FileToolsCommon.CreateDirectory(pathTemp);
+
                             //PPT转PDF
                             Presentation ppt = new Presentation(filepath);
                             ppt.Save(path, Aspose.Slides.Export.SaveFormat.Pdf);
@@ -1135,6 +1121,98 @@ namespace XHWK.WKTool
                             LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
                         }
                     }
+                    else if(type.Contains("typepdf"))
+                    {
+                        string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                        #region PDF转图片
+                        // 图片绝对路径集合
+                        List<string> images = new List<string>();
+                        string directoryPath = pathTemp;
+                        //aspose许可证
+                        //Aspose.Pdf.License l = new Aspose.Pdf.License();
+                        //string licenseName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Aspose.Total.Product.Family.lic");
+                        //l.SetLicense(licenseName);
+                        //定义Jpeg转换设备
+                        Aspose.Pdf.Document document = new Aspose.Pdf.Document(filepath);
+                        Aspose.Pdf.Devices.JpegDevice device = new Aspose.Pdf.Devices.JpegDevice();
+                        //int quality = int.Parse(this.comboBox1.SelectedItem.ToString());
+                        //directoryPath += quality;
+                        Directory.CreateDirectory(directoryPath);
+                        //默认质量为100，设置质量的好坏与处理速度不成正比，甚至是设置的质量越低反而花的时间越长，怀疑处理过程是先生成高质量的再压缩
+                        device = new Aspose.Pdf.Devices.JpegDevice(100);
+                        //遍历每一页转为jpg
+                        for (int i = 1; i <= document.Pages.Count; i++)
+                        {
+                            long ii = Timestamp();
+                            string filePathOutPut = Path.Combine(directoryPath, string.Format("{0}{1}.jpg", ii, i));
+                            images.Add(filePathOutPut);
+                            FileStream fs = new FileStream(filePathOutPut, FileMode.OpenOrCreate);
+                            try
+                            {
+                                device.Process(document.Pages[i], fs);
+                                fs.Close();
+                            }
+                            catch (Exception)
+                            {
+                                fs.Close();
+                                File.Delete(filePathOutPut);
+                            }
+                        }
+                        #endregion
+                        string[] page = images.ToArray();
+                        int num = 0;
+                        for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
+                        {
+                            if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
+                            {
+                                APP.PageDrawList[i].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
+                                APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
+                                APP.PageDrawList[i].PageNum = i + 1;
+                                APP.PageDrawList[i].ImgDocumentation = true;
+                            }
+                            else
+                            {
+
+                                Model_DrawData model_DrawData = new Model_DrawData
+                                {
+                                    PageImagePath = page[i - APP.pageData.pagenum],
+                                    PdfImagePath = page[i - APP.pageData.pagenum],
+                                    PageNum = i + 1,
+                                    ImgDocumentation = true
+                                };
+                                APP.PageDrawList.Add(model_DrawData);
+                            }
+                            ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
+                            ImgPrintTwo.Visibility = Visibility.Collapsed;
+                            btnPrint.IsEnabled = true;
+                            APP.SaveDraw();
+                            num++;
+                        }
+                        if (num > 0)
+                        {
+                            APP.pageData.currpage = APP.pageData.pagenum + 1;
+                            APP.pageData.pagenum += num;
+                            gridPage.Visibility = Visibility.Visible;//页码大于0 显示
+                        }
+                        if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
+                        {
+                            imgCanvas.Source = null;
+                            ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                            ImgScreenshotTwo.Visibility = Visibility.Visible;
+                            btnScreenshot.IsEnabled = false;
+                            imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                        }
+                        else
+                        {
+                            imgDocumentation.Source = null;
+                            imgCanvas.Source = null;
+                            ///截图可用
+                            ImgScreenshot.Visibility = Visibility.Visible;
+                            ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                            btnScreenshot.IsEnabled = true;
+                        }
+                        APP.myloading.Hide();
+                    }
                     else//word
                     {
                         try
@@ -1405,6 +1483,8 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【加载视频列表】（LoadingVideoList）" + ex.Message, ex);
             }
         }
+        //定义事件
+        public event ChangeTextHandler ChangeTextEvents;
         /// <summary>
         /// 上传
         /// </summary>
@@ -1422,10 +1502,7 @@ namespace XHWK.WKTool
 
                     if (dAL_Upload.UploadVideo(pageData.menuList[i].FileGuid, out string ErrMessage))
                     {
-                        pageData.menuList[i].Visi = "Visible";
-                        pageData.menuList[i].Coll = "Collapsed";
-
-                        DataContext = pageData;
+                      
                         //MessageWindow.Show("视频上传服务器成功！");
                         if (APP.W_UploadWindow == null)
                         {
@@ -1433,13 +1510,12 @@ namespace XHWK.WKTool
                             {
                                 Owner = this
                             };
+                            APP.W_UploadWindow.ChangeTextEvents += new ChangeTextHandlers(frm_ChangeTextEvents);
                         }
                       
                         //long size = Convert.ToInt64(FileToolsCommon.GetFileSizeByMB(pageData.menuList[i].FilePath));
-                        APP.W_UploadWindow.Initialize(pageData.menuList[i].VideoName, pageData.menuList[i].VideoSizes, pageData.menuList[i].VideoType, pageData.menuList[i].FileGuid);
+                        APP.W_UploadWindow.Initialize(pageData.menuList[i].VideoName, pageData.menuList[i].VideoSizes, pageData.menuList[i].VideoType, pageData.menuList[i].FileGuid,i);
                         APP.W_UploadWindow.ShowDialog();
-                    
-
                     }
                     else
                     {
@@ -1449,6 +1525,20 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
+        /// 上传返回事件
+        /// </summary>
+        /// <param name="text"></param>
+        private void frm_ChangeTextEvents(string text,int i)
+        {
+            if ("上传成功".Equals(text))
+            {
+                pageData.menuList[i].Visi = "Visible";
+                pageData.menuList[i].Coll = "Collapsed";
+
+                DataContext = pageData;
+            }
+        }
+        /// <summary>
         /// 删除
         /// </summary>
         /// <param name="sender"></param>
@@ -1589,7 +1679,8 @@ namespace XHWK.WKTool
             {
                 try
                 {
-                    bool isName = ModifyPathName(pageData.menuList[Subscript].FileGuid, pageData.menuList[Subscript].VideoName, out string Errmessage);
+                    string newName = pageData.menuList[Subscript].VideoName +"."+ pageData.menuList[Subscript].VideoType;
+                    bool isName = ModifyPathName(pageData.menuList[Subscript].FileGuid, newName, out string Errmessage);
                     if (!isName)
                     {
                         MessageWindow.Show(Errmessage);

XHWK.WKTool/XHWK.WKTool.csproj

@@ -68,7 +68,8 @@
     <Reference Include="Aspose.PDF, Version=19.1.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
       <HintPath>..\packages\Aspose.PDF.19.1.0\lib\net4.0\Aspose.PDF.dll</HintPath>
     </Reference>
-    <Reference Include="Aspose.Slides">
+    <Reference Include="Aspose.Slides, Version=15.1.0.0, Culture=neutral, PublicKeyToken=00725b1ceb58d0a9, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\dl\Aspose.Slides.dll</HintPath>
     </Reference>
     <Reference Include="Aspose.Words">

XHWK.WKTool/packages.config

@@ -7,6 +7,7 @@
   <package id="AForge.Video" version="2.2.5" targetFramework="net452" />
   <package id="AForge.Video.DirectShow" version="2.2.5" targetFramework="net452" />
   <package id="Aspose.PDF" version="19.1.0" targetFramework="net452" />
+  <package id="Aspose.Slides.NET" version="19.10.0" targetFramework="net452" />
   <package id="iTextSharp" version="5.5.13.1" targetFramework="net452" />
   <package id="WpfAnimatedGif" version="2.0.0" targetFramework="net452" />
 </packages>