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

XHWK.WKTool/App.config

@@ -34,8 +34,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="31" />
-    <add key="VersionName" value="1.3.0" />
+    <add key="VersionCode" value="35" />
+    <add key="VersionName" value="1.3.4" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/App.cs

@@ -243,16 +243,16 @@ namespace XHWK.WKTool
                 //}
                 #endregion
 
-                try
-                {
-                    if(Directory.Exists(AppDomain.CurrentDomain.BaseDirectory+"temp"))//清除临时文件
-                    {
-                        Directory.Delete(AppDomain.CurrentDomain.BaseDirectory + "temp",true);
-                    }
-                }
-                catch (Exception)
-                {
-                }
+                //try
+                //{
+                //    if(Directory.Exists(AppDomain.CurrentDomain.BaseDirectory+"temp"))//清除临时文件
+                //    {
+                //        Directory.Delete(AppDomain.CurrentDomain.BaseDirectory + "temp",true);
+                //    }
+                //}
+                //catch (Exception)
+                //{
+                //}
 
                 //如果本地文件为空，弹出弹窗 输密匙
                 //本地文件不为空， 解析

XHWK.WKTool/CountdownWindow.xaml

@@ -21,6 +21,7 @@
                     gifLib:ImageBehavior.AnimatedSource=".\Images\countdown.gif" MediaElement.MediaEnded="Image_MediaEnded"/>-->
         <Image x:Name="imgLoding"
                     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"/>
+        <Border x:Name="borShortcut" Margin="0,450,0,0" Height="60" Width="550" Opacity="0.3"  Background="#999999"  CornerRadius="30"/>
+        <Label x:Name="lblShortcut" Content="开始/暂停：Ctrl+F5     停止：Ctrl+S" Height="60" Margin="0,450,0,0" Width="682" FontWeight="Bold" Foreground="#FFFFFF"   FontSize="30" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Visibility="Visible"/>
     </Grid>
 </Window>

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -27,10 +27,12 @@ namespace XHWK.WKTool
             if (ShowlblShortcut)
             {
                 lblShortcut.Visibility = Visibility.Visible;
+                borShortcut.Visibility = Visibility.Visible;
             }
             else
             {
                 lblShortcut.Visibility = Visibility.Hidden;
+                borShortcut.Visibility = Visibility.Hidden;
             }
             ImgNum = 22;
             bool IsStart = true;

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -16,35 +16,35 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="45"/>
             <RowDefinition Height="110"/>
-            <RowDefinition Height="80"/>
+            <RowDefinition Height="70"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <!--第一行 标题-->
         <Border Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Grid.ColumnSpan="2">
             <Grid>
                 <TextBlock Text="创建微课" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="28" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
+                <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" VerticalAlignment="Top" Foreground="#FFFFFF" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
             </Grid>
         </Border>
         <!--第二行 讲解名称-->
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,40,0,1" Grid.ColumnSpan="2">
-            <Label Content="*" FontSize="18" Padding="0,27,0,0" Foreground="#FF0000"/>
-            <TextBlock Text="讲解名称" FontSize="18" Padding="2,23,10,0"/>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="30,20,30,1" Grid.ColumnSpan="2">
+            <Label Content="*" FontSize="18" Padding="0,37.5,0,0" Foreground="#FF0000"/>
+            <TextBlock Text="讲解名称" FontSize="18" Padding="2,33,10,0"/>
             <!--输入框-->
-            <Border Background="#CDD6E0" Width="321" Height="43" CornerRadius="3">
-                <TextBox x:Name="txbExplainName" Text="微课1" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="319" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
+            <Border Background="#CDD6E0" Width="291" Height="43" CornerRadius="3">
+                <TextBox x:Name="txbExplainName" Text="微课1" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="289" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
         </StackPanel>
         <!--第三行 存放路径-->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,10,0,1" Grid.ColumnSpan="2">
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="30,0,30,1" Grid.ColumnSpan="2">
             <Label Content="*" FontSize="18" Padding="0,27,0,0" Foreground="#FF0000"/>
             <TextBlock Text="存放路径" FontSize="18" Padding="2,23,10,0"/>
             <!--输入框-->
-            <Border Background="#CDD6E0" Width="225" Height="43" CornerRadius="3">
-                <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
+            <Border Background="#CDD6E0" Width="200" Height="43" CornerRadius="3">
+                <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="198" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
             <!--浏览按钮-->
-            <Button  Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
+            <Button  Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="11,0,0,0" Click="BtnBrowse_Click">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border
@@ -62,7 +62,7 @@
             </Button>
         </StackPanel>
         <!--第四行 开始按钮-->
-        <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" Content="开始" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="48" Margin="10,0,10,0" Click="BtnStart_Click" Grid.ColumnSpan="2">
+        <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" Content="开始" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="386" Height="48" Margin="30,0,30,0" Click="BtnStart_Click" Grid.ColumnSpan="2">
             <Button.Template>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Border

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -182,6 +182,8 @@ namespace XHWK.WKTool
                             {
                                 Dispatcher.Invoke(new Action(() =>
                                 {
+                                    string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                                    FileToolsCommon.CreateDirectory(pathTemp);
                                     appUpdateShow(resultObj.obj);
                                 }));
                             }

XHWK.WKTool/KeyVerification.xaml

@@ -49,7 +49,7 @@
             </StackPanel>
         </DataTemplate>
     </Window.Resources>
-    <Views:ZJClippingBorder Background="White" CornerRadius="10,10,10,10">
+    <Views:ZJClippingBorder Background="White">
         <Grid Margin="0,0,0,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="50" />
@@ -67,10 +67,10 @@
                     Margin="15,0,0,0"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
-                    FontSize="22"
+                    FontSize="16"
                     Foreground="White"
                     Text="产品激活" />
-                <Button
+                <!--<Button
                     Grid.Column="0"
                     Width="46"
                     Height="46"
@@ -100,31 +100,32 @@
                         VerticalAlignment="Center"
                         Source="./Images/rollCall_1.png"
                         Stretch="Fill" />
-                </Button>
+                </Button>-->
+                <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" VerticalAlignment="Top" Foreground="#FFFFFF" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="close_click"/>
             </Grid>
-            <Grid Grid.Row="1" Margin="10,20,0,0">
-                <StackPanel Orientation="Horizontal" Height="30">
-                    <TextBlock Text="密匙：" FontSize="20"/>
-                    <TextBox x:Name="txbKey" Text="" Width="200" Foreground="gray" FontSize="18"/>
+            <Grid Grid.Row="1" Margin="30,20,30,0">
+                <StackPanel Orientation="Horizontal" Height="43">
+                    <TextBlock Text="密匙：" FontSize="20" Padding="0,5,0,0"/>
+                    <TextBox x:Name="txbKey" Text="" Width="164" Foreground="gray" FontSize="18" VerticalContentAlignment="Center"/>
                 </StackPanel>
             </Grid>
 
             <Button Cursor="Hand"
                 x:Name="btnEnd"
                 Grid.Row="2"
-                Width="163.5"
-                Height="37.2"
-                Margin="0,0,0,0"
+                Height="48"
+                Margin="30,0,30,0"
                 Click="btnEnd_Click"
                 Content="验证"
-                FontSize="18.75"
+                    FontWeight="Bold"
+                FontSize="18"
                 Foreground="White">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border
                             BorderBrush="{TemplateBinding Control.BorderBrush}"
                             BorderThickness="0"
-                            CornerRadius="20">
+                            CornerRadius="3">
                             <Border.Background>#6098FF</Border.Background>
                             <ContentPresenter
                                 HorizontalAlignment="Center"

XHWK.WKTool/LoginWindow.xaml

@@ -12,7 +12,50 @@
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
+    <Window.Resources>
+        <Style x:Key="CheckBoxStyle1" TargetType="{x:Type CheckBox}">
+            <Setter Property="OverridesDefaultStyle" Value="True"/>
+            <Setter Property="SnapsToDevicePixels" Value="True"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type CheckBox}">
+                        <BulletDecorator FlowDirection="LeftToRight" VerticalAlignment="Center">
+                            <BulletDecorator.Bullet>
+                                <Border x:Name="bd"  
+                                    BorderThickness="1"  
+                                    BorderBrush="#B2B2B2"  
+                                    MinHeight="13"  
+                                    MinWidth="13"  
+                                    VerticalAlignment="Center" Background="White">
+                                    <Path x:Name="cp" Width="12" Height="12"  
+                                      Stroke="#4892E7"  
+                                      StrokeThickness="2"/>
+                                </Border>
 
+                            </BulletDecorator.Bullet>
+                            <TextBlock x:Name="textBlock" Margin="2,0" Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}" FontFamily="Microsoft YaHei UI" FontSize="13.333"></TextBlock>
+                        </BulletDecorator>
+                        <!-- 
+                        控件触发器 
+                    -->
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="True">
+                                <!-- 画上一个勾 -->
+                                <Setter TargetName="cp" Property="Data"  
+                                    Value="M 2,6 L 5,9 11,2"/>
+                                <Setter Property="Foreground" TargetName="textBlock" Value="#FFE60E0E"/>
+
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="bd" Property="BorderBrush" Value="#1583DD">
+                                </Setter>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
     <Grid Background="#FFFFFF">
         <!--分5行-->
         <Grid.RowDefinitions>
@@ -30,30 +73,30 @@
             </Grid>
         </Border>
         <!--第二行 登陆 账号-->
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,30,0,0">
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="30,30,30,0">
             <TextBlock Text="登陆" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
-            <Border Background="#cccbce" Width="369" Height="43" CornerRadius="3" Margin="0,0,0,1">
-                <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="367" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
+            <Border Background="#cccbce" Width="344" Height="43" CornerRadius="3" Margin="0,0,0,1">
+                <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="342" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
         </StackPanel>
         <!--第三行 密码-->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,30,0,1">
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="30,30,0,1">
             <TextBlock Text="密码" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
-            <Border Background="#cccbce" Width="369" Height="43" CornerRadius="3">
-                <PasswordBox x:Name="pobPassword" FontSize="16" Foreground="#333333" PasswordChar="*" Padding="5,12,2,2" Width="367" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
+            <Border Background="#cccbce" Width="344" Height="43" CornerRadius="3">
+                <PasswordBox x:Name="pobPassword" FontSize="16" Foreground="#333333" PasswordChar="*" Padding="5,12,2,2" Width="342" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
         </StackPanel>
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="20,10,0,0">
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="32,10,0,0">
             <Viewbox Height="23">
-                <CheckBox   x:Name="ckSaveName" Click="CkSaveName_Click"/>
+                <CheckBox Cursor="Hand"  x:Name="ckSaveName" Click="CkSaveName_Click"   Style="{DynamicResource CheckBoxStyle1}"/>
             </Viewbox>
             <TextBlock Text="记住账号" FontSize="18" Height="30" Padding="5,3,0,0" Margin="0,0,0,1"/>
         </StackPanel>
 
         <!--第五行 开始按钮-->
-        <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" FontWeight="Bold" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="48" Margin="10,0,10,0" Click="BtnStart_Click">
+        <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" FontWeight="Bold" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="394" Height="48" Margin="30,0,30,0" Click="BtnStart_Click">
             <Button.Template>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Border

XHWK.WKTool/Properties/AssemblyInfo.cs

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

XHWK.WKTool/UControl/Uc_VideoItem.xaml

@@ -7,10 +7,19 @@
              mc:Ignorable="d" 
              d:DesignHeight="260" 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">
+        <Border Background="#dddddd" Width="202" Height="128" Margin="25,10,25,0" VerticalAlignment="Top">
+        <Button  x:Name="BtnVideoPlay" 
+            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Center" Width="200" Height="130" Margin="1,1,1,1"  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" />
+        </Border>
+        <Border Background="#dddddd" VerticalAlignment="Top" Width="60" Height="60" Margin="0,50,0,0" CornerRadius="30" >
+     
+                <Image x:Name="ImgVideoPlay" Source="/星火微课;component/Images/VideoList_Play.png" HorizontalAlignment="Center" Width="58" Height="58" Margin="1,1,1,1" Cursor="Hand" MouseLeftButtonDown="Image_MouseLeftButtonDown" />
+   
+
+           
+        </Border>
         <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>
@@ -27,7 +36,7 @@
                     <Setter Property="BorderBrush" Value="#3492F4"/>
                 </Style>
             </Button.Resources>
-            <Image Source="/星火微课;component/Images/VideoList_OK.png"></Image>
+            <Image Source="/星火微课;component/Images/VideoList_OK.png" Margin="2,12,2,2"></Image>
         </Button>
 
         <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"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -191,7 +191,7 @@
                 <!--第一行-->
                 <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,2,10,0">
                     <Image Source="./Images/microLessonSystem_0.png"/>
-                    <TextBlock Text="星火微课系统" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"/>
+                    <TextBlock Text="星火微课系统" FontSize="14" Padding="5,2,0,0" Foreground="#FFFFFF"/>
                 </StackPanel>
 
                 <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,2,20,0">
@@ -425,8 +425,8 @@
 
                     <TextBlock Grid.Row="6" Grid.Column="0" x:Name="txbFilePath" Text="文件路径" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Padding="0,0,0,0" />
                     <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                        <Border Background="#CDD6E0" Width="522" Height="30" CornerRadius="3" Margin="0,-30,0,0">
-                            <Label x:Name="txbStoragePath" Background="#FFFFFF" Margin="0,0,0,0" Content="D:\" FontSize="14" Foreground="#333333" Padding="10,7,2,2" Width="520" Height="28" BorderBrush="{x:Null}" BorderThickness="0"/>
+                        <Border Background="#CDD6E0" Width="515" Height="30" CornerRadius="3" Margin="0,-30,0,0">
+                            <Label x:Name="txbStoragePath" Background="#FFFFFF" Margin="0,0,0,0" Content="D:\" FontSize="14" Foreground="#333333" Padding="10,7,2,2" Width="513" Height="28" BorderBrush="{x:Null}" BorderThickness="0"/>
                         </Border>
                         <!--浏览按钮-->
                         <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="14" Width="80" Height="30" Margin="18,-30,0,0" Click="BtnBrowse_Click">