zhao：1修改倒计时 2解决转码失败 3调整上传

XHWK.WKTool/CountdownWindow.xaml

@@ -20,9 +20,7 @@
                     Height="600"
                     gifLib:ImageBehavior.AnimatedSource=".\Images\countdown.gif" MediaElement.MediaEnded="Image_MediaEnded"/>-->
         <Image x:Name="imgLoding"
-                    Width="600"
-                    Height="600"
-                    Source=".\Images\countdown3_1.png" />
-        <Label x:Name="lblShortcut" Content="开始/暂停：Ctrl+F5     停止：Ctrl+S" Height="77" Margin="0,750,0,0" Width="682" Foreground="#FF5B5151" FontSize="36" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Visibility="Collapsed"/>
+                    Source=".\Images\countdown3_1.png" HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" />
+        <Label x:Name="lblShortcut" Content="开始/暂停：Ctrl+F5     停止：Ctrl+S" Height="77" Margin="0,450,0,0" Width="682" Foreground="#FF5B5151" FontSize="36" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Visibility="Collapsed"/>
     </Grid>
 </Window>

XHWK.WKTool/UControl/Uc_VideoItem.xaml

@@ -5,14 +5,14 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:XHWK.WKTool.UControl"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="250">
+             d:DesignHeight="270" d:DesignWidth="250">
     <Grid>
         <Button x:Name="BtnVideoPlay" HorizontalAlignment="Center" Width="200" Height="130" Margin="25,10,25,0" VerticalAlignment="Top" Cursor="Hand" Click="BtnVideoPlay_Click">
             <Image x:Name="ImgVideo" VerticalAlignment="Top"  Width="200" Height="130" Margin="0,0,0,0" Cursor="Hand" Stretch="Fill"/>
         </Button>
         <Image x:Name="ImgVideoPlay" Source="/星火微课;component/Images/VideoList_Play.png" HorizontalAlignment="Center" VerticalAlignment="Top" Width="60" Margin="0,50,0,0" Cursor="Hand" MouseLeftButtonDown="Image_MouseLeftButtonDown" />
-        <TextBlock x:Name="TbName" Text="一二三四五六七八九十..." HorizontalAlignment="Center" Margin="15,160,15,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="#FF3492F4" FontSize="18" TextAlignment="Center" ToolTip="" Visibility="Visible" MouseLeftButtonDown="TextBlock_MouseLeftButtonDown"/>
-        <TextBox x:Name="TxtModify" HorizontalAlignment="Left" Height="30" Margin="25,157,0,0" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="180" FontSize="16" Visibility="Hidden" LostFocus="TxtModify_LostFocus" KeyUp="TxtModify_KeyUp">
+        <TextBlock x:Name="TbName" Text="一二三四五六七八九十一..." HorizontalAlignment="Center" Margin="15,150,15,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="#FF3492F4" FontSize="18" TextAlignment="Center" ToolTip="" Visibility="Visible" MouseLeftButtonDown="TextBlock_MouseLeftButtonDown"/>
+        <TextBox x:Name="TxtModify" HorizontalAlignment="Left" Height="30" Margin="25,147,0,0" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="180" FontSize="16" Visibility="Hidden" LostFocus="TxtModify_LostFocus" KeyUp="TxtModify_KeyUp">
             <TextBox.Resources>
                 <Style TargetType="{x:Type Border}">
                     <Setter Property="CornerRadius" Value="3"/>
@@ -20,7 +20,7 @@
                 </Style>
             </TextBox.Resources>
         </TextBox>
-        <Button x:Name="BtnNameModifyOK" HorizontalAlignment="Left" Margin="200,157,0,0" VerticalAlignment="Top" Width="30" Height="30" Background="White" BorderBrush="#FFABADB3" Click="BtnNameModifyOK_Click" Visibility="Hidden">
+        <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.Resources>
                 <Style TargetType="{x:Type Border}">
                     <Setter Property="CornerRadius" Value="3"/>
@@ -29,9 +29,9 @@
             </Button.Resources>
             <Image Source="/星火微课;component/Images/VideoList_OK.png"></Image>
         </Button>
-        <Label x:Name="lblDateSize" Content="2020-10-10 10:10:00|1000.00MB" HorizontalAlignment="Center" Margin="0,205,0,0" VerticalAlignment="Top" Height="30" Width="240" Foreground="#FF9A9A9A" FontSize="13" HorizontalContentAlignment="Center"/>
-        <Button x:Name="BtnUpload" Content="上传" HorizontalAlignment="Left" Margin="25,248,0,0" VerticalAlignment="Top" Width="90" Height="34" Background="#FF3492F4" Foreground="White" FontSize="18" Click="BtnUpload_Click"/>
-        <Button x:Name="BtnDelVideo" Content="删除" HorizontalAlignment="Right" Margin="0,248,25,0" VerticalAlignment="Top" Width="90" Height="34" Foreground="White" FontSize="18" Background="#FFF0582C" Click="BtnDelVideo_Click"/>
+        <Label x:Name="lblDateSize" Content="2020-10-10 10:10:00|1000.00MB" HorizontalAlignment="Center" Margin="0,180,0,0" VerticalAlignment="Top" Height="30" Width="240" Foreground="#FF9A9A9A" FontSize="13" HorizontalContentAlignment="Center"/>
+        <Button x:Name="BtnUpload" Content="上传" HorizontalAlignment="Left" Margin="25,220,0,0" VerticalAlignment="Top" Width="90" Height="34" Background="#FF3492F4" Foreground="White" FontSize="18" Click="BtnUpload_Click"/>
+        <Button x:Name="BtnDelVideo" Content="删除" HorizontalAlignment="Right" Margin="0,220,25,0" VerticalAlignment="Top" Width="90" Height="34" Foreground="White" FontSize="18" Background="#FFF0582C" Click="BtnDelVideo_Click"/>
 
     </Grid>
 </UserControl>

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -69,13 +69,16 @@ namespace XHWK.WKTool.UControl
                 ImgVideo.Source = ImageHelper.ReadBitmapImageFile(VideoModel.ThumbnailPath);// new BitmapImage(new Uri(VideoModel.ThumbnailPath));
             }
             string videoName = FileToolsCommon.GetIOFileNameNoExtension(VideoModel.VideoPath);
-            TbName.Text = videoName.Length > 20 ? videoName.Substring(0, 20) + "..." : videoName;
+            TbName.Text = videoName.Length > 11 ? videoName.Substring(0, 11) + "..." : videoName;
             TbName.ToolTip = videoName;
             lblDateSize.Content = VideoModel.RSTime + "|" + VideoModel.VideoSize;
-            //if (VideoModel.IsUpload)
-            //{
-            //    BtnUpload.Visibility = Visibility.Hidden;
-            //}
+            if (VideoModel.IsUpload)
+            {
+                //BtnUpload.Visibility = Visibility.Hidden;
+                BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
+                BtnUpload.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#999999"));
+                BtnUpload.IsEnabled = false;
+            }
         }
         #endregion
 
@@ -137,7 +140,7 @@ namespace XHWK.WKTool.UControl
                 if (ModifyPathName(VideoModel.FileGuid, TxtModify.Text + "." + VideoModel.VideoType, out ErrMessage))
                 {
                     //保存成功
-                    TbName.Text = TxtModify.Text.Length > 20 ? TxtModify.Text.Substring(0, 20) + "..." : TxtModify.Text;
+                    TbName.Text = TxtModify.Text.Length > 11 ? TxtModify.Text.Substring(0, 11) + "..." : TxtModify.Text;
                     TbName.ToolTip = TxtModify.Text;
                     TbName.Visibility = Visibility.Visible;
                     TxtModify.Visibility = Visibility.Hidden;
@@ -313,7 +316,9 @@ namespace XHWK.WKTool.UControl
             if (!IsUpLoad)
             {
                 IsUpLoad = true;
-                BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
+                //BtnUpload.IsEnabled = false;
+                //BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
+                //BtnUpload.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#999999"));
                 DAL_Upload dAL_Upload = new DAL_Upload();
 
                 if (dAL_Upload.UploadVideo(VideoModel.FileGuid, out string ErrMessage))
@@ -335,7 +340,6 @@ namespace XHWK.WKTool.UControl
                 else
                 {
                     IsUpLoad = false;
-                    BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#3491F4"));
                     MessageWindow.Show(ErrMessage);
                 }
             }
@@ -350,7 +354,10 @@ namespace XHWK.WKTool.UControl
             if ("上传成功".Equals(text))
             {
                 W_UploadWindow.Close();
-                BtnUpload.Visibility = Visibility.Hidden;
+                //BtnUpload.Visibility = Visibility.Hidden;
+                BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
+                BtnUpload.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#999999"));
+                BtnUpload.IsEnabled = false;
             }
         }
 

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -3140,8 +3140,8 @@ namespace XHWK.WKTool
                         //生成缩略图
                         bool ThuRes = APP.FFmpeg.GenerateThumbnails(VideoSynthesisPathName, ThumbnailPathName,200,130);
                         Thread.Sleep(500);
-                        int imgW = (int)GridMain.ActualWidth + (GridMain.ActualWidth % 2 > 0 ? 1 : 0);
-                        int imgH = (int)GridMain.ActualHeight + (GridMain.ActualHeight % 2 > 0 ? 1 : 0);
+                        int imgW = (int)GridMain.ActualWidth + (((int)GridMain.ActualWidth) % 2 > 0 ? 1 : 0);
+                        int imgH = (int)GridMain.ActualHeight + (((int)GridMain.ActualHeight) % 2 > 0 ? 1 : 0);
                         //if (ThuRes)
                         //{
                         //    Bitmap bmp = ImageHelper.ReadBitmapFile(ThumbnailPathName);