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

XHWK.WKTool/App.config

@@ -33,8 +33,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="25" />
-    <add key="VersionName" value="1.2.4" />
+    <add key="VersionCode" value="27" />
+    <add key="VersionName" value="1.2.6" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/App.cs

@@ -122,6 +122,10 @@ namespace XHWK.WKTool
         /// 上传个人空间 入参
         /// </summary>
         public static Model_ResourceAddTwo ResourceAddTwo = null;
+        /// <summary>
+        /// 是否正在
+        /// </summary>
+        public static bool IsUpLoad = false;
         #region 点阵笔
         /// <summary>
         /// 点阵笔

XHWK.WKTool/PrintWindow.xaml

@@ -64,8 +64,8 @@
                             <RowDefinition Height="auto"/>
                             <RowDefinition Height="auto"/>
                         </Grid.RowDefinitions>
-                        <Button Cursor="Hand" Grid.Row="0" x:Name="btnLess"  Content="-" Click="BtnLess_Click"/>
-                        <Button Cursor="Hand" Grid.Row="1" x:Name="btnAdd"  Content="+" Click="BtnAdd_Click"/>
+                        <Button Cursor="Hand" Grid.Row="0" x:Name="btnAdd"  Content="+" Click="BtnAdd_Click"/>
+                        <Button Cursor="Hand" Grid.Row="1" x:Name="btnLess"  Content="-" Click="BtnLess_Click"/>
                     </Grid>
                     <!--<TextBlock Text="点型：" FontSize="20"  Margin="120,10,0,0"/>
                 <RadioButton x:Name="rbnSquarePoint" Content="方点" FontSize="16"  Margin="0,15,0,0" IsChecked="True"/>

XHWK.WKTool/Properties/AssemblyInfo.cs

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

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -74,7 +74,7 @@
             </Grid>
 
             <Image Grid.Row="1"  Source="./Images/Toobar0.png"/>
-            <Button Grid.Row="1" x:Name="BtnRecordingScreen" HorizontalAlignment="Left"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="46,0,15,0" Click="BtnRecordingScreen_Click">
+            <Button Grid.Row="1" x:Name="BtnRecordingScreen" HorizontalAlignment="Left"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="46,0,15,0" ToolTip="开始" Click="BtnRecordingScreen_Click">
                 <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar26.png"/>
             </Button>
             <TextBlock Grid.Row="1" x:Name="txbTime" Text="00:00" FontSize="20" Foreground="#FFFFFF" Margin="43,80,0,0" Visibility="Hidden"/>
@@ -97,7 +97,7 @@
                         <Image x:Name="imgBlackPenTwo" Source="./Images/31.png" Margin="5,5,5,5"/>
                     </Border>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnReturn" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnReturn_Click" ToolTip="返回">
+                <Button  Cursor="Hand" x:Name="btnReturn" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,12,0" Click="BtnReturn_Click" ToolTip="返回">
                     <Border Background="#2d8cf0" CornerRadius="22">
                         <Image x:Name="imgReturn" Source="./Images/Toobar29.png" Margin="5,5,5,5"/>
                     </Border>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -75,6 +75,29 @@ namespace XHWK.WKTool
         public ScreenRecordingToolbarWindow()
         {
             InitializeComponent();
+            if (APP.W_PracticeWindow == null)
+            {
+                APP.W_PracticeWindow = new PracticeWindow
+                {
+                    //APP.W_PracticeWindow.Topmost = true;
+                    Width = pwidth,
+                    Height = pHeight,
+                    Left = 0,
+                    Top = 0
+                };
+                //practiceWin.Owner = this;
+            }
+            APP.W_PracticeWindow.Show();
+            new Thread(new ThreadStart(new Action(() =>
+            {
+                Thread.Sleep(100);
+                Dispatcher.Invoke(() =>
+                {
+                    this.Owner = APP.W_PracticeWindow;
+                    this.Topmost = true;
+                });
+            }))).Start();
+            APP.W_PracticeWindow.Hide();
         }
         /// <summary>
         /// 初始化
@@ -89,7 +112,7 @@ namespace XHWK.WKTool
                 borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
                 borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
             flg = 0;
-
+         
 
             k_hook = new KeyboardHookCommon();
             k_hook.KeyDownEvent += K_hook_KeyDownEvent;
@@ -115,6 +138,7 @@ namespace XHWK.WKTool
             //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
             //btnReturn.IsEnabled = true;//返回主界面可点击
             txbTime.Visibility = Visibility.Hidden;//时间不显示
+            BtnRecordingScreen.ToolTip = "开始";
             if (t == null)
             {
                 t = new DispatcherTimer();
@@ -366,9 +390,9 @@ namespace XHWK.WKTool
                 imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar28.png"));
                 btnBlackPenTwo.IsEnabled = true;//红笔可点击
                 txbTime.Visibility = Visibility.Visible;//时间显示
-                //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
-                //borOne.Background = new SolidColorBrush(Colors.LightBlue);
-
+                                                        //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
+                                                        //borOne.Background = new SolidColorBrush(Colors.LightBlue);
+                BtnRecordingScreen.ToolTip = "暂停";
                 try
                 {
                     #region 4秒内不可点击
@@ -416,6 +440,7 @@ namespace XHWK.WKTool
                 IsSuspend = true;
                 ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
                 BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
+                BtnRecordingScreen.ToolTip = "开始";
                 //imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
                 //btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
                 //imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
@@ -615,7 +640,7 @@ namespace XHWK.WKTool
                         borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
                     });
                     flg = 1;
-                    this.Owner = null;
+                    //this.Owner = null;
                     APP.W_PracticeWindow.ReturnPractice();
                 }
                 else if (flg == 10)
@@ -655,8 +680,15 @@ namespace XHWK.WKTool
                     flg = 11;
                     APP.W_PracticeWindow.Blue();
                     APP.W_PracticeWindow.Show();
-                    this.Owner = APP.W_PracticeWindow;
-                    this.Topmost = true;
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        Thread.Sleep(100);
+                        Dispatcher.Invoke(() =>
+                        {
+                            this.Owner = APP.W_PracticeWindow;
+                            this.Topmost = true;
+                        });
+                    }))).Start();
                 }
             }
             catch (Exception ex)
@@ -915,7 +947,7 @@ namespace XHWK.WKTool
                         borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
                     });
                     flg = 0;
-                    this.Owner = null;
+                    //this.Owner = null;
                     APP.W_PracticeWindow.ReturnPractice();
                 }
                 else if (flg == 11)
@@ -951,8 +983,19 @@ namespace XHWK.WKTool
                     flg = 10;
                     APP.W_PracticeWindow.Red();
                     APP.W_PracticeWindow.Show();
-                    this.Owner = APP.W_PracticeWindow;
-                    this.Topmost = true;
+
+
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        Thread.Sleep(100);
+                        Dispatcher.Invoke(() =>
+                        {
+                            this.Owner = APP.W_PracticeWindow;
+                            this.Topmost = true;
+                        });
+                    }))).Start();
+                 
+                    
                 }
             }
             catch (Exception ex)

XHWK.WKTool/UControl/Uc_VideoItem.xaml

@@ -20,7 +20,7 @@
                 </Style>
             </TextBox.Resources>
         </TextBox>
-        <Button x:Name="BtnNameModifyOK" HorizontalAlignment="Left" Margin="200,147,0,0" VerticalAlignment="Top" Width="30" Height="30" Background="White" BorderBrush="#FFABADB3" Click="BtnNameModifyOK_Click" Visibility="Hidden">
+        <Button Cursor="Hand" x:Name="BtnNameModifyOK" HorizontalAlignment="Left" Margin="200,147,0,0" VerticalAlignment="Top" Width="30" Height="30" Background="White" BorderBrush="#FFABADB3" Click="BtnNameModifyOK_Click" Visibility="Hidden">
             <Button.Resources>
                 <Style TargetType="{x:Type Border}">
                     <Setter Property="CornerRadius" Value="3"/>
@@ -32,11 +32,11 @@
 
         <Label x:Name="lblDateSize" Content="2020-10-10 10:10:00|1000.00MB" HorizontalAlignment="Center" Margin="0,175,0,0" VerticalAlignment="Top" Height="30" Width="240" Foreground="#FF9A9A9A" FontSize="13" HorizontalContentAlignment="Center"/>
         <Border x:Name="BorUploadBtn" CornerRadius="3" HorizontalAlignment="Left" Margin="25,210,0,0" VerticalAlignment="Top" Width="90" Height="40" Background="#FF3492F4">
-            <Button x:Name="BtnUpload" Content="上传" HorizontalAlignment="Left"  Width="90" Height="40" Foreground="White" FontSize="18" Click="BtnUpload_Click"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"/>
+            <Button Cursor="Hand" x:Name="BtnUpload" Content="上传" HorizontalAlignment="Left"  Width="90" Height="40" Foreground="White" FontSize="18" Click="BtnUpload_Click"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"/>
         </Border>
         <Border CornerRadius="3" Width="90" Height="40" Background="#FFF0582C" HorizontalAlignment="Right" Margin="0,210,25,0" VerticalAlignment="Top">
 
-            <Button x:Name="BtnDelVideo" Content="删除"  Width="90" Height="40" Foreground="White" FontSize="18" Background="Transparent" Click="BtnDelVideo_Click"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+            <Button Cursor="Hand" x:Name="BtnDelVideo" Content="删除"  Width="90" Height="40" Foreground="White" FontSize="18" Background="Transparent" Click="BtnDelVideo_Click"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
       
         </Button>
         </Border>

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -49,10 +49,7 @@ namespace XHWK.WKTool.UControl
         /// 上传页面
         /// </summary>
         UploadWindow W_UploadWindow = null;
-        /// <summary>
-        /// 是否正在
-        /// </summary>
-        bool IsUpLoad = false;
+      
         #endregion
 
         #region 初始化
@@ -63,6 +60,7 @@ namespace XHWK.WKTool.UControl
         public Uc_VideoItem(Model_Video model_Video)
         {
             InitializeComponent();
+            APP.IsUpLoad = false;
             VideoModel = model_Video;
             if (FileToolsCommon.IsExistFile(VideoModel.ThumbnailPath))
             {
@@ -314,9 +312,9 @@ namespace XHWK.WKTool.UControl
                 Click_UploadLogin();
                 return;
             }
-            if (!IsUpLoad)
+            if (!APP.IsUpLoad)
             {
-                IsUpLoad = true;
+                APP.IsUpLoad = true;
                 //BtnUpload.IsEnabled = false;
                 //BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
                 //BtnUpload.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#999999"));
@@ -340,7 +338,7 @@ namespace XHWK.WKTool.UControl
                 }
                 else
                 {
-                    IsUpLoad = false;
+                    APP.IsUpLoad = false;
                     MessageWindow.Show(ErrMessage);
                 }
             }

XHWK.WKTool/UploadWindow.xaml

@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:XHWK.WKTool"
+        xmlns:local="clr-namespace:XHWK.WKTool" xmlns:Views="clr-namespace:XHWK.WKTool.Helpers"
         mc:Ignorable="d"
         Title="UploadWindow" Height="346" Width="457"   AllowsTransparency="True"
     WindowStartupLocation="CenterScreen"
@@ -84,6 +84,27 @@
                     </ControlTemplate>
                 </Button.Template>
             </Button>
+            <Views:ZJClippingBorder Grid.Row="0" Grid.RowSpan="2" x:Name="tip_outer" Margin="0" Background="#FFE6EAF0" CornerRadius="4" Visibility="Collapsed">
+                <Grid>
+                    <Label Content="上传中..." HorizontalAlignment="Center" Margin="0,7,0,0" Height="35" VerticalAlignment="Top" FontSize="20"></Label>
+                    <ProgressBar BorderBrush="#4597FF"
+                             Foreground="#4597FF"
+                    Grid.Row="0"
+                    x:Name="pgbProcess"
+                    Height="20"
+                    Margin="50,20,50,0"
+                    Visibility="Visible" />
+                    <Label Grid.Row="0"
+                    HorizontalAlignment="Center" Width="60"
+                    x:Name="lbProcess"
+                    Height="30"
+                    Margin="0,20,0,0"
+                       FontSize="16"
+                    Content=""
+                       Foreground="White"
+                    Visibility="Visible" />
+                </Grid>
+            </Views:ZJClippingBorder>
         </Grid>
     </Viewbox>
 </Window>

XHWK.WKTool/UploadWindow.xaml.cs

@@ -2,12 +2,14 @@
 
 using System;
 using System.Collections.ObjectModel;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
 using XHWK.Model;
 using XHWK.WKTool.DAL;
+using XHWK.WKTool.UControl;
 using static XHWK.WKTool.XHMicroLessonSystemWindow;
 
 namespace XHWK.WKTool
@@ -47,6 +49,7 @@ namespace XHWK.WKTool
         /// 当前视频的下标
         /// </summary>
        private int i = 0;
+        private System.Timers.Timer times;
         public UploadWindow()
         {
             InitializeComponent();
@@ -61,6 +64,7 @@ namespace XHWK.WKTool
             Resourcesize = _resourcesize;
             Suffix = _suffix;
             Guid = _guid;
+            tip_outer.Visibility = Visibility.Collapsed;
             Tsubjectbook();
         }
         /// <summary>
@@ -182,6 +186,7 @@ namespace XHWK.WKTool
 
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
+            APP.IsUpLoad = false;
             Hide();
         }
         /// <summary>
@@ -191,7 +196,24 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
+                if(string.IsNullOrWhiteSpace(book_list.Text))
+                {
+                    MessageWindow.Show("教材不能为空！");
+                }
+                btnStart.IsEnabled = false;
+            book_list.IsEnabled = false;
+            cmbTeachingMaterial.IsEnabled = false;
+                Thread myThread = new Thread(StartUpload);
 
+                num = 0;
+                tip_outer.Visibility = Visibility.Visible;
+                myThread.Start();
+                times = new System.Timers.Timer(100);
+                times.Elapsed += Times_ElapsedClick;
+                times.Start();
+        }
+        private void StartUpload()
+        {
             try
             {
                 DAL_Upload dAL_Upload = new DAL_Upload();
@@ -217,25 +239,30 @@ namespace XHWK.WKTool
                     //schoolid: 12
                     //suffix: "mp4"
                     //uid: 80
-                    Model_ResourceAdd model_ResourceAdd = new Model_ResourceAdd
+                    Model_ResourceAdd model_ResourceAdd = new Model_ResourceAdd();
+                    Dispatcher.Invoke(() =>
                     {
-                        converted = 0,
-                        createid = APP.UserInfo.Userid,
-                        directorid = Convert.ToInt32(cmbTeachingMaterial.SelectedValue.ToString()),
-                        duration = APP.ResourceAddTwo.duration,
-                        imgUrl = "",
-                        level = 2,
-                        lsbid = Convert.ToInt32(book_list.SelectedValue.ToString()),
-                        mp4code = APP.ResourceAddTwo.mp4code,
-                        resourcebelong = 3,
-                        resourceclass = 2,
-                        resourcecover = APP.ResourceAddTwo.coverpath,
-                        resourcename = Resourcename,
-                        resourcesize = Resourcesize,
-                        resourcetype = 0,
-                        resourceurl = APP.ResourceAddTwo.videopath,
-                        schoolid = APP.UserInfo.Schoolid
-                    };
+                         model_ResourceAdd = new Model_ResourceAdd
+                        {
+                            converted = 0,
+                            createid = APP.UserInfo.Userid,
+                            directorid = Convert.ToInt32(cmbTeachingMaterial.SelectedValue.ToString()),
+                            duration = APP.ResourceAddTwo.duration,
+                            imgUrl = "",
+                            level = 2,
+                            lsbid = Convert.ToInt32(book_list.SelectedValue.ToString()),
+                            mp4code = APP.ResourceAddTwo.mp4code,
+                            resourcebelong = 3,
+                            resourceclass = 2,
+                            resourcecover = APP.ResourceAddTwo.coverpath,
+                            resourcename = Resourcename,
+                            resourcesize = Resourcesize,
+                            resourcetype = 0,
+                            resourceurl = APP.ResourceAddTwo.videopath,
+                            schoolid = APP.UserInfo.Schoolid
+                        };
+                    });
+                    
                     if (Suffix.Equals("FLV"))
                     {
                         Suffix = "flv";
@@ -254,27 +281,86 @@ namespace XHWK.WKTool
                     int code = @interface.ResourceAdd(model_ResourceAdd);
                     if (code == 0)
                     {
-                        MessageWindow.Show("视频上传成功！");
-                        ChangeTextEvents("上传成功",i);
-                        Hide();
+                        Dispatcher.Invoke(() =>
+                        {
+                            btnStart.IsEnabled = true;
+                            book_list.IsEnabled = true;
+                            cmbTeachingMaterial.IsEnabled = true;
+                            num = 99;
+                            times.Stop();
+                            pgbProcess.Value = 100;
+                            lbProcess.Content = "100%";
+                            MessageWindow.Show("视频上传成功！");
+                            tip_outer.Visibility = Visibility.Collapsed;
+                            ChangeTextEvents("上传成功", i);
+                            Hide();
+                        });
                     }
                     else
                     {
-                        MessageWindow.Show(APP.ServerMsg);
+                        Dispatcher.Invoke(() =>
+                        {
+                            btnStart.IsEnabled = true;
+                            book_list.IsEnabled = true;
+                            cmbTeachingMaterial.IsEnabled = true;
+                            times.Stop();
+                            tip_outer.Visibility = Visibility.Collapsed;
+                            MessageWindow.Show(APP.ServerMsg);
+                        });
                     }
                 }
                 else
                 {
-                    MessageWindow.Show(ErrMessage);
+                    Dispatcher.Invoke(() =>
+                    {
+                        btnStart.IsEnabled = true;
+                        book_list.IsEnabled = true;
+                        cmbTeachingMaterial.IsEnabled = true;
+                        times.Stop();
+                        tip_outer.Visibility = Visibility.Collapsed;
+                        MessageWindow.Show(ErrMessage);
+                    });
                 }
             }
             catch (Exception ex)
             {
-                MessageWindow.Show("视频上传失败！");
-                Hide();
-                LogHelper.WriteErrLog("【UploadWindow】(BtnStart_Click)" + ex.Message, ex);
+                Dispatcher.Invoke(() =>
+                {
+                    btnStart.IsEnabled = true;
+                    book_list.IsEnabled = true;
+                    cmbTeachingMaterial.IsEnabled = true;
+                    times.Stop();
+                    tip_outer.Visibility = Visibility.Collapsed;
+                    MessageWindow.Show("视频上传失败！");
+                    APP.IsUpLoad = false;
+                    Hide();
+                    LogHelper.WriteErrLog("【UploadWindow】(BtnStart_Click)" + ex.Message, ex);
+                });
             }
         }
+        int num = 0;
+        /// <summary>
+        /// 计时器
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Times_ElapsedClick(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                pgbProcess.Value = num;
+                lbProcess.Content = num.ToString() + "%";
+                if (num < 99)
+                {
+                    num++;
+                    times.Interval += (num / 2);
+                }
+                else
+                {
+                    times.Stop();
+                }
+            });
+        }
     }
     public class LoginPageData : NotifyModel
     {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -262,7 +262,7 @@
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgAdd" Source="./Images/microLessonSystem_25.png" Visibility="Visible"/>
                             <Image x:Name="ImgAddTwo" Source="./Images/microLessonSystem_24.png" Visibility="Collapsed"/>
-                            <TextBlock Text="增加" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                            <TextBlock Text="加页" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                     <Button Cursor="Hand" x:Name="btnPrint" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnPrint_Click">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -118,6 +118,7 @@ namespace XHWK.WKTool
         /// </summary>
         public XHMicroLessonSystemWindow()
         {
+            new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
             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();

XHWK.WKTool/XHWK.WKTool.csproj

@@ -72,8 +72,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\dl\Aspose.Slides.dll</HintPath>
     </Reference>
-    <Reference Include="Aspose.Words">
-      <HintPath>..\dl\Aspose.Words.dll</HintPath>
+    <Reference Include="Aspose.Words, Version=19.1.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
+      <HintPath>..\packages\Aspose.Words.19.1.0\lib\net40\Aspose.Words.dll</HintPath>
     </Reference>
     <Reference Include="itextsharp, Version=5.5.13.1, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
       <HintPath>..\packages\iTextSharp.5.5.13.1\lib\itextsharp.dll</HintPath>

XHWK.WKTool/packages.config

@@ -8,6 +8,7 @@
   <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="Aspose.Words" version="19.1.0" targetFramework="net452" />
   <package id="iTextSharp" version="5.5.13.1" targetFramework="net452" />
   <package id="System.Management" version="4.7.0" targetFramework="net452" />
   <package id="WpfAnimatedGif" version="2.0.0" targetFramework="net452" />