zhao：新版微课

XHWK.Model/Model_Page.cs

@@ -38,5 +38,26 @@ namespace XHWK.Model
         {
             menuList = new ObservableCollection<Model_Canvas>();
         }
+
+        /// <summary>
+        /// 文字大小20px
+        /// </summary>
+        public double WordSize20 { get; set; }
+        /// <summary>
+        /// 文字大小18px
+        /// </summary>
+        public double WordSize18 { get; set; }
+        /// <summary>
+        /// 文字大小16px
+        /// </summary>
+        public double WordSize16 { get; set; }
+        /// <summary>
+        /// 文字大小14px
+        /// </summary>
+        public double WordSize14 { get; set; }
+        /// <summary>
+        /// 文字大小12px
+        /// </summary>
+        public double WordSize12 { get; set; }
     }
 }

XHWK.Model/Model_ResourceAdd.cs

@@ -36,6 +36,8 @@
         /// 视频时长（秒）
         /// </summary>
         public int duration { get; set; }
+        public string subjectid { get; set; }
+        
         /// <summary>
         /// 
         /// </summary>
@@ -57,7 +59,7 @@
         /// </summary>
         public int resourcebelong { get; set; }
         /// <summary>
-        /// 资源分类1音频2视频3图片4文档
+        /// 资源分类1word2ppt3pdf4图片5视频6音频7压缩包10其他
         /// </summary>
         public int resourceclass { get; set; }
         /// <summary>

XHWK.Model/Model_UserInfo.cs

@@ -70,6 +70,7 @@ namespace XHWK.Model
         /// </summary>
         private int _schoollevel;
         private List<Model_WKData> _wkdata;
+        private string _cloudcode;
 
         public int Userid { get => _userid; set => _userid = value; }
         public string Username { get => _username; set => _username = value; }
@@ -95,5 +96,6 @@ namespace XHWK.Model
         /// 微课列表信息
         /// </summary>
         public List<Model_WKData> Wkdata { get => _wkdata; set => _wkdata = value; }
+        public string cloudcode { get => _cloudcode; set => _cloudcode = value; }
     }
 }

XHWK.WKTool/App.config

@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-  </startup>
-  <appSettings>
-    <!--0正式 1测试-->
-    <add key="IsDebug" value="1" />
-    <!--参数是否加密 0不加密 1加密-->
-    <add key="IsParameterEncryption" value="0" />
-    <!--版本号-->
-    <add key="VersionCode" value="67" />
-    <add key="VersionName" value="2.5.17" />
-    <!--皮肤样式 Blue蓝 Black黑色-->
-    <add key="SkinStyle" value="Black" />
-    <!--是否输出视频记录日志：0否-->
-    <add key="OutputVideoLog" value="0" />
-    <!--是否输出其他测试日志-->
-    <add key="IsOutputInfoLog" value="0" />
-    <!--文件存放路径  路径\账户名\讲解名称_x.MP4-->
-    <add key="VideoSavePath" value="D:\星火微课" />
-    <!--视频格式 1、MP4 2、FlV 3、AVI-->
-    <add key="VideoType" value="1" />
-    <!--声音 true 有 false 无-->
-    <add key="IsSound" value="true" />
-    <!--图片压缩质量 0最差 100最佳-->
-    <add key="ImageCompressionLevel" value="70" />
-    <!--用户名-->
-    <add key="userName" value="" />
-    <!--记住密码-->
-    <add key="isRemind" value="" />
-    <!--API请求地址-->
-    <add key="APIRequestAddress" value="http://schoolapi.xhkjedu.com" />
-    <!--文件平台请求地址-->
-    <add key="FileRequestAddress" value="http://schoolfile.xhkjedu.com" />
-    <!--展示文件服务器请求地址-->
-    <add key="SchoolfileRequestAddress" value="http://schoolfile.xhkjedu.com" />
-    <!--认证请求地址-->
-    <add key="CertapiRequestAddress" value="http://certapi.xhkjedu.com" />
-    <!--TQL铺码API-->
-    <add key="TmatrixCode" value="http://111.231.240.239:8030" />
-    <!--摄像头位置 1.右上 2.左上 3.右下 4.左下-->
-    <add key="CameraPosition" value="1" />
-    <!--上传每片大小 Mb-->
-    <add key="UploadSliceLen" value="1" />
-    <!--是否隐藏录屏工具栏 1 隐藏 0不隐藏-->
-    <add key="IsHideSRTool" value="1" />
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
-  </appSettings>
-  <system.web>
-    <membership defaultProvider="ClientAuthenticationMembershipProvider">
-      <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
-      </providers>
-    </membership>
-    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
-      <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
-      </providers>
-    </roleManager>
-  </system.web>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="itextsharp" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.5.13.2" newVersion="5.5.13.2" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+	</startup>
+	<appSettings>
+		<!--0正式 1测试-->
+		<add key="IsDebug" value="0" />
+		<!--参数是否加密 0不加密 1加密-->
+		<add key="IsParameterEncryption" value="0" />
+		<!--版本号-->
+		<add key="VersionCode" value="74" />
+		<add key="VersionName" value="2.5.24" />
+		<!--皮肤样式 0白 1蓝 2黑色 -->
+		<add key="SkinStyle" value="0" />
+		<!--是否输出视频记录日志：0否-->
+		<add key="OutputVideoLog" value="0" />
+		<!--是否输出其他测试日志-->
+		<add key="IsOutputInfoLog" value="0" />
+		<!--文件存放路径  路径\账户名\讲解名称_x.MP4-->
+		<add key="VideoSavePath" value="D:\星火微课" />
+		<!--视频格式 1、MP4 2、FlV 3、AVI-->
+		<add key="VideoType" value="1" />
+		<!--声音 true 有 false 无-->
+		<add key="IsSound" value="true" />
+		<!--图片压缩质量 0最差 100最佳-->
+		<add key="ImageCompressionLevel" value="70" />
+		<!--用户名-->
+		<add key="userName" value="" />
+		<!--记住密码-->
+		<add key="isRemind" value="" />
+		<!--API请求地址-->
+		<add key="APIRequestAddress" value="http://schoolapi.xhkjedu.com" />
+		<!--文件平台请求地址-->
+		<add key="FileRequestAddress" value="http://schoolfile.xhkjedu.com" />
+		<!--展示文件服务器请求地址-->
+		<add key="SchoolfileRequestAddress" value="http://schoolfile.xhkjedu.com" />
+		<!--认证请求地址-->
+		<add key="CertapiRequestAddress" value="http://certapi.xhkjedu.com" />
+		<!--TQL铺码API-->
+		<add key="TmatrixCode" value="http://111.231.240.239:8030" />
+		<!--摄像头位置 1.右上 2.左上 3.右下 4.左下-->
+		<add key="CameraPosition" value="1" />
+		<!--上传每片大小 Mb-->
+		<add key="UploadSliceLen" value="1" />
+		<!--是否隐藏录屏工具栏 1 隐藏 0不隐藏-->
+		<add key="IsHideSRTool" value="1" />
+		<add key="ClientSettingsProvider.ServiceUri" value="" />
+	</appSettings>
+	<system.web>
+		<membership defaultProvider="ClientAuthenticationMembershipProvider">
+			<providers>
+				<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+			</providers>
+		</membership>
+		<roleManager defaultProvider="ClientRoleProvider" enabled="true">
+			<providers>
+				<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+			</providers>
+		</roleManager>
+	</system.web>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="itextsharp" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.5.13.2" newVersion="5.5.13.2" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
 </configuration>

XHWK.WKTool/App.cs

@@ -17,6 +17,7 @@ using TStudyDigitalPen.HID;
 
 using XHWK.Model;
 using XHWK.WKTool.Helpers;
+using XHWK.WKTool.Skin;
 
 namespace XHWK.WKTool
 {
@@ -40,7 +41,7 @@ namespace XHWK.WKTool
         /// </summary>
         public static bool IsHideSRTool = FileToolsCommon.GetConfigValue("IsHideSRTool") != "0";
         /// <summary>
-        /// 皮肤样式 Blue蓝 Black黑色
+        /// 皮肤样式 0白 1蓝 2黑色
         /// </summary>
         public static string SkinStyle = FileToolsCommon.GetConfigValue("SkinStyle");
         /// <summary>
@@ -315,7 +316,6 @@ namespace XHWK.WKTool
 
                 //}
                 #endregion
-
                 try
                 {
                     if (Directory.Exists(AppDomain.CurrentDomain.BaseDirectory + "temp"))//清除临时文件
@@ -337,6 +337,7 @@ namespace XHWK.WKTool
                         KeyVerification wins = new KeyVerification();
                         // 定义Application对象作为整个应用程序入口
                         Application app = new Application();
+                        SkinConfig.InitSkin();
                         app.Run(wins);
                     }
                     else
@@ -370,6 +371,7 @@ namespace XHWK.WKTool
                     {
                         ProductVerification wins = new ProductVerification();
                         Application app = new Application();
+                        SkinConfig.InitSkin();
                         app.Run(wins);
                     }
                     else
@@ -396,6 +398,7 @@ namespace XHWK.WKTool
                         Environment.Exit(0);
 
                     }
+
                 }
             }
             catch (Exception ex)

XHWK.WKTool/App.xaml

@@ -2,17 +2,13 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XHWK.WKTool"
-             StartupUri="MainWindow.xaml">
+             >
     <Application.Resources>
-      <!--<UserControl.Resources>
-            <ResourceDictionary>
-                <ResourceDictionary.MergedDictionaries>
-                    <ResourceDictionary>
-                        <FontFamily x:Key="youyuan">/Presentation/Resources/font/#youyuan</FontFamily>
-                    </ResourceDictionary>
-                </ResourceDictionary.MergedDictionaries>
-            </ResourceDictionary>
-        </UserControl.Resources>-->
-
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Skin\SkinDictionary_White.xaml"></ResourceDictionary>
+				<!--<ResourceDictionary Source="Skin\SkinDictionary_TechnologyBlue.xaml"></ResourceDictionary>-->
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="星火微课" Height="346" Width="457"   AllowsTransparency="True"
+        Title="星火微课" Height="450" Width="800"   AllowsTransparency="True"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None" Loaded="Window_Loaded" Margin="0"  BorderThickness="7">
     <Window.Effect>
@@ -37,58 +37,136 @@
         </Style>
     </Window.Resources>
     <Grid>
-        <!--分4行-->
-        <Grid.RowDefinitions>
-            <RowDefinition Height="45"/>
-            <RowDefinition Height="110"/>
-            <RowDefinition Height="70"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-        <!--第一行 标题 FFE9E9E9  FF2D8CF0-->
-        <Grid x:Name="GridTitle" Visibility="Visible" Margin="-1,0" Grid.Row="0" Background="#FF38ADFF" MouseLeftButtonDown="Window_MouseLeftButtonDown">
-            <TextBlock Text="创建微课" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-            <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>
-        <Grid x:Name="GridTitle_Black" Visibility="Collapsed" Margin="0,0" Grid.Row="0" Background="#FFE9E9E9" MouseLeftButtonDown="Window_MouseLeftButtonDown">
-            <TextBlock Text="创建微课" Foreground="#FF333333" FontSize="16" Padding="10,13,0,0"/>
-            <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown_Black" Content="×" VerticalAlignment="Top" Foreground="#FF333333" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
-        </Grid>
-        <!--第二行 讲解名称-->
-        <Grid Grid.Row="1">
-        <StackPanel 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="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>
-        </Grid>
-        <!--第三行 存放路径-->
-        <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="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" FontSize="18" Width="80" Height="43" BorderBrush="#cccccc" BorderThickness="1" Click="BtnBrowse_Click" Content="浏览" Style="{StaticResource Button_Menu}"
+        <Grid Background="#FF4B95FF" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="520*"/>
+                <ColumnDefinition Width="280*"/>
+            </Grid.ColumnDefinitions>
+            <!--轮播图-->
+            <Grid Grid.Column="0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="28*"/>
+                    <RowDefinition Height="380*"/>
+                    <RowDefinition Height="28*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="15*"/>
+                    <ColumnDefinition Width="481*"/>
+                    <ColumnDefinition Width="15*"/>
+                </Grid.ColumnDefinitions>
+                <!--<MediaElement Grid.Row="1" Grid.Column="1" Source="/SkinImages/ImgCarousel/CM_Carousel.gif" Width="500" Height="389" HorizontalAlignment="Center" VerticalAlignment="Center">
+                    --><!--<MediaElement.Effect>
+                        <DropShadowEffect Color="#FFD3D3D3" Direction="-50" ShadowDepth="4" Opacity="0.9" />
+                    </MediaElement.Effect>--><!--
+                </MediaElement >-->
+                <Grid Grid.Row="1" Grid.Column="1" ClipToBounds="True">
+                    <StackPanel x:Name="SplCarouse" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0" >
+                        <Image x:Name="ImgCarouse1" Source="/SkinImages/ImgCarousel/CM_Carousel_1.png"/>
+                        <Image Source="/SkinImages/ImgCarousel/CM_Carousel_2.png"/>
+                        <Image Source="/SkinImages/ImgCarousel/CM_Carousel_3.png"/>
+                        <Image Source="/SkinImages/ImgCarousel/CM_Carousel_1.png"/>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="0" Background="#FF4B95FF"></Grid>
+                <Grid Grid.Row="1" Grid.Column="2" Background="#FF4B95FF"></Grid>
+            </Grid>
+            <!--创建-->
+            <Grid Grid.Column="1">
+                <Border Background="White" Margin="10,31,30,30"  CornerRadius="15" >
+                    <Grid>
+                        <Image Source="/SkinImages/ImgCarousel/CM_RightDown.png" HorizontalAlignment="Right" VerticalAlignment="Top" Width="65" />
+                        <!--创建内页 375-->
+                        <Grid Margin="20,0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="100*"/>
+                                <RowDefinition Height="80*"/>
+                                <RowDefinition Height="80*"/>
+                                <RowDefinition Height="115*"/>
+                            </Grid.RowDefinitions>
+                            <Grid Grid.Row="0">
+                                <Label Content="创建" FontSize="21" Foreground="#FF4B62EA" VerticalAlignment="Top" HorizontalAlignment="Left"  Margin="0,42,0,0"/>
+                            </Grid>
+                            <!--讲解名称-->
+                            <Grid Grid.Row="1">
+                                <StackPanel VerticalAlignment="Center">
+                                    <Label Content="讲解名称:" FontSize="12" Foreground="#FF666666"/>
+                                    <TextBox x:Name="txbExplainName" Text="微课1" FontSize="14" Foreground="#FF999999" BorderBrush="{x:Null}" BorderThickness="0" Margin="5,5"/>
+                                    <Label Background="#FF317EEC" Height="1.5"/>
+                                </StackPanel>
+                            </Grid>
+                            <!--存放路径-->
+                            <Grid Grid.Row="2">
+
+                                <StackPanel VerticalAlignment="Center">
+                                    <Label Content="存放路径:" FontSize="12" Foreground="#FF666666"/>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="150"/>
+                                            <ColumnDefinition Width="45"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBox Grid.Column="0" x:Name="txbStoragePath" Text="D:\" FontSize="14" Foreground="#FF999999" BorderBrush="{x:Null}" BorderThickness="0" Margin="5,5"/>
+                                        <Button Grid.Column="1" Cursor="Hand" x:Name="btnBrowse" FontSize="14" BorderBrush="#cccccc" BorderThickness="1" Click="BtnBrowse_Click" Content="浏览" Style="{StaticResource Button_Menu}" Background="#F7F7F7" Margin="0,5,0,0"/>
+                                    </Grid>
+                                    <Label Background="#FF317EEC" Height="1.5"/>
+                                </StackPanel>
+                                <!--<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="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" FontSize="18" Width="80" Height="43" BorderBrush="#cccccc" BorderThickness="1" Click="BtnBrowse_Click" Content="浏览" Style="{StaticResource Button_Menu}"
                                 Background="#F7F7F7" Margin="11,0,0,0"/>
-        </StackPanel>
-        <!--第四行 开始按钮-->
-        <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" IsDefault="True" 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 BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="3">
-                        <Border.Background>#38ADFF</Border.Background>
-                        <ContentPresenter
+                            </StackPanel>-->
+                            </Grid>
+                            <!--按钮-->
+                            <Grid Grid.Row="3">
+                                <Label x:Name="LblCreate" Content="创建微课中..." FontSize="12" Foreground="#FF999999" HorizontalAlignment="Right" Visibility="Hidden"/>
+                                <Button  Cursor="Hand" Grid.Row="3" x:Name="BtnStart" IsDefault="True" Content="开始" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,0,30" Click="BtnStart_Click" Grid.ColumnSpan="2" Width="195" HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalContentAlignment="Center" Height="33">
+                                    <Button.Template>
+                                        <ControlTemplate TargetType="{x:Type Button}">
+                                            <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="20">
+                                                <Border.Background>#FF1D64DA</Border.Background>
+                                                <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Content="{TemplateBinding ContentControl.Content}" />
-                    </Border>
-                </ControlTemplate>
-            </Button.Template>
-        </Button>
+                                            </Border>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
+                        </Grid>
+                    </Grid>
+                </Border>
+            </Grid>
+            <Button Grid.Column="1" Cursor="Hand" x:Name="btnDown" Content="×" VerticalAlignment="Top" Foreground="#FFFFFF" FontSize="25" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click" Padding="5,0"/>
+        </Grid>        
+        <Grid Visibility="Collapsed">
+            <!--分4行-->
+            <Grid.RowDefinitions>
+                <RowDefinition Height="45"/>
+                <RowDefinition Height="110"/>
+                <RowDefinition Height="70"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <!--第一行 标题 FFE9E9E9  FF2D8CF0-->
+            <Grid x:Name="GridTitle" Visibility="Visible" Margin="-1,0" Grid.Row="0" Background="#FF38ADFF" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+                <TextBlock Text="创建微课" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
+                <!--<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>
+            <Grid x:Name="GridTitle_Black" Visibility="Collapsed" Margin="0,0" Grid.Row="0" Background="#FFE9E9E9" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+                <TextBlock Text="创建微课" Foreground="#FF333333" FontSize="16" Padding="10,13,0,0"/>
+                <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown_Black" Content="×" VerticalAlignment="Top" Foreground="#FF333333" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
+            </Grid>
+            <!--第二行 讲解名称-->
+            <!--第三行 存放路径-->
+        </Grid>
     </Grid>
 </Window>

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -7,6 +7,7 @@ using System.Windows.Forms;
 using System.Windows.Input;
 
 using XHWK.Model;
+using XHWK.WKTool.Skin;
 
 namespace XHWK.WKTool
 {
@@ -19,28 +20,12 @@ namespace XHWK.WKTool
         private FolderBrowserDialog ofd;
         private DialogResult result;
         #endregion
-
         /// <summary>
         /// 创建微课
         /// </summary>
         public CreateAMicroLessonWindow()
         {
             InitializeComponent();
-            if (APP.SkinStyle == "Blue")
-            {
-                GridTitle.Visibility = Visibility.Visible;
-                GridTitle_Black.Visibility = Visibility.Collapsed;
-            }
-            else if (APP.SkinStyle == "Black")
-            {
-                GridTitle.Visibility = Visibility.Collapsed;
-                GridTitle_Black.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                GridTitle.Visibility = Visibility.Visible;
-                GridTitle_Black.Visibility = Visibility.Collapsed;
-            }
             ResizeMode = ResizeMode.NoResize;
             new Thread(o =>
             {
@@ -73,8 +58,106 @@ namespace XHWK.WKTool
             }
             txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
             //APP.FFmpeg.GetMToFFmpeg();
+
+            LoadingCarouseImg();
         }
 
+        #region 轮播图
+        /// <summary>
+        /// 图片宽度，每次切换的宽度
+        /// </summary>
+        double ImgWidth = 502.00;
+        /// <summary>
+        /// 轮播时移动增加的宽度
+        /// </summary>
+        double ImgMove = 1;
+        /// <summary>
+        /// 当前展示的图片序号Index从0开始
+        /// </summary>
+        int ImgNumIndex = 0;
+        /// <summary>
+        /// 加载录播图
+        /// </summary>
+        void LoadingCarouseImg()
+        {
+            new Thread(new ThreadStart(new Action(() =>
+            {
+                Thread.Sleep(3000);
+                Dispatcher.Invoke(() =>
+                {
+                    ImgWidth = ImgCarouse1.ActualWidth;
+                    ImgMove = ImgWidth / 250.00;
+                    CarouseImg();
+                    //timesCarouse = new System.Timers.Timer(2000);
+                    //timesCarouse.Elapsed += TimesCarouse_Elapsed; ;
+                    //timesCarouse.Start();
+                });
+            }))).Start();
+        }
+        /// <summary>
+        /// 轮播图
+        /// </summary>
+        void CarouseImg()
+        {
+            new Thread(new ThreadStart(new Action(() =>
+            {
+                while(true)
+                {
+                    for (double i = ImgMove; i < ImgWidth; i += ImgMove)
+                    {
+                        Dispatcher.Invoke(() =>
+                        {
+                            if (Math.Abs(i + ImgMove) < ImgWidth)
+                            {
+                            //图片移动轮播
+                            SplCarouse.Margin = new Thickness(SplCarouse.Margin.Left - ImgMove, 0, 0, 0);
+                            }
+                            else
+                            {
+                                if (ImgNumIndex >= 2)
+                                {
+                                    ImgNumIndex = 0;
+                                    SplCarouse.Margin = new Thickness(0, 0, 0, 0);
+                                }
+                                else
+                                {
+                                    ImgNumIndex++;
+                                    SplCarouse.Margin = new Thickness(-(ImgNumIndex * ImgWidth), 0, 0, 0);
+                                }
+                            }
+                        });
+                        Thread.Sleep(3);
+                    }
+                    bool IsBreak = false;
+                    Dispatcher.Invoke(() =>
+                    {
+                        if (this.Visibility != Visibility.Visible)
+                        {
+                            SplCarouse.Margin = new Thickness(0);
+                            IsBreak = true;
+                        }
+                    });
+                    Thread.Sleep(5000);
+                    if (IsBreak)
+                    {
+                        break;
+                    }
+                }
+
+            }))).Start();
+        }
+        /// <summary>
+        /// 轮播图切换
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TimesCarouse_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            //SplCarouse
+            //ImgCarouse1
+        }
+        #endregion
+
         #region 事件
         /// <summary>
         /// 关闭
@@ -115,6 +198,7 @@ namespace XHWK.WKTool
                 }
             }
         }
+        bool IsPressButton = false;
         /// <summary>
         /// 开始
         /// </summary>
@@ -122,6 +206,21 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
+            #region 防止连击
+            if (IsPressButton)
+            {
+                return;
+            }
+            else
+            {
+                IsPressButton = true;
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Thread.Sleep(500);
+                    IsPressButton = false;
+                }))).Start();
+            }
+            #endregion
             #region 合法性判断
             if (string.IsNullOrWhiteSpace(txbExplainName.Text.Trim()))
             {
@@ -133,56 +232,78 @@ namespace XHWK.WKTool
                 MessageWindow.Show("路径不可为空！");
                 return;
             }
-            #endregion
-            string wkpath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/";
-            //读取微课数据
-            APP.ReadWkData(wkpath);
-            if (APP.WKData == null)
+            try
             {
-                APP.WKData = new Model.Model_WKData
-                {
-                    WkPath = wkpath,
-                    WkName = txbExplainName.Text,
-                    WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
-                };
+                FileToolsCommon.CreateDirectory(txbStoragePath.Text.Trim());
             }
-            //创建文件夹
-            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-            FileToolsCommon.DeleteDirectory(wkpath + "temp");
-            FileToolsCommon.DeleteDirectory(wkpath + "temprs");
-            //存储文件
-            FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Text);
-            APP.ReadDrawData();
-            #region 微课不允许有多个视频 废弃
-            ////判断微课是否存在，存在则询问
-            //if (APP.WKDataList != null&& APP.WKDataList.Count>0)
-            //{
-            //    if (APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
-            //    {
-            //        MessageBoxResult dr = MessageWindow.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)
+            catch (Exception ex)
             {
-                //double proportion = 1036.0 / 1276.0;
-                APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
-                //APP.W_XHMicroLessonSystemWindow.Width = proportion * (PrimaryScreen.ScaleScreenSize().Height-40);
-                //APP.W_XHMicroLessonSystemWindow.Height =/*1276-*/ PrimaryScreen.ScaleScreenSize().Height-40;
-                //APP.W_XHMicroLessonSystemWindow .Topmost = true;
+                MessageWindow.Show("路径无法访问，解决方案：\r\n1,检查路径是否可访问。\r\n2,关闭杀毒软件或信任软件。");
+                return;
             }
-            APP.W_XHMicroLessonSystemWindow.Show();
-            Hide();
+            #endregion
+            LblCreate.Visibility = Visibility.Visible;
+            string wkpath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/";
+            string StoragePath = txbStoragePath.Text;
+            new Thread(new ThreadStart(new Action(() =>
+            {
+                //读取微课数据
+                APP.ReadWkData(wkpath);
+                if (APP.WKData == null)
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        APP.WKData = new Model.Model_WKData
+                        {
+                            WkPath = wkpath,
+                            WkName = txbExplainName.Text,
+                            WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                        };
+                    });
+                }
+                //创建文件夹
+                FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+                FileToolsCommon.DeleteDirectory(wkpath + "temp");
+                FileToolsCommon.DeleteDirectory(wkpath + "temprs");
+                //存储文件
+                FileToolsCommon.SetConfigValue("VideoSavePath", StoragePath);
+                APP.ReadDrawData();
+                #region 微课不允许有多个视频 废弃
+                ////判断微课是否存在，存在则询问
+                //if (APP.WKDataList != null&& APP.WKDataList.Count>0)
+                //{
+                //    if (APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
+                //    {
+                //        MessageBoxResult dr = MessageWindow.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
+
+                Dispatcher.Invoke(() =>
+                {
+                    if (APP.W_XHMicroLessonSystemWindow == null)
+                    {
+                        //double proportion = 1036.0 / 1276.0;
+                        APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+                        //APP.W_XHMicroLessonSystemWindow.Width = proportion * (PrimaryScreen.ScaleScreenSize().Height-40);
+                        //APP.W_XHMicroLessonSystemWindow.Height =/*1276-*/ PrimaryScreen.ScaleScreenSize().Height-40;
+                        //APP.W_XHMicroLessonSystemWindow .Topmost = true;
+                    }
+                    APP.W_XHMicroLessonSystemWindow.Show();
+                    LblCreate.Visibility = Visibility.Hidden;
+                    Hide();
+                });
+            }))).Start();
         }
 
         private double screeHeight = SystemParameters.FullPrimaryScreenHeight;

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -268,7 +268,7 @@ namespace XHWK.WKTool.DAL
 
                             #region 合并文件
                             //合并文件
-                            bool isres = ReportFileMerge(APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
+                            bool isres = ReportFileMerge(APP.UserInfo.cloudcode + "/" + APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
                             if (isres)
                             {
                                 VideoInfo.IsUpload = true;
@@ -374,7 +374,7 @@ namespace XHWK.WKTool.DAL
 
                         #region 合并文件
                         //合并文件
-                        bool isres = ReportFileMerge(APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
+                        bool isres = ReportFileMerge(APP.UserInfo.cloudcode + "/" + APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
                         if (isres)
                         {
                             //VideoInfo.IsUpload = true;

XHWK.WKTool/DAL/Interface.cs

@@ -282,6 +282,7 @@ namespace XHWK.WKTool.DAL
                     dic.Add("directorid", model.directorid);
                 }
                 dic.Add("duration", model.duration);
+                dic.Add("subjectid", model.subjectid);
                 dic.Add("imgUrl", model.imgUrl);
                 dic.Add("level", model.level);
                 dic.Add("lsbid", model.lsbid);

XHWK.WKTool/DeviceWindow.xaml

@@ -3,6 +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:gif="http://wpfanimatedgif.codeplex.com"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
         Title="设备检测" AllowsTransparency="True"
@@ -87,7 +88,7 @@
             <RowDefinition Height="50"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <Grid x:Name="GridTitle_Black" Margin="0,0" Grid.Row="0" Background="#FFE9E9E9" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+        <Grid x:Name="GridTitle_Black" Margin="0,0" Grid.Row="0" Background="#FFF1F2F8" MouseLeftButtonDown="Window_MouseLeftButtonDown">
             <TextBlock Text="设备检测" Foreground="#FF333333" FontSize="16" Padding="10,13,0,0" Grid.RowSpan="2"/>
             <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown_Black" Content="×" VerticalAlignment="Top" Foreground="#FF333333" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
         </Grid>
@@ -98,26 +99,26 @@
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0">
                 <Border BorderBrush="#FFE9E9E9" BorderThickness="1" CornerRadius="7">
-                    <StackPanel Margin="0,10">
-                        <Button x:Name="BtnCamera"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="15,10,0,10" HorizontalAlignment="Left" VerticalAlignment="Stretch" Click="BtnCamera_Click">
+                    <StackPanel Margin="0,10" VerticalAlignment="Center">
+                        <Button x:Name="BtnCamera"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,10,0,10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnCamera_Click">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="/BlackImages/Device_Camera.png"  Margin="6,0" HorizontalAlignment="Left"/>
                                 <TextBlock  Text="摄像头" FontSize="20" Padding="0,2,0,0" HorizontalAlignment="Center"/>
                             </StackPanel>
                         </Button>
-                        <Button x:Name="BtnSpeaker"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="15,10,0,10" HorizontalAlignment="Left" VerticalAlignment="Stretch" Click="BtnSpeaker_Click">
+                        <Button x:Name="BtnSpeaker"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,10,0,10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnSpeaker_Click">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="/BlackImages/Device_Voice.png"  Margin="6,0" HorizontalAlignment="Left"/>
                                 <TextBlock  Text="扬声器" FontSize="20" Padding="0,2,0,0" HorizontalAlignment="Center"/>
                             </StackPanel>
                         </Button>
-                        <Button x:Name="BtnMicrophone" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="15,10,0,10" HorizontalAlignment="Left" VerticalAlignment="Stretch" Click="BtnMicrophone_Click">
+                        <Button x:Name="BtnMicrophone" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,10,0,10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnMicrophone_Click">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="/BlackImages/Device_Microphone.png"  Margin="6,0" HorizontalAlignment="Left"/>
                                 <TextBlock  Text="麦克风" FontSize="20" Padding="0,2,0,0" HorizontalAlignment="Center"/>
                             </StackPanel>
                         </Button>
-                        <Button x:Name="BtnDetectionPage"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="15,10,0,10" HorizontalAlignment="Left" VerticalAlignment="Stretch" Click="BtnDetectionPage_Click">
+                        <Button x:Name="BtnDetectionPage"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,10,0,10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnDetectionPage_Click">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="/BlackImages/Device_JC.png"  Margin="6,0" HorizontalAlignment="Left"/>
                                 <TextBlock  Text="设备检测" FontSize="20" Padding="0,2,0,0" HorizontalAlignment="Center"/>
@@ -183,13 +184,25 @@
                     </Button>
                 </Grid>
             </Grid>
-            <Grid x:Name="GridCamera" Grid.Column="1" Visibility="Collapsed">
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,20,0,0">
+            <Grid x:Name="GridCamera" Grid.Column="1" Visibility="Visible">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="66*"/>
+                    <RowDefinition Height="250*"/>
+                    <RowDefinition Height="70*"/>
+                </Grid.RowDefinitions>
+                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,20,0,0">
                     <TextBlock Text="摄像头：" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
                     <ComboBox Text="请选择" Cursor="Hand" Width="210" x:Name="CmbCameraList" Padding="30,0,10,0" Style="{StaticResource stlComboBox}" BorderThickness="0" DisplayMemberPath="Value" FontSize="14" SelectedValuePath="Key" Background="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
                 </StackPanel>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,60,0,0">
-                    <Button x:Name="BtnCameraSave" Grid.Row="2" Width="70" Height="30" Content="设置" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="10,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnCameraSave_Click">
+                <Grid Grid.Row="1" Width="300" Height="250" HorizontalAlignment="Left" VerticalAlignment="Top"  Margin="30,0,0,0" Background="#FFF1F2F8">
+                    <Image x:Name="imgPlayer" Visibility="Visible" RenderTransformOrigin="0.5,0.5" >
+                        <Image.RenderTransform>
+                            <ScaleTransform ScaleX="-1"/>
+                        </Image.RenderTransform>
+                    </Image>
+                </Grid>
+                <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,15,0,0">
+                    <Button x:Name="BtnCameraStat" Width="70" Height="30" Content="播放" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnCameraStat_Click">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="7">
@@ -201,24 +214,24 @@
                             </ControlTemplate>
                         </Button.Template>
                     </Button>
-                    <Button x:Name="BtnCameraStat" Grid.Row="2" Width="70" Height="30" Content="检测" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="10,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnCameraStat_Click">
+                    <Button x:Name="BtnCameraStop" Width="70" Height="30" Content="停止" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="10,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnCameraStop_Click">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="7">
                                     <Border.Background>
-                                        <Brush>#2E8CF0</Brush>
+                                        <Brush>#CCCCCC</Brush>
                                     </Border.Background>
                                     <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding Content}" />
                                 </Border>
                             </ControlTemplate>
                         </Button.Template>
                     </Button>
-                    <Button x:Name="BtnCameraStop" Grid.Row="2" Width="70" Height="30" Content="停止" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="10,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnCameraStop_Click">
+                    <Button x:Name="BtnCameraSave" Width="70" Height="30" Content="设置" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="80,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnCameraSave_Click">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="7">
                                     <Border.Background>
-                                        <Brush>#CCCCCC</Brush>
+                                        <Brush>#2E8CF0</Brush>
                                     </Border.Background>
                                     <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding Content}" />
                                 </Border>
@@ -226,11 +239,56 @@
                         </Button.Template>
                     </Button>
                 </StackPanel>
-                <Image x:Name="imgPlayer" Width="300" Height="250"  HorizontalAlignment="Left"  Margin="30,100,0,0" VerticalAlignment="Top" Visibility="Visible"/>
             </Grid>
             <Grid x:Name="GridSpeaker" Grid.Column="1" Visibility="Collapsed">
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,20,0,0">
-                    <Button x:Name="BtnSpeakerDetection" Grid.Row="2" Width="100" Height="30" Content="播放音频" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="10,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnSpeakerDetection_Click" >
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="56*"/>
+                    <RowDefinition Height="180*"/>
+                    <RowDefinition Height="150*"/>
+                </Grid.RowDefinitions>
+                <Grid Grid.Row="0">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,20,0,0">
+                        <Button x:Name="BtnSpeakerDetection" Grid.Row="2" Width="100" Height="30" Content="播放音频" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnSpeakerDetection_Click" >
+                            <Button.Template>
+                                <ControlTemplate TargetType="{x:Type Button}">
+                                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="7">
+                                        <Border.Background>
+                                            <Brush>#2E8CF0</Brush>
+                                        </Border.Background>
+                                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding Content}" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Button.Template>
+                        </Button>
+
+                        <MediaElement x:Name="MediaAudio" Stretch="Fill" LoadedBehavior="Manual" Width="0" Volume="1" MediaOpened="MediaAudio_MediaOpened" MediaEnded="MediaAudio_MediaEnded" Visibility="Hidden"/>
+                        <!--<Slider x:Name="timelineSlider" Minimum="0" VerticalAlignment="Center"  BorderThickness="0,5,0,0" Width="150" Height="30" />-->
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="1">
+                    <!--<MediaElement Source="/SkinImages/Other/Dev_AcousticWave2.gif" OpacityMask="#FF000000" HorizontalAlignment="Left" Margin="10,0,0,0" LoadedBehavior="{Binding ElementName=MediaAudio,Path=LoadedBehavior}"/>-->
+                    <Grid  Margin="30,0,127,0" Background="#FFF1F2F8">
+                        <Image x:Name="ImgAcousticWave" gif:ImageBehavior.AnimatedSource="/SkinImages/Other/Dev_AcousticWave2.gif" gif:ImageBehavior.AutoStart="True" gif:ImageBehavior.RepeatBehavior="Forever" HorizontalAlignment="Left" VerticalAlignment="Top" Visibility="Hidden"/>
+                    </Grid>
+                </Grid>
+                <Grid Grid.Row="2">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,0,0,0">
+                        <TextBlock Text="声音采集：" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
+                        <TextBlock x:Name="TbxSpeakerDetection" Text="待检测" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
+                    </StackPanel>
+                </Grid>
+            </Grid>
+            <Grid x:Name="GridMicrophone" Grid.Column="1" Visibility="Collapsed">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="50*"/>
+                    <RowDefinition Height="45*"/>
+                    <RowDefinition Height="196*"/>
+                    <RowDefinition Height="95*"/>
+                </Grid.RowDefinitions>
+                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0">
+                    <TextBlock Text="麦克风：" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
+                    <ComboBox Text="请选择" Cursor="Hand" Width="210" x:Name="CmbMicrophoneList" Padding="30,0,10,0" Style="{StaticResource stlComboBox}" BorderThickness="0" DisplayMemberPath="Value" FontSize="14" SelectedValuePath="Key" Background="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                    <Button x:Name="BtnMicrophoneSave" Grid.Row="2" Width="70" Height="30" Content="设置" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="10,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnMicrophoneSave_Click">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="7">
@@ -242,21 +300,9 @@
                             </ControlTemplate>
                         </Button.Template>
                     </Button>
-                    
-                    <MediaElement x:Name="MediaAudio" Stretch="Fill" LoadedBehavior="Manual" Width="0" Volume="1" MediaOpened="MediaAudio_MediaOpened" MediaEnded="MediaAudio_MediaEnded" Visibility="Hidden"/>
-                    <!--<Slider x:Name="timelineSlider" Minimum="0" VerticalAlignment="Center"  BorderThickness="0,5,0,0" Width="150" Height="30" />-->
-                </StackPanel>
-
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,60,0,0">
-                    <TextBlock Text="声音采集：" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
-                    <TextBlock x:Name="TbxSpeakerDetection" Text="待检测" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
                 </StackPanel>
-            </Grid>
-            <Grid x:Name="GridMicrophone" Grid.Column="1" Visibility="Visible">
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,20,0,0">
-                    <TextBlock Text="麦克风：" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
-                    <ComboBox Text="请选择" Cursor="Hand" Width="210" x:Name="CmbMicrophoneList" Padding="30,0,10,0" Style="{StaticResource stlComboBox}" BorderThickness="0" DisplayMemberPath="Value" FontSize="14" SelectedValuePath="Key" Background="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
-                    <Button x:Name="BtnMicrophoneSave" Grid.Row="2" Width="70" Height="30" Content="设置" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="10,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnMicrophoneSave_Click">
+                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0">
+                    <Button x:Name="BtnMicrophoneDetection" Width="100" Height="30" Content="开始录音" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnMicrophoneDetection_Click" >
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="7">
@@ -268,9 +314,8 @@
                             </ControlTemplate>
                         </Button.Template>
                     </Button>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,60,0,0">
-                    <Button x:Name="BtnMicrophoneDetection" Grid.Row="2" Width="100" Height="30" Content="开始录音" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnMicrophoneDetection_Click" >
+                
+                    <Button x:Name="BtnMicrophoneDetectionPlay" Width="100" Height="30" Content="播放" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnMicrophoneDetectionPlay_Click" Margin="10,0,0,0" >
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="7">
@@ -282,25 +327,19 @@
                             </ControlTemplate>
                         </Button.Template>
                     </Button>
+                    <MediaElement x:Name="MediaAudioMicPlay" Stretch="Fill" LoadedBehavior="Manual" Width="0" Volume="1" MediaEnded="MediaAudioMicPlay_MediaEnded" Visibility="Hidden"/>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,100,0,0">
+                <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,0,0,0">
                     <TextBlock Text="麦克风采集：" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
                     <TextBlock x:Name="TbxMicrophoneDetection" Text="待检测" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
                 </StackPanel>
-                <Button x:Name="BtnMicrophoneDetectionPlay" Content="播放" Foreground="White" FontSize="15" IsDefault="True" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,142,347,214" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnMicrophoneDetectionPlay_Click" >
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="7">
-                                <Border.Background>
-                                    <Brush>#2E8CF0</Brush>
-                                </Border.Background>
-                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding Content}" />
-                            </Border>
-                        </ControlTemplate>
-                    </Button.Template>
-                </Button>
-                <MediaElement x:Name="MediaAudioMicPlay" Stretch="Fill" LoadedBehavior="Manual" Width="0" Volume="1" MediaEnded="MediaAudioMicPlay_MediaEnded" Visibility="Hidden"/>
-
+                <!--<StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0">
+                </StackPanel>-->
+                <Grid Grid.Row="2">
+                <Grid x:Name="GridMicImg" Margin="30,0,0,0" Background="#FFF1F2F8" Width="320" Height="180" HorizontalAlignment="Left" Visibility="Visible">
+                    <Image x:Name="ImgMicAcousticWave" gif:ImageBehavior.AnimatedSource="/SkinImages/Other/Dev_AcousticWave2.gif" gif:ImageBehavior.AutoStart="True" gif:ImageBehavior.RepeatBehavior="Forever" HorizontalAlignment="Left" VerticalAlignment="Top" Visibility="Hidden"/>
+                </Grid>
+                </Grid>
             </Grid>
         </Grid>
     </Grid>

XHWK.WKTool/DeviceWindow.xaml.cs

@@ -223,27 +223,40 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnCameraSave_Click(object sender, RoutedEventArgs e)
         {
-            for (int i = 0; i < CameraHelper.CameraDevices.Count; i++)
+            try
             {
-                if (CameraHelper.CameraDevices[i].Name == "screen-capture-recorder")
+                for (int i = 0; i < CameraHelper.CameraDevices.Count; i++)
                 {
-                    continue;
+                    if (CameraHelper.CameraDevices[i].Name == "screen-capture-recorder")
+                    {
+                        continue;
+                    }
+                    if (CameraHelper.CameraDevices[i].Name == CmbCameraList.Text)
+                    {
+                        APP.CameraName = CameraHelper.CameraDevices[i].Name;
+                    }
                 }
-                if (CameraHelper.CameraDevices[i].Name == CmbCameraList.Text)
+                if (times != null && times.Enabled == true)
                 {
-                    APP.CameraName = CameraHelper.CameraDevices[i].Name;
+                    times.Enabled = false;
                 }
+                imgPlayer.Visibility = Visibility.Hidden;
+                try
+                {
+                    CameraHelper.CloseDevice();
+                }
+                catch (Exception)
+                {
+                }
+                I = 9999;
+                MessageWindow.Show("设置成功！");
             }
-            times.Enabled = false;
-            imgPlayer.Visibility = Visibility.Hidden;
-            try
-            {
-                CameraHelper.CloseDevice();
-            }
-            catch (Exception)
+            catch (Exception ex)
             {
+                APP.CameraName = "";
+                MessageWindow.Show("当前无法设置摄像头！");
+                LogHelper.WriteErrLog("【摄像头检测】（DeviceWindow）当前无法设置摄像头：" + ex.Message, ex);
             }
-            I = 9999;
             //APP.CameraListIndex = CmbCameraList.SelectedIndex;
         }
         /// <summary>
@@ -359,7 +372,7 @@ namespace XHWK.WKTool
                 Dispatcher.Invoke(() =>
                 {
                     MediaAudio.Play();
-
+                    ImgAcousticWave.Visibility = Visibility.Visible;
                 });
                 Thread.Sleep(4000);
                 #region 检测扬声器
@@ -383,6 +396,7 @@ namespace XHWK.WKTool
 
                 Dispatcher.Invoke(() =>
                 {
+                    ImgAcousticWave.Visibility = Visibility.Hidden;
                     BtnSpeakerDetection.Content = "再次检测";
                     BtnSpeakerDetection.IsEnabled = true;
                 });
@@ -451,6 +465,8 @@ namespace XHWK.WKTool
         private void BtnMicrophoneDetection_Click(object sender, RoutedEventArgs e)
         {
             BtnMicrophoneDetectionPlay.Visibility = Visibility.Hidden;
+            ImgMicAcousticWave.Visibility = Visibility.Hidden;
+            //GridMicImg.Visibility = Visibility.Hidden;
             string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
             FileToolsCommon.CreateDirectory(AudioPath);
             string audioMicrophonePath = AudioPath + "adoM" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".mp3";
@@ -461,13 +477,21 @@ namespace XHWK.WKTool
             {
                 #region 检测麦克风
                 bool Record = APP.FFmpeg.StartRecordAudio(audioMicrophonePath, APP.MicrophoneName, false);
-                Thread.Sleep(5000);
+                for (int i = 5; i > 0; i--)
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        TbxMicrophoneDetection.Text = "录制中..." + i + "s";
+                    });
+                    Thread.Sleep(1000);
+                }
                 if (Record)
                 {
                     Dispatcher.Invoke(() =>
                     {
                         TbxMicrophoneDetection.Text = "录制成功";
                         BtnMicrophoneDetectionPlay.Visibility = Visibility.Visible;
+                        //GridMicImg.Visibility = Visibility.Visible;
                         MediaAudioMicPlay.Source = new Uri(audioMicrophonePath);
                     });
                 }
@@ -478,6 +502,7 @@ namespace XHWK.WKTool
                     {
                         TbxMicrophoneDetection.Text = "不可用";
                         BtnMicrophoneDetectionPlay.Visibility = Visibility.Hidden;
+                        //GridMicImg.Visibility = Visibility.Hidden;
                     });
                 }
                 APP.FFmpeg.StopRecordAudio(1);
@@ -498,6 +523,7 @@ namespace XHWK.WKTool
         {
             BtnMicrophoneDetectionPlay.Content = "播放中";
             BtnMicrophoneDetectionPlay.IsEnabled = false;
+            ImgMicAcousticWave.Visibility = Visibility.Visible;
             MediaAudioMicPlay.Play();
         }
         /// <summary>
@@ -511,6 +537,7 @@ namespace XHWK.WKTool
             MediaAudioMicPlay.Position = TimeSpan.Zero;
             BtnMicrophoneDetectionPlay.Content = "播放";
             BtnMicrophoneDetectionPlay.IsEnabled = true;
+            ImgMicAcousticWave.Visibility = Visibility.Hidden;
         }
         #endregion
 
@@ -586,6 +613,7 @@ namespace XHWK.WKTool
             HidePage();
             GridMicrophone.Visibility = Visibility.Visible;
             BtnMicrophoneDetectionPlay.Visibility = Visibility.Hidden;
+            ImgMicAcousticWave.Visibility = Visibility.Hidden;
             string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
             FileToolsCommon.DeleteDirectory(AudioPath);
 

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -645,5 +645,6 @@ namespace XHWK.WKTool
         /// 文件路径
         /// </summary>
         public string FilePath { get; set; }
+
     }
 }

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -353,6 +353,12 @@ namespace ComeCapture
             ShowInTaskbar = false;
             //this.Hide();
             //_Bitmap.Dispose();
+
+            if (ChangeTextEvent != null)
+            {
+                k_hook.Stop();
+                ChangeTextEvent("取消");
+            }
         }
 
         #endregion 退出截图

XHWK.WKTool/KeyVerification.xaml.cs

@@ -6,6 +6,7 @@ using System.Threading;
 using System.Windows;
 
 using XHWK.WKTool.DAL;
+using XHWK.WKTool.Skin;
 
 namespace XHWK.WKTool
 {

XHWK.WKTool/LoginWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="LoginWindow" Height="358" Width="471"   AllowsTransparency="True"
+        Title="LoginWindow" Height="497" Width="312"   AllowsTransparency="True"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
     WindowStyle="None"  BorderThickness="7">
@@ -72,63 +72,91 @@
             </Setter>
         </Style>
     </Window.Resources>
-    <Grid Background="#FFFFFF">
-        <!--分5行-->
-        <Grid.RowDefinitions>
-            <RowDefinition Height="45"/>
-            <RowDefinition Height="80"/>
-            <RowDefinition Height="80"/>
-            <RowDefinition Height="50"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-        <!--第一行 标题-->
-        <Grid x:Name="GridTitle" Visibility="Visible" Grid.Row="0" Margin="-1,0" Background="#38ADFF">
-            <TextBlock Text="登录星火微课系统" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-            <Button  Cursor="Hand"  Grid.Row="0" x:Name="btnDown" Content="×" Background="Transparent" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource NoMouseOverButtonStyle}" Click="BtnDown_Click"/>
-        </Grid>
-        <Grid x:Name="GridTitle_Black" Visibility="Collapsed" Grid.Row="0" Margin="0,0" Background="#FFE9E9E9">
-            <TextBlock Text="登录星火微课系统" Foreground="#FF333333" FontSize="16" Padding="10,13,0,0"/>
-            <Button  Cursor="Hand"  Grid.Row="0" x:Name="btnDown_Black" Content="×" Background="Transparent" Foreground="#FF333333" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource NoMouseOverButtonStyle}" Click="BtnDown_Click"/>
-        </Grid>
-        <!--第二行 登录 账号-->
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="30,30,30,0">
-            <TextBlock Text="登录" FontSize="18" Padding="2,15,10,0"/>
-            <!--输入框-->
-            <Border Background="#cccbce" Width="344" Height="43" CornerRadius="3" Margin="0,0,0,1">
-                <TextBox x:Name="txbAccountNumber" InputMethod.IsInputMethodEnabled="False" PreviewTextInput="txbAccountNumber_PreviewTextInput"  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="30,30,0,1">
-            <TextBlock Text="密码" FontSize="18" Padding="2,15,10,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="32,10,0,0">
-            <Viewbox Height="23">
-                <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>
+    <Grid>
+        <Border Background="White" CornerRadius="15" MouseLeftButtonDown="Border_MouseLeftButtonDown" >
+            <Grid>
+                <Image Source="/SkinImages/ImgCarousel/CM_RightDown.png" HorizontalAlignment="Right" VerticalAlignment="Top" Width="80" />
+                <!--创建内页 375-->
+                <Grid Margin="20,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="100*"/>
+                        <RowDefinition Height="70*"/>
+                        <RowDefinition Height="70*"/>
+                        <RowDefinition Height="15*"/>
+                        <RowDefinition Height="120*"/>
+                    </Grid.RowDefinitions>
+                    <Grid Grid.Row="0">
+                        <StackPanel Margin="0,30,0,0">
+                            <Label Content="登录" FontSize="28" Foreground="#FF4B62EA" VerticalAlignment="Top" HorizontalAlignment="Left"  />
+                            <Label Content="星火微课系统" FontSize="14" Foreground="#FF000000" VerticalAlignment="Top" HorizontalAlignment="Left" />
+                        </StackPanel>
+                    </Grid>
+                    <!--讲解名称-->
+                    <Grid Grid.Row="1">
+                        <StackPanel VerticalAlignment="Center">
+                            <Label Content="账号:" FontSize="12" Foreground="#FF666666"/>
+                            <TextBox x:Name="txbAccountNumber" InputMethod.IsInputMethodEnabled="False" PreviewTextInput="txbAccountNumber_PreviewTextInput"  Text="" FontSize="14" Foreground="#FF999999" BorderBrush="{x:Null}" BorderThickness="0" Margin="5,5"/>
+                            <Label Background="#FF317EEC" Height="1.5"/>
+                        </StackPanel>
+                    </Grid>
+                    <!--存放路径-->
+                    <Grid Grid.Row="2">
+                        <StackPanel VerticalAlignment="Center">
+                            <Label Content="密码:" FontSize="12" Foreground="#FF666666"/>
+                            <PasswordBox x:Name="pobPassword" FontSize="14" Foreground="#FF999999" PasswordChar="*" BorderBrush="{x:Null}" BorderThickness="0"  Margin="5,5"/>
+                            <Label Background="#FF317EEC" Height="1.5"/>
+                        </StackPanel>
+                        <!--<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="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" FontSize="18" Width="80" Height="43" BorderBrush="#cccccc" BorderThickness="1" Click="BtnBrowse_Click" Content="浏览" Style="{StaticResource Button_Menu}"
+                                Background="#F7F7F7" Margin="11,0,0,0"/>
+                            </StackPanel>-->
+                    </Grid>
+                    <!--按钮-->
+                    <Grid Grid.Row="3">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                            <Viewbox VerticalAlignment="Center" Margin="0,0,5,0">
+                                <CheckBox Cursor="Hand"  x:Name="ckSaveName" Click="CkSaveName_Click"   Style="{DynamicResource CheckBoxStyle1}"/>
+                            </Viewbox>
+                            <TextBlock Text="记住账号" FontSize="10" VerticalAlignment="Center" Foreground="#FFB2B2B2"/>
+                        </StackPanel>
 
-        <!--第五行 开始按钮-->
-        <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" IsDefault="True">
-            <Button.Template>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Border
-                                BorderBrush="{TemplateBinding Control.BorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="3">
-                        <Border.Background>#38ADFF</Border.Background>
-                        <ContentPresenter
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
-                    </Border>
-                </ControlTemplate>
-            </Button.Template>
-        </Button>
+                        <Label x:Name="LblCreate" Content="创建微课中..." FontSize="12" Foreground="#FF999999" HorizontalAlignment="Right" Visibility="Hidden" Margin="0"/>
+                    </Grid>
+                    <Grid Grid.Row="4">
+                        <Button  Cursor="Hand" x:Name="btnStart" IsDefault="True" Content="登录" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,0,50" Click="BtnStart_Click" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
+                            <Button.Template>
+                                <ControlTemplate TargetType="{x:Type Button}">
+                                    <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="20">
+                                        <Border.Background>#FF1D64DA</Border.Background>
+                                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding ContentControl.Content}" Margin="0,5" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Button.Template>
+                        </Button>
+                        <Button Cursor="Hand" x:Name="BtnStop" IsDefault="True" Content="关闭" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,40,0,0" Click="BtnDown_Click" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalContentAlignment="Center" Padding="2" VerticalContentAlignment="Center">
+                            <Button.Template>
+                                <ControlTemplate TargetType="{x:Type Button}">
+                                    <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="20">
+                                        <Border.Background>#FFC3C3C3</Border.Background>
+                                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding ContentControl.Content}" Margin="0,5" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Button.Template>
+                        </Button>
+                    </Grid>
+                </Grid>
+            </Grid>
+        </Border>
     </Grid>
 </Window>

XHWK.WKTool/LoginWindow.xaml.cs

@@ -24,21 +24,21 @@ namespace XHWK.WKTool
         public LoginWindow()
         {
             InitializeComponent();
-            if (APP.SkinStyle == "Blue")
-            {
-                GridTitle.Visibility = Visibility.Visible;
-                GridTitle_Black.Visibility = Visibility.Collapsed;
-            }
-            else if (APP.SkinStyle == "Black")
-            {
-                GridTitle.Visibility = Visibility.Collapsed;
-                GridTitle_Black.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                GridTitle.Visibility = Visibility.Visible;
-                GridTitle_Black.Visibility = Visibility.Collapsed;
-            }
+            //if (APP.SkinStyle == "1")
+            //{
+            //    GridTitle.Visibility = Visibility.Visible;
+            //    GridTitle_Black.Visibility = Visibility.Collapsed;
+            //}
+            //else if (APP.SkinStyle == "2")
+            //{
+            //    GridTitle.Visibility = Visibility.Collapsed;
+            //    GridTitle_Black.Visibility = Visibility.Visible;
+            //}
+            //else
+            //{
+            //    GridTitle.Visibility = Visibility.Visible;
+            //    GridTitle_Black.Visibility = Visibility.Collapsed;
+            //}
             Initialize();
         }
         public void Initialize()
@@ -135,12 +135,12 @@ namespace XHWK.WKTool
                 txbAccountNumber.Text = string.Empty;
                 pobPassword.Password = string.Empty;
                 #region 下载头像
-                //string HeadpicPath = FileToolsCommon.GetFileAbsolutePath("/Data/"+APP.UserInfo.Username+".png");
-                //if (!string.IsNullOrWhiteSpace(APP.UserInfo.Headpic))
-                //{
-                //    //FileToolsCommon.
-                //    @interface.DownloadAvatar(APP.UserInfo.Headpic, HeadpicPath);
-                //}
+                string HeadpicPath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + ".png");
+                if (!string.IsNullOrWhiteSpace(APP.UserInfo.Headpic))
+                {
+                    //FileToolsCommon.
+                    @interface.DownloadAvatar(APP.UserInfo.Headpic, HeadpicPath);
+                }
                 #endregion
                 #region 登录后 根据用户名设置微课路径 废弃
                 //APP.WKData.WkPath += APP.UserInfo.Username + "/";
@@ -254,5 +254,10 @@ namespace XHWK.WKTool
             {
             }
         }
+
+        private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            DragMove();
+        }
     }
 }

XHWK.WKTool/MinToolbar.xaml.cs

@@ -24,23 +24,30 @@ namespace XHWK.WKTool
             Topmost = true;
 
         }
-        public void Initialize(double top, int ColorType)
+        /// <summary>
+        /// 初始化隐藏工具栏位置颜色
+        /// </summary>
+        /// <param name="top"></param>
+        /// <param name="ColorType"></param>
+        public void Initialize(double top,double ThisHeight)
         {
             var desktopWorkingArea = System.Windows.SystemParameters.WorkArea;
-            this.Left = desktopWorkingArea.Right - this.Width + 7;
-            this.Top = top;
-            if (ColorType == 0)//Blue
-            {
-                BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2D8CF0"));
-            }
-            else if (ColorType == 1)//Black
-            {
-                BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#364044"));
-            }
-            else
-            {
-                BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2D8CF0"));
-            }
+            Left = desktopWorkingArea.Right - this.Width + 7;
+            Top = top;
+            BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FF638AFF"));
+            Height = ThisHeight;
+            //if (ColorType == 0)//Blue
+            //{
+            //    BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2D8CF0"));
+            //}
+            //else if (ColorType == 1)//Black
+            //{
+            //    BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#364044"));
+            //}
+            //else
+            //{
+            //    BorderBlack.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2D8CF0"));
+            //}
             // + 330;
             //Console.WriteLine(this.Top + "min");
         }

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -368,7 +368,7 @@ namespace XHWK.WKTool
             Hide();
         }
         /// <summary>
-        /// 鼠标中建点击
+        /// 鼠标中键点击
         /// </summary>
         void SwitchPages()
         {

XHWK.WKTool/ProductVerification.xaml.cs

@@ -7,6 +7,7 @@ using System.Windows;
 
 using XHWK.Model;
 using XHWK.WKTool.DAL;
+using XHWK.WKTool.Skin;
 
 namespace XHWK.WKTool
 {

XHWK.WKTool/Properties/AssemblyInfo.cs

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

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="ScreenRecordingToolbarWindow" Height="300" Width="400" AllowsTransparency="True" 
+        Title="ScreenRecordingToolbarWindow" Height="58" Width="423" AllowsTransparency="True" 
         Topmost="True"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -14,9 +14,200 @@
         <SolidColorBrush Opacity="0" Color="#292C2E" />
     </Window.Background>
     <Grid>
-        <Viewbox>
+        <Grid x:Name="GridSrToobar" Visibility="Visible" MouseLeftButtonDown="Grid_MouseLeftButtonDown"  MouseLeave="gridToobarTwo_MouseLeave">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="56*"/>
+                <ColumnDefinition Width="361*"/>
+            </Grid.ColumnDefinitions>
+            <Border Grid.ColumnSpan="2"  Background="White" BorderBrush="#FF638AFF"  BorderThickness="3" CornerRadius="29"/>
+            <!--开始暂停-->
+            <Grid Grid.Column="0">
+                <Button Visibility="Visible" x:Name="BtnRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" ToolTip="开始" Click="BtnRecordingScreen_Click">
+                    <Button.Template>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Image x:Name="BtnImages"  Source="/SkinImages/SR/SR_Start.png" />
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Start_MI.png"/>
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="True">
+                                    <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Start.png"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Start.png"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Button.Template>
+                </Button>
+                <Button Visibility="Collapsed" x:Name="BtnRecordingScreenPause"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" ToolTip="暂停" Click="BtnRecordingScreen_Click">
+                    <Button.Template>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Image x:Name="BtnImages"  Source="/SkinImages/SR/SR_Pause.png" />
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Pause_MI.png"/>
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="True">
+                                    <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Pause.png"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Pause.png"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Button.Template>
+                </Button>
+            </Grid>
+            <!--其他按钮-->
+            <Grid Grid.Column="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="10*"/>
+                    <RowDefinition Height="38*"/>
+                    <RowDefinition Height="10*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="10*"/>
+                    <ColumnDefinition Width="38*"/>
+                    <ColumnDefinition Width="28*"/>
+                    <ColumnDefinition Width="92*"/>
+                    <ColumnDefinition Width="28*"/>
+                    <ColumnDefinition Width="38*"/>
+                    <ColumnDefinition Width="4*"/>
+                    <ColumnDefinition Width="38*"/>
+                    <ColumnDefinition Width="28*"/>
+                    <ColumnDefinition Width="38*"/>
+                    <ColumnDefinition Width="17*"/>
+                </Grid.ColumnDefinitions>
+                <Grid Grid.Row="1" Grid.Column="1">
+                    <!--停止-->
+                    <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Click="BtnStopRecordingScreen_Click" ToolTip="停止">
+                        <Button.Template>
+                            <ControlTemplate TargetType="{x:Type Button}">
+                                <Image x:Name="BtnImages"  Source="/SkinImages/SR/SR_Stop.png" />
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Stop_MI.png"/>
+                                    </Trigger>
+                                    <Trigger Property="IsPressed" Value="True">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Stop.png"/>
+                                    </Trigger>
+                                    <Trigger Property="IsEnabled" Value="False">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Stop_N.png"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="2">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*"/>
+                        <RowDefinition Height="20*"/>
+                        <RowDefinition Height="9*"/>
+                    </Grid.RowDefinitions>
+                    <Label Grid.Row="1" Background="#FF638AFF" Width="2" Padding="5" Margin="0"/>
+                </Grid>
+                <Grid Grid.Row="0" Grid.Column="3" Grid.RowSpan="3" >
+                    <Label x:Name="TxbTime" Content="00:00" FontSize="36" Foreground="#FF3F6FFF" Visibility="Visible" FontFamily="/星火微课;component/Resources/#Quartz" Padding="0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.Column="1"/>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="4">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*"/>
+                        <RowDefinition Height="20*"/>
+                        <RowDefinition Height="9*"/>
+                    </Grid.RowDefinitions>
+                    <Label Grid.Row="1" Background="#FF638AFF" Width="2" Padding="5" Margin="0"/>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="5">
+                    <!--蓝笔-->
+                    <Button x:Name="BtnPenBlue" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Click="BtnBrush_Click" ToolTip="批注">
+                        <Button.Template>
+                            <ControlTemplate TargetType="{x:Type Button}">
+                                <Image x:Name="BtnImages"  Source="/SkinImages/SR/SR_PenBlue.png" />
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_PenBlue_MI.png"/>
+                                    </Trigger>
+                                    <Trigger Property="IsPressed" Value="True">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_PenBlue_CL.png"/>
+                                    </Trigger>
+                                    <Trigger Property="IsEnabled" Value="False">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_PenBlue_N.png"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                    <!--选中-->
+                    <Button x:Name="BtnPenBlue_CL" Visibility="Collapsed" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Click="BtnBrush_Click" ToolTip="批注">
+                        <Button.Template>
+                            <ControlTemplate TargetType="{x:Type Button}">
+                                <Image x:Name="BtnImages"  Source="/SkinImages/SR/SR_PenBlue_CL.png" />
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="7">
+                    <!--红笔-->
+                    <Button x:Name="BtnPenRed" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Click="BtnBlackPenTwo_Click" ToolTip="批注">
+                        <Button.Template>
+                            <ControlTemplate TargetType="{x:Type Button}">
+                                <Image x:Name="BtnImages"  Source="/SkinImages/SR/SR_PenRed.png" />
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_PenRed_MI.png"/>
+                                    </Trigger>
+                                    <Trigger Property="IsPressed" Value="True">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_PenRed_CL.png"/>
+                                    </Trigger>
+                                    <Trigger Property="IsEnabled" Value="False">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_PenRed_N.png"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                    <!--选中-->
+                    <Button x:Name="BtnPenRed_CL" Visibility="Collapsed" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Click="BtnBlackPenTwo_Click" ToolTip="批注">
+                        <Button.Template>
+                            <ControlTemplate TargetType="{x:Type Button}">
+                                <Image x:Name="BtnImages"  Source="/SkinImages/SR/SR_PenRed_CL.png" />
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*"/>
+                        <RowDefinition Height="20*"/>
+                        <RowDefinition Height="9*"/>
+                    </Grid.RowDefinitions>
+                    <Label Grid.Row="1" Background="#FF638AFF" Width="2" Padding="5" Margin="0"/>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="9">
+                    <!--返回-->
+                    <Button x:Name="BtnReturn" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Click="BtnReturn_Click" ToolTip="返回">
+                        <Button.Template>
+                            <ControlTemplate TargetType="{x:Type Button}">
+                                <Image x:Name="BtnImages"  Source="/SkinImages/SR/SR_Out.png" />
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Out_MI.png"/>
+                                    </Trigger>
+                                    <Trigger Property="IsEnabled" Value="False">
+                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Out_N.png"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                </Grid>
+            </Grid>
+        </Grid>
+        <Viewbox Visibility="Collapsed">
             <StackPanel>
-                <Viewbox x:Name="VbxBlue" Visibility="Visible">
+                <Viewbox Visibility="Collapsed">
                     <Grid x:Name="gridToobar" MouseLeftButtonDown="Grid_MouseLeftButtonDown">
                         <Image x:Name="imgCanvas" Visibility="Collapsed"/>
                         <InkCanvas x:Name="blackboard_canvas" Background="Transparent" Visibility="Collapsed" Grid.RowSpan="2" />
@@ -71,133 +262,8 @@
                                 <Button  Cursor="Hand" x:Name="btnCrude" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="10" Width="20" Margin="0,10,0,0" Click="BtnCrude_Click"/>
                             </StackPanel>
                         </Grid>
-                        <Grid x:Name="gridToobarTwo" MouseLeave="gridToobarTwo_MouseLeave">
-                            <Image Source="./Images/Toobar0.png"/>
-                            <StackPanel HorizontalAlignment="Left" Margin="43,25,0,0" VerticalAlignment="Center">
-                                <Button x:Name="BtnRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" ToolTip="开始" Click="BtnRecordingScreen_Click">
-                                    <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar26.png"/>
-                                </Button>
-                                <TextBlock x:Name="txbTime" Text="00:00" FontSize="20" Foreground="#FFFFFF" Visibility="Hidden"/>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,15,0">
-                                <!--<Button x:Name="BtnRecordingScreen"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnRecordingScreen_Click">
-                                   <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar25.png"/>
-                                   </Button>-->
-                                <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnStopRecordingScreen_Click" ToolTip="停止">
-                                    <Border Background="#2d8cf0" CornerRadius="22">
-                                        <Image x:Name="ImgEndRecordingScreen" Source="./Images/Toobar15.png" Margin="5,5,5,5"/>
-                                    </Border>
-                                </Button>
-                                <Button  Cursor="Hand" x:Name="btnBlackPenOne" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnBrush_Click" ToolTip="批注">
-                                    <Border x:Name="borOne" Background="#2d8cf0" CornerRadius="22">
-                                        <Image x:Name="imgBlackPenOne" Source="./Images/31.png" Margin="5,5,5,5"/>
-                                    </Border>
-                                </Button>
-                                <Button  Cursor="Hand" x:Name="btnBlackPenTwo" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnBlackPenTwo_Click" ToolTip="批注">
-                                    <Border x:Name="borTwo" Background="#2d8cf0" CornerRadius="22">
-                                        <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,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>
-                                </Button>
-                            </StackPanel>
-                        </Grid>
                     </Grid>
                 </Viewbox>
-                <Viewbox x:Name="VbxBlack" Visibility="Visible">
-                    <Border x:Name="BorderBlack" BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="10"  MouseLeftButtonDown="Grid_MouseLeftButtonDown" MouseLeave="gridToobarTwo_MouseLeave">
-                        <Border.Background>#FF262633</Border.Background>
-                        <Grid x:Name="GridToobar_Black" Height="50" Margin="3" Width="390">
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,0">
-                                <Button Visibility="Collapsed" x:Name="BtnRecordingScreenPause_Black" HorizontalAlignment="Left"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="5" ToolTip="暂停" Click="BtnRecordingScreen_Click">
-                                    <Image Source="/BlackImages/SR_Pause.png" />
-                                </Button>
-                                <Button x:Name="BtnRecordingScreen_Black" HorizontalAlignment="Left"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="5" ToolTip="开始" Click="BtnRecordingScreen_Click">
-                                    <Image>
-                                        <Image.Resources>
-                                            <Style TargetType="{x:Type Image}">
-                                                <Setter Property="Source" Value="/BlackImages/SR_Start.png"/>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsMouseOver" Value="True">
-                                                        <Setter Property="Cursor" Value="Hand"/>
-                                                        <Setter Property="Source" Value="/BlackImages/SR_Start_MI.png"/>
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Image.Resources>
-                                    </Image>
-                                </Button>
-                                <Button x:Name="BtnStopRecordingScreen_Black" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="5" Click="BtnStopRecordingScreen_Click" ToolTip="停止">
-                                    <Image>
-                                        <Image.Resources>
-                                            <Style TargetType="{x:Type Image}">
-                                                <Setter Property="Source" Value="/BlackImages/SR_Stop.png"/>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsEnabled" Value="False">
-                                                        <Setter Property="Cursor" Value="Hand"/>
-                                                        <Setter Property="Source" Value="/BlackImages/SR_Stop_N.png"/>
-
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Image.Resources>
-                                    </Image>
-                                </Button>
-                                <TextBlock Text="|" FontSize="30" Foreground="#FF48555A" Margin="5,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                                <TextBlock x:Name="txbTime_Black" Text="00:00" FontSize="40" Foreground="#FFFFFF" Margin="5,0" Visibility="Visible" FontFamily="/星火微课;component/Resources/#Quartz" VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                                <TextBlock Text="|" FontSize="30" Foreground="#FF48555A" Margin="5,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                                <Button Cursor="Hand" x:Name="btnBlackPenOne_Black" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="5" Click="BtnBrush_Click" ToolTip="批注">
-                                    <Image>
-                                        <Image.Resources>
-                                            <Style TargetType="{x:Type Image}">
-                                                <Setter Property="Source" Value="/BlackImages/SR_PenBlue.png"/>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsEnabled" Value="False">
-                                                        <Setter Property="Cursor" Value="Hand"/>
-                                                        <Setter Property="Source" Value="/BlackImages/SR_Pen_N.png"/>
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Image.Resources>
-                                    </Image>
-                                </Button>
-                                <Button  Cursor="Hand" x:Name="btnBlackPenTwo_Black" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="5" Click="BtnBlackPenTwo_Click" ToolTip="批注">
-                                    <Image>
-                                        <Image.Resources>
-                                            <Style TargetType="{x:Type Image}">
-                                                <Setter Property="Source" Value="/BlackImages/SR_PenRed.png"/>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsEnabled" Value="False">
-                                                        <Setter Property="Cursor" Value="Hand"/>
-                                                        <Setter Property="Source" Value="/BlackImages/SR_Pen_N.png"/>
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Image.Resources>
-                                    </Image>
-                                </Button>
-                                <Button  Cursor="Hand" x:Name="btnReturn_Black" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="5" Click="BtnReturn_Click" ToolTip="返回">
-                                    <Image>
-                                        <Image.Resources>
-                                            <Style TargetType="{x:Type Image}">
-                                                <Setter Property="Source" Value="/BlackImages/SR_Out.png"/>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsEnabled" Value="False">
-                                                        <Setter Property="Cursor" Value="Hand"/>
-                                                        <Setter Property="Source" Value="/BlackImages/SR_Out_N.png"/>
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Image.Resources>
-                                    </Image>
-                                </Button>
-                            </StackPanel>
-                        </Grid>
-                    </Border>
-                </Viewbox>
             </StackPanel>
         </Viewbox>
     </Grid>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -32,7 +32,7 @@ namespace XHWK.WKTool
         private bool IsFirstRS = true;
 
         /// <summary>
-        /// 是否暂停
+        /// 是否停止/暂停中
         /// </summary>
         private bool IsSuspend = true;
 
@@ -75,34 +75,13 @@ namespace XHWK.WKTool
             InitializeComponent();
             ResizeMode = ResizeMode.NoResize;
 
-            if (APP.SkinStyle == "Blue")
-            {
-                Width = 300;
-                VbxBlue.Visibility = Visibility.Visible;
-                VbxBlack.Visibility = Visibility.Collapsed;
-            }
-            else if (APP.SkinStyle == "Black")
-            {
-                Width = 400;
-                VbxBlue.Visibility = Visibility.Collapsed;
-                VbxBlack.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                VbxBlue.Visibility = Visibility.Visible;
-                VbxBlack.Visibility = Visibility.Collapsed;
-            }
-            //Width = 300;
-            //VbxBlue.Visibility = Visibility.Visible;
-            //VbxBlack.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 初始化
         /// </summary>
         public void Initialize()
         {
-            gridToobar.Visibility = Visibility.Visible;
-            BorderBlack.Visibility = Visibility.Visible;
+            GridSrToobar.Visibility = Visibility.Visible;
             if (APP.W_PracticeWindow == null)
             {
                 APP.W_PracticeWindow = new PracticeWindow
@@ -129,13 +108,8 @@ namespace XHWK.WKTool
             }))).Start();
             APP.W_PracticeWindow.Hide();
 
-            //timer = new System.Timers.Timer(200);
-            //timer.Interval = 300;
-            //timer.Elapsed += new System.Timers.ElapsedEventHandler(TimerDealy);
-            //timer.Enabled = true; //启动计时器
-
-            borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-            borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+            //borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+            //borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
             flg = 0;
 
 
@@ -150,39 +124,28 @@ namespace XHWK.WKTool
             drawingAttributes.FitToCurve = true;
             //隐藏画笔工具栏
             //BtnToolbarDown_Click(null, null);
-            gridToolbar.Visibility = Visibility.Hidden;
-            gridColour.Visibility = Visibility.Hidden;
-            gridThickness.Visibility = Visibility.Hidden;
-            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
-            BtnRecordingScreen_Black.Visibility = Visibility.Visible;
-            BtnRecordingScreenPause_Black.Visibility = Visibility.Collapsed;
-            ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
+            //GridSrToobar.Visibility = Visibility.Hidden;
+            //gridColour.Visibility = Visibility.Hidden;
+            //gridThickness.Visibility = Visibility.Hidden;
+            BtnRecordingScreen.Visibility = Visibility.Visible;
+            BtnRecordingScreenPause.Visibility = Visibility.Collapsed;
             BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
-            BtnStopRecordingScreen_Black.IsEnabled = false;
-            BtnRecordingScreenPause_Black.IsEnabled = false;
-            imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
-            btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
-            btnBlackPenOne_Black.IsEnabled = false;
-            imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
-            btnBlackPenTwo.IsEnabled = false;//红笔不可点击
-            btnBlackPenTwo_Black.IsEnabled = false;
-            //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
-            //btnReturn.IsEnabled = true;//返回主界面可点击
-            txbTime.Visibility = Visibility.Hidden;//时间不显示
-            txbTime_Black.Text = "00:00";
-            BtnRecordingScreen.ToolTip = "开始";
+            BtnPenBlue.IsEnabled = false;//蓝笔不可点击
+            BtnPenRed.IsEnabled = false;//红笔不可点击
+            BtnPenBlue.Visibility = Visibility.Visible;
+            BtnPenRed.Visibility = Visibility.Visible;
+            BtnPenBlue_CL.Visibility = Visibility.Collapsed;
+            BtnPenRed_CL.Visibility = Visibility.Collapsed;
+            TxbTime.Content = "00:00";
             if (t == null)
             {
                 t = new DispatcherTimer();
                 t.Tick += OnTimer;
-                t.Interval = new TimeSpan(0, 0, 0, 0, 300);
+                t.Interval = new TimeSpan(0, 0, 0, 0, 200);
                 t.IsEnabled = true;
                 t.Start();
             }
-            t.Interval = new TimeSpan(0, 0, 0, 0, 300);
-            //Stack();
-            //ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
-            //BtnRecordingScreen_Click(null, null);
+            t.Interval = new TimeSpan(0, 0, 0, 0, 200);
         }
 
         private void TimerDealy(object o, EventArgs e)
@@ -247,10 +210,10 @@ namespace XHWK.WKTool
                         DateTime dt = DateTime.Now;
                         TimeSpan ts = dt.Subtract(Recorddt);//时间差   
                         double tsmi = ts.TotalMilliseconds;
-                        if (tsmi > 500.0)
+                        if (tsmi > 1000.0)
                         {
-                            Recorddt = Recorddt.AddMilliseconds(500);
-                            SRTime = SRTime.AddMilliseconds(500);
+                            Recorddt = Recorddt.AddMilliseconds(1000);
+                            SRTime = SRTime.AddMilliseconds(1000);
                         }
                     }
                     break;
@@ -275,16 +238,14 @@ namespace XHWK.WKTool
             {
                 //Dispatcher.Invoke(() =>
                 //{
-                txbTime.Text = SRTime.ToString("HH:mm:ss");
-                txbTime_Black.Text = SRTime.ToString("HH:mm");
+                TxbTime.Content = SRTime.ToString("HH:mm:ss");
                 //});
             }
             else
             {
                 //Dispatcher.Invoke(() =>
                 //{
-                txbTime.Text = SRTime.ToString("mm:ss");
-                txbTime_Black.Text = SRTime.ToString("mm:ss");
+                TxbTime.Content = SRTime.ToString("mm:ss");
                 //});
             }
         }
@@ -432,38 +393,16 @@ namespace XHWK.WKTool
                 }
                 IsSuspend = false;
 
-                //#region 录像倒计时
-                //if (APP.W_CountdownWindow == null)
-                //{
-                //    APP.W_CountdownWindow = new CountdownWindow();
-                //    //APP.W_CountdownWindow.Topmost = true;
-                //}
-                //else
-                //{
-                //    APP.W_CountdownWindow.Initialize();
-                //    //APP.W_CountdownWindow.Topmost = true;
-                //}
-                //APP.W_CountdownWindow.Show();
-                //#endregion
-
-
-                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));//播放状态
-                BtnRecordingScreen_Black.Visibility = Visibility.Collapsed;
-                BtnRecordingScreenPause_Black.Visibility = Visibility.Visible;
-                ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
+                BtnRecordingScreen.Visibility = Visibility.Collapsed;
+                BtnRecordingScreenPause.Visibility = Visibility.Visible;
                 BtnStopRecordingScreen.IsEnabled = true; //停止录制按钮可点击
-                BtnStopRecordingScreen_Black.IsEnabled = true;
-                BtnRecordingScreenPause_Black.IsEnabled = true;
-                imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar27.png"));
-                btnBlackPenOne.IsEnabled = true;//蓝笔可点击
-                btnBlackPenOne_Black.IsEnabled = true;
-                imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar28.png"));
-                btnBlackPenTwo.IsEnabled = true;//红笔可点击
-                btnBlackPenTwo_Black.IsEnabled = true;
-                txbTime.Visibility = Visibility.Visible;//时间显示
-                                                        //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
-                                                        //borOne.Background = new SolidColorBrush(Colors.LightBlue);
-                BtnRecordingScreen.ToolTip = "暂停";
+                BtnPenBlue.IsEnabled = true;//蓝笔可点击
+                BtnPenRed.IsEnabled = true;//红笔可点击
+                BtnPenBlue.Visibility = Visibility.Visible;
+                BtnPenRed.Visibility = Visibility.Visible;
+                BtnPenBlue_CL.Visibility = Visibility.Collapsed;
+                BtnPenRed_CL.Visibility = Visibility.Collapsed;
+                TxbTime.Visibility = Visibility.Visible;//时间显示
 
                 #region 隐藏工具栏
                 if (APP.IsHideSRTool)
@@ -473,21 +412,18 @@ namespace XHWK.WKTool
                         APP.W_MinToolbar = new MinToolbar();
                     }
                     APP.W_MinToolbar.Topmost = true;
-                    double MinToolTop = this.Top + 70;
-                    int ColorType = 0;
-                    if (APP.SkinStyle == "Blue")
-                    {
-                        ColorType = 0;
-                        MinToolTop = this.Top + ((this.ActualHeight - btnReturn.ActualHeight) / 2);//(VbxBlue.ActualHeight -) 
-                    }
-                    else if (APP.SkinStyle == "Black")
-                    {
-                        ColorType = 1;
-                        MinToolTop = this.Top + ((this.ActualHeight - VbxBlack.ActualHeight) / 2);
-                    }
-                    APP.W_MinToolbar.Initialize(MinToolTop, ColorType);
-                    gridToobar.Visibility = Visibility.Hidden;
-                    BorderBlack.Visibility = Visibility.Hidden;
+                    double MinToolTop = Top;
+                    GridSrToobar.Visibility = Visibility.Hidden;
+                    //if (APP.SkinStyle == "1")
+                    //{
+                    //    ColorType = 0;
+                    //    MinToolTop = this.Top + ((this.ActualHeight - btnReturn.ActualHeight) / 2);//(VbxBlue.ActualHeight -) 
+                    //}
+                    //else if (APP.SkinStyle == "2")
+                    //{
+                    //MinToolTop = this.Top + ((this.ActualHeight - VbxBlack.ActualHeight) / 2);
+                    //}
+                    APP.W_MinToolbar.Initialize(MinToolTop,ActualHeight);
                     APP.W_MinToolbar.Show();
                 }
                 #endregion
@@ -505,13 +441,9 @@ namespace XHWK.WKTool
                         //Thread.Sleep(4000);
                         Dispatcher.Invoke(() =>
                         {
-                            ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
                             BtnRecordingScreen.IsEnabled = true;
                             BtnStopRecordingScreen.IsEnabled = true;
-                            BtnStopRecordingScreen_Black.IsEnabled = true;
-                            BtnRecordingScreen_Black.IsEnabled = true;
-                            BtnRecordingScreenPause_Black.IsEnabled = true;
-                            BtnRecordingScreenPause_Black.IsEnabled = true;
+                            BtnRecordingScreenPause.IsEnabled = true;
                         });
                     }))).Start();
                     #endregion
@@ -536,21 +468,18 @@ namespace XHWK.WKTool
                                 MessageWindow.Show(ErrMessage);
                                 //隐藏画笔工具栏
                                 //BtnToolbarDown_Click(null, null);
-                                gridToolbar.Visibility = Visibility.Hidden;
-                                gridColour.Visibility = Visibility.Hidden;
-                                gridThickness.Visibility = Visibility.Hidden;
-                                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
-                                BtnRecordingScreen_Black.Visibility = Visibility.Visible;
-                                BtnRecordingScreenPause_Black.Visibility = Visibility.Collapsed;
-                                ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
+                                //gridToolbar.Visibility = Visibility.Hidden;
+                                //gridColour.Visibility = Visibility.Hidden;
+                                //gridThickness.Visibility = Visibility.Hidden;
+                                BtnRecordingScreen.Visibility = Visibility.Visible;
+                                BtnRecordingScreenPause.Visibility = Visibility.Collapsed;
                                 BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
-                                BtnStopRecordingScreen_Black.IsEnabled = false;
-                                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"));
-                                btnBlackPenTwo.IsEnabled = false;//红笔不可点击
-                                txbTime.Visibility = Visibility.Hidden;//时间不显示
-                                BtnRecordingScreen.ToolTip = "开始";
+                                BtnPenBlue.IsEnabled = false;//蓝笔不可点击
+                                BtnPenRed.IsEnabled = false;//红笔不可点击
+                                BtnPenBlue.Visibility = Visibility.Visible;
+                                BtnPenRed.Visibility = Visibility.Visible;
+                                BtnPenBlue_CL.Visibility = Visibility.Collapsed;
+                                BtnPenRed_CL.Visibility = Visibility.Collapsed;
                                 IsSuspend = true;
                                 IsFirstRS = true;
                                 return;
@@ -569,19 +498,13 @@ namespace XHWK.WKTool
             {
                 TimeOut();
                 IsSuspend = true;
-                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
-                BtnRecordingScreen_Black.Visibility = Visibility.Visible;
-                BtnRecordingScreenPause_Black.Visibility = Visibility.Collapsed;
+                BtnRecordingScreen.Visibility = Visibility.Visible;
+                BtnRecordingScreenPause.Visibility = Visibility.Collapsed;
                 BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
-                BtnStopRecordingScreen_Black.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"));
                 //btnBlackPenTwo.IsEnabled = false;//红笔不可点击
-                txbTime.Visibility = Visibility.Hidden;//时间不显示
-                //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
-                //btnReturn.IsEnabled = true;//返回主界面可点击
 
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
@@ -595,10 +518,8 @@ namespace XHWK.WKTool
                     //Thread.Sleep(2000);
                     Dispatcher.Invoke(() =>
                     {
-                        ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
                         BtnRecordingScreen.IsEnabled = true;
                         BtnStopRecordingScreen.IsEnabled = true;
-                        BtnStopRecordingScreen_Black.IsEnabled = true;
                     });
                 }))).Start();
                 #endregion
@@ -634,16 +555,10 @@ namespace XHWK.WKTool
                 }))).Start();
             }
             #endregion
-            if (APP.W_MinToolbar != null)
-            {
-                APP.W_MinToolbar.Hide();
-            }
             BtnRecordingScreen.ToolTip = "开始";
             k_hook.Stop();
             IsSuspend = true;
-            txbTime.Text = "00:00";
-            txbTime_Black.Text = "00:00";
-            txbTime.Visibility = Visibility.Hidden;
+            TxbTime.Content = "00:00";
             End();
             if (APP.W_PracticeWindow != null)
             {
@@ -653,12 +568,13 @@ namespace XHWK.WKTool
                     APP.W_PracticeWindow.ReturnPractice();
                 }
             }
-            if (gridToolbar.Visibility == Visibility.Visible)
-            {
-                gridToolbar.Visibility = Visibility.Hidden;
-                gridColour.Visibility = Visibility.Hidden;
-                gridThickness.Visibility = Visibility.Hidden;
-            }
+            //if (gridToolbar.Visibility == Visibility.Visible)
+            //{
+            //    GridSrToobar.Visibility = Visibility.Visible;
+            //    gridToolbar.Visibility = Visibility.Hidden;
+            //    gridColour.Visibility = Visibility.Hidden;
+            //    gridThickness.Visibility = Visibility.Hidden;
+            //}
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
@@ -719,6 +635,18 @@ namespace XHWK.WKTool
                         IsFirstRS = true;
                         MessageWindow.Show("录屏时间过短，请重新录制！");
                     }
+
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        Thread.Sleep(700);
+                        Dispatcher.Invoke(() =>
+                        {
+                            if (APP.W_MinToolbar != null)
+                            {
+                                APP.W_MinToolbar.Hide();
+                            }
+                        });
+                    }))).Start();
                 }
                 catch (Exception ex)
                 {
@@ -732,9 +660,8 @@ namespace XHWK.WKTool
             Graphics graphics = Graphics.FromHwnd(IntPtr.Zero);
             float DIP = graphics.DpiX;
             //float DIPY = graphics.DpiY;
-            APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width + 10;
-            gridToobar.Visibility = Visibility.Visible;
-            BorderBlack.Visibility = Visibility.Visible;
+            APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width;
+            GridSrToobar.Visibility = Visibility.Visible;
             APP.W_ScreenRecordingToolbarWindow.Topmost = true;
         }
         #endregion
@@ -786,8 +713,8 @@ namespace XHWK.WKTool
                     {
                         Dispatcher.Invoke(() =>
                         {
-                            borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
-                            borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                            //borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
+                            //borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
                             if (APP.W_PracticeWindow == null)
                             {
                                 APP.W_PracticeWindow = new PracticeWindow
@@ -838,6 +765,10 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBrush_Click(object sender, RoutedEventArgs e)
         {
+            if(BtnPenBlue.Visibility!= Visibility.Visible)
+            {
+                return;
+            }
             #region 防止连击
             if (IsPressButton)
             {
@@ -853,6 +784,10 @@ namespace XHWK.WKTool
                 }))).Start();
             }
             #endregion
+            BtnPenBlue.Visibility = Visibility.Collapsed;
+            BtnPenRed.Visibility = Visibility.Visible;
+            BtnPenBlue_CL.Visibility = Visibility.Visible;
+            BtnPenRed_CL.Visibility = Visibility.Collapsed;
             string time = GetTimeStamp();
             string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
             if (!Directory.Exists(tempPath))
@@ -869,22 +804,22 @@ namespace XHWK.WKTool
             {
                 if (flg == 11)
                 {
-                    Dispatcher.Invoke(() =>
-                    {
-                        borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-                        borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-                    });
+                    //Dispatcher.Invoke(() =>
+                    //{
+                    //    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    //    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    //});
                     flg = 1;
                     //this.Owner = null;
                     APP.W_PracticeWindow.ReturnPractice();
                 }
                 else if (flg == 10)
                 {
-                    Dispatcher.Invoke(() =>
-                    {
-                        borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
-                        borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-                    });
+                    //Dispatcher.Invoke(() =>
+                    //{
+                    //    borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
+                    //    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    //});
                     APP.W_PracticeWindow.Blue();
                     flg = 11;
                 }
@@ -892,11 +827,11 @@ namespace XHWK.WKTool
                 {
                     //new Thread(new ThreadStart(new Action(() =>
                     //{
-                    Dispatcher.Invoke(() =>
-                    {
-                        borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
-                        borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-                    });
+                    //Dispatcher.Invoke(() =>
+                    //{
+                    //    borOne.Background = new SolidColorBrush(Colors.LightSkyBlue);
+                    //    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    //});
 
                     //}))).Start();
                     if (APP.W_PracticeWindow == null)
@@ -1150,6 +1085,10 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBlackPenTwo_Click(object sender, RoutedEventArgs e)
         {
+            if (BtnPenRed.Visibility != Visibility.Visible)
+            {
+                return;
+            }
             #region 防止连击
             if (IsPressButton)
             {
@@ -1165,6 +1104,10 @@ namespace XHWK.WKTool
                 }))).Start();
             }
             #endregion
+            BtnPenBlue.Visibility = Visibility.Visible;
+            BtnPenRed.Visibility = Visibility.Collapsed;
+            BtnPenBlue_CL.Visibility = Visibility.Collapsed;
+            BtnPenRed_CL.Visibility = Visibility.Visible;
             string time = GetTimeStamp();
             string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
             if (!Directory.Exists(tempPath))
@@ -1179,32 +1122,32 @@ namespace XHWK.WKTool
             {
                 if (flg == 10)
                 {
-                    Dispatcher.Invoke(() =>
-                    {
-                        borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-                        borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-                    });
+                    //Dispatcher.Invoke(() =>
+                    //{
+                    //    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    //    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    //});
                     flg = 0;
                     //this.Owner = null;
                     APP.W_PracticeWindow.ReturnPractice();
                 }
                 else if (flg == 11)
                 {
-                    Dispatcher.Invoke(() =>
-                    {
-                        borTwo.Background = new SolidColorBrush(Colors.LightSkyBlue);
-                        borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-                    });
+                    //Dispatcher.Invoke(() =>
+                    //{
+                    //    borTwo.Background = new SolidColorBrush(Colors.LightSkyBlue);
+                    //    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    //});
                     flg = 10;
                     APP.W_PracticeWindow.Red();
                 }
                 else
                 {
-                    Dispatcher.Invoke(() =>
-                    {
-                        borTwo.Background = new SolidColorBrush(Colors.LightSkyBlue);
-                        borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-                    });
+                    //Dispatcher.Invoke(() =>
+                    //{
+                    //    borTwo.Background = new SolidColorBrush(Colors.LightSkyBlue);
+                    //    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                    //});
                     if (APP.W_PracticeWindow == null)
                     {
                         APP.W_PracticeWindow = new PracticeWindow
@@ -1321,14 +1264,8 @@ namespace XHWK.WKTool
                 }
                 k_hook.Stop();
                 BtnRecordingScreen.ToolTip = "开始";
-                if (APP.W_MinToolbar != null)
-                {
-                    APP.W_MinToolbar.Hide();
-                }
                 IsSuspend = true;
-                txbTime.Text = "00:00";
-                txbTime_Black.Text = "00:00";
-                txbTime.Visibility = Visibility.Hidden;
+                TxbTime.Content = "00:00";
                 End();
                 APP.W_PracticeWindow.ReturnPractice();
                 if (APP.W_PracticeWindow != null)
@@ -1375,6 +1312,18 @@ namespace XHWK.WKTool
             APP.W_XHMicroLessonSystemWindow.InitPen();
             APP.W_XHMicroLessonSystemWindow.InitTQLPPen();
             APP.W_XHMicroLessonSystemWindow.Show();
+
+            new Thread(new ThreadStart(new Action(() =>
+            {
+                Thread.Sleep(700);
+                Dispatcher.Invoke(() =>
+                {
+                    if (APP.W_MinToolbar != null)
+                    {
+                        APP.W_MinToolbar.Hide();
+                    }
+                });
+            }))).Start();
             Hide();
         }
         /// <summary>
@@ -1384,11 +1333,11 @@ namespace XHWK.WKTool
         {
             new Thread(new ThreadStart(new Action(() =>
             {
-                Dispatcher.Invoke(() =>
-                {
-                    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-                    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-                });
+                //Dispatcher.Invoke(() =>
+                //{
+                //    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                //    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+                //});
                 flg = 0;
                 Thread.Sleep(500);
                 Dispatcher.Invoke(() =>
@@ -1397,24 +1346,18 @@ namespace XHWK.WKTool
                     APP.W_PracticeWindow.Hide();
                 });
             }))).Start();
-
-
-            //Dispatcher.Invoke(() =>
-            //{
-            //    borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-            //    borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
-            //});
-            //flg = 0;
-            //Thread.Sleep(300);
-            //APP.W_PracticeWindow.Hide();
         }
         /// <summary>
         /// 修改笔状态
         /// </summary>
         public void ModifyState()
         {
-            borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
-            borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+            BtnPenBlue.Visibility = Visibility.Visible;
+            BtnPenRed.Visibility = Visibility.Visible;
+            BtnPenBlue_CL.Visibility = Visibility.Collapsed;
+            BtnPenRed_CL.Visibility = Visibility.Collapsed;
+            //borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+            //borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
         }
 
         /// <summary>
@@ -1438,7 +1381,8 @@ namespace XHWK.WKTool
 
         private void gridToobarTwo_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
         {
-            if (BtnRecordingScreen.ToolTip.ToString().Equals("暂停") && (gridToobar.Visibility == Visibility.Visible || BorderBlack.Visibility == Visibility.Visible))
+            //if (BtnRecordingScreen.ToolTip.ToString().Equals("暂停") && (gridToobar.Visibility == Visibility.Visible || BorderBlack.Visibility == Visibility.Visible))
+            if(BtnRecordingScreenPause.Visibility == Visibility.Visible)
             {
                 if (APP.IsHideSRTool)
                 {
@@ -1448,34 +1392,37 @@ namespace XHWK.WKTool
 
                     }
                     APP.W_MinToolbar.Topmost = true;
-                    double MinToolTop = this.Top + 70;
-                    int ColorType = 0;
-                    if (APP.SkinStyle == "Blue")
-                    {
-                        ColorType = 0;
-                        MinToolTop = this.Top + ((this.ActualHeight - btnReturn.ActualHeight) / 2);
-                    }
-                    else if (APP.SkinStyle == "Black")
-                    {
-                        ColorType = 1;
-                        MinToolTop = this.Top + ((this.ActualHeight - VbxBlack.ActualHeight) / 2);
-                    }
-                    APP.W_MinToolbar.Initialize(MinToolTop, ColorType);
-                    //else
+                    double MinToolTop = Top;
+                    //int ColorType = 0;
+                    //if (APP.SkinStyle == "1")
                     //{
-                    //    APP.W_CountdownWindow.Initialize(true, 1800);
+                    //    ColorType = 0;
+                    //    MinToolTop = this.Top + ((this.ActualHeight - btnReturn.ActualHeight) / 2);
+                    //}
+                    //else if (APP.SkinStyle == "2")
+                    //{
+                    //    ColorType = 1;
+                    //    MinToolTop = this.Top + ((this.ActualHeight - VbxBlack.ActualHeight) / 2);
                     //}
                     new Thread(new ThreadStart(new Action(() =>
                     {
                         Thread.Sleep(500);
                         Dispatcher.Invoke(() =>
                         {
-                            gridToobar.Visibility = Visibility.Hidden;
-                            BorderBlack.Visibility = Visibility.Hidden;
-                            APP.W_MinToolbar.Show();
+                            MouseEventCommon.GetCursorPos(out MouseEventCommon.POINT pointRecord);
+                            if (pointRecord.X >= this.Left && pointRecord.X < this.Left + this.ActualWidth && pointRecord.Y >= this.Top && pointRecord.Y < this.Top + this.ActualHeight)
+                            {
+                                //LblMessage.Content = "在区域内：("+ pointRecord.X+","+pointRecord.Y+") ("+ Left + ","+Top+")";
+                            }
+                            else
+                            {
+                                //LblMessage.Content = "不在区域内：(" + pointRecord.X + "," + pointRecord.Y + ") (" + Left + "," + Top + ")";
+                                APP.W_MinToolbar.Initialize(MinToolTop, ActualHeight);
+                                GridSrToobar.Visibility =  Visibility.Hidden;
+                                APP.W_MinToolbar.Show();
+                            }
                         });
                     }))).Start();
-                    //Console.WriteLine(this.Top+"max");
                 }
             }
         }

XHWK.WKTool/Skin/SkinConfig.cs

@@ -0,0 +1,99 @@
+using Common.system;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace XHWK.WKTool.Skin
+{
+    /// <summary>
+    /// 皮肤配置
+    /// 创建人：赵耀
+    /// 创建时间：2021年6月18日
+    /// </summary>
+    public class SkinConfig
+    {
+        /// <summary>
+        /// 皮肤列表  0白 1蓝 2黑色
+        /// </summary>
+        static List<ResourceDictionary> SkinList = new List<ResourceDictionary>();
+        /// <summary>
+        /// 初始化皮肤
+        /// </summary>
+        public static void InitSkin()
+        {
+            SkinList.Add(new ResourceDictionary()
+            {
+                Source = new Uri("pack://application:,,,/Skin/SkinDictionary_White.xaml", UriKind.Absolute)
+            });
+            SkinList.Add(new ResourceDictionary()
+            {
+                Source = new Uri("pack://application:,,,/Skin/SkinDictionary_TechnologyBlue.xaml", UriKind.Absolute)
+            });
+            int Index = 0;
+            try
+            {
+                Index = int.Parse(APP.SkinStyle);
+            }
+            catch (Exception) {}
+            ChangeSkinResource(SkinList[int.Parse(APP.SkinStyle)]);
+        }
+
+        /// <summary>
+        /// 切换皮肤并保存  0白 1蓝 2黑色
+        /// </summary>
+        /// <param name="Index"> 0白 1蓝 2黑色</param>
+        public static void SwitchSkin(int Index)
+        {
+            if (Index < SkinList.Count)
+            {
+                APP.SkinStyle = Index.ToString();
+
+                FileToolsCommon.SetConfigValue("SkinStyle", APP.SkinStyle);
+                ChangeSkinResource(SkinList[int.Parse(APP.SkinStyle)]);
+
+            }
+
+        }
+
+        /// <summary>
+        /// 更换皮肤资源
+        /// </summary>
+        /// <param name="skin"></param>
+        private static void ChangeSkinResource(ResourceDictionary skin)
+        {
+            if(Application.Current.Resources.MergedDictionaries.Count<1)
+            {
+                Application.Current.Resources.MergedDictionaries.Add(skin);//[0] = new ResourceDictionary();
+                //Application.Current.Resources.MergedDictionaries[0]=skin;
+            }
+            if (Application.Current.Resources.MergedDictionaries[0].Source.IsAbsoluteUri)
+            {
+                if (Application.Current.Resources.MergedDictionaries[0].Source.OriginalString != skin.Source.OriginalString)
+                {
+                    Application.Current.Resources.MergedDictionaries[0] = skin;
+                }
+            }
+            else
+            {
+                if (Application.Current.Resources.MergedDictionaries[0].Source.OriginalString.ToString('\\') != skin.Source.OriginalString.ToString('/'))
+                {
+                    Application.Current.Resources.MergedDictionaries[0] = skin;
+                }
+            }
+        }
+    }
+    /// <summary>
+    /// 扩展方法
+    /// </summary>
+    public static class ExtensionMethod
+    {
+        public static string ToString(this string content, char split)
+        {
+            return content.Split(split).Last();
+        }
+    }
+}

XHWK.WKTool/Skin/SkinDictionary_TechnologyBlue.xaml

@@ -0,0 +1,328 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!--Title背景-->
+    <ImageBrush x:Key="BackTitle" ImageSource="/SkinImages/TechnologyBlue/HM_BJTitle.png"/>
+    <!--工具栏背景-->
+    <ImageBrush x:Key="BackTool" ImageSource="/SkinImages/TechnologyBlue/HM_BJTool.png"/>
+    <!--笔状态图标-->
+    <Style x:Key="TitlePenState"  TargetType="{x:Type Image}">
+        <Setter Property="Source" Value="/SkinImages/TechnologyBlue/HM_PenState.png"/>
+    </Style>
+    <!--笔状态颜色-->
+    <Style x:Key="PenStateColor"  TargetType="TextBlock">
+        <Setter Property="Foreground" Value="#FFFFFFFF"/>
+    </Style>
+    <!--时间图标-->
+    <Style x:Key="TitleLZTimeImg"  TargetType="{x:Type Image}">
+        <Setter Property="Source" Value="/SkinImages/TechnologyBlue/HM_LZIMG.png"/>
+    </Style>
+    <!--LOGO颜色-->
+    <Style x:Key="LogoColor"  TargetType="TextBlock">
+        <Setter Property="Foreground" Value="#FFFFFFFF"/>
+    </Style>
+    <!--消息颜色-->
+    <Style x:Key="TxbMesColor"  TargetType="TextBlock">
+        <Setter Property="Foreground" Value="#FFFFFFFF"/>
+    </Style>
+    <!--登陆颜色-->
+    <Style x:Key="LoginTypeColor"  TargetType="TextBlock">
+        <Setter Property="Foreground" Value="#FFFFFFFF"/>
+    </Style>
+    
+    <!--关闭按钮-->
+    <ControlTemplate x:Key="SkinBtnClose" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="23*"/>
+                <ColumnDefinition Width="72*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="2" x:Name="ImgSetUp" Source="/SkinImages/TechnologyBlue/HM_Close.png"/>
+            <Label Grid.Column="1" x:Name="Word" Content="关闭程序" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/TechnologyBlue/HM_Close_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!--录制按钮-->
+    <ControlTemplate x:Key="SkinBtnRecord" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="23*"/>
+                <ColumnDefinition Width="72*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="2" x:Name="ImgRecord" Source="/SkinImages/TechnologyBlue/Toolbar_LZ.png"/>
+            <Label Grid.Column="1" x:Name="Word" Content="开始录制" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZ_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZ_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZ_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFE3E3E3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--录制暂停按钮-->
+    <ControlTemplate x:Key="SkinBtnRecordSuspend" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="23*"/>
+                <ColumnDefinition Width="72*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="2" x:Name="ImgRecordSuspend" Source="/SkinImages/TechnologyBlue/Toolbar_LZZT.png"/>
+            <Label Grid.Column="1" x:Name="Word" Content="录制暂停" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZZT_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZZT_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LZZT_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFE3E3E3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--录制保存按钮-->
+    <ControlTemplate x:Key="SkinBtnRecordStop" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="23*"/>
+                <ColumnDefinition Width="72*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="2" x:Name="ImgRecordStop" Source="/SkinImages/TechnologyBlue/Toolbar_Save.png"/>
+            <Label Grid.Column="1" x:Name="Word" Content="保存录制" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_Save_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_Save_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_Save_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFE3E3E3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!--录屏按钮-->
+    <ControlTemplate x:Key="SkinBtnScreenRecording" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgScreenRecording" Source="/SkinImages/TechnologyBlue/Toolbar_LP.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="录屏" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LP_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LP_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF333333"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_LP_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--截图按钮-->
+    <ControlTemplate x:Key="SkinBtnScreenshot" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgScreenshot" Source="/SkinImages/TechnologyBlue/Toolbar_JT.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="截图" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_JT_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_JT_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF333333"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_JT_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--导入按钮-->
+    <ControlTemplate x:Key="SkinBtnImport" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgImport" Source="/SkinImages/TechnologyBlue/Toolbar_DR.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="导入" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_DR_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_DR_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF333333"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_DR_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--加页按钮-->
+    <ControlTemplate x:Key="SkinBtnAdd" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgAdd" Source="/SkinImages/TechnologyBlue/Toolbar_JY.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="加页" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_JY_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_JY_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF333333"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_JY_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--打印按钮-->
+    <ControlTemplate x:Key="SkinBtnPrint" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgPrint" Source="/SkinImages/TechnologyBlue/Toolbar_DY.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="打印" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_DY_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_DY_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF333333"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_DY_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--我的按钮-->
+    <ControlTemplate x:Key="SkinBtnMy" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgMy" Source="/SkinImages/TechnologyBlue/Toolbar_MY.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="我的" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_MY_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_MY_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF333333"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_MY_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--检测按钮-->
+    <ControlTemplate x:Key="SkinBtnDevice" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgDevice" Source="/SkinImages/TechnologyBlue/Toolbar_JC.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="检测" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_JC_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_JC_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF333333"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_JC_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--设置按钮-->
+    <ControlTemplate x:Key="SkinBtnSetUp" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgSetUp" Source="/SkinImages/TechnologyBlue/Toolbar_SZ.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="设置" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFFFFFFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_SZ_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_SZ_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF333333"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/TechnologyBlue/Toolbar_SZ_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+</ResourceDictionary>

XHWK.WKTool/Skin/SkinDictionary_White.xaml

@@ -0,0 +1,326 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
+
+    <!--Title背景-->
+    <ImageBrush x:Key="BackTitle"/>
+    <!--工具栏背景-->
+    <ImageBrush x:Key="BackTool"/>
+    <!--笔状态图标-->
+    <Style x:Key="TitlePenState"  TargetType="{x:Type Image}">
+        <Setter Property="Source" Value="/SkinImages/White/HM_PenState.png"/>
+    </Style>
+    <!--笔状态颜色-->
+    <Style x:Key="PenStateColor"  TargetType="TextBlock">
+        <Setter Property="Foreground" Value="#FF298DF1"/>
+    </Style>
+    <!--时间图标-->
+    <Style x:Key="TitleLZTimeImg"  TargetType="{x:Type Image}">
+        <Setter Property="Source" Value="/SkinImages/White/HM_LZIMG.png"/>
+    </Style>
+    <!--LOGO颜色-->
+    <Style x:Key="LogoColor"  TargetType="TextBlock">
+        <Setter Property="Foreground" Value="#FF298DF1"/>
+    </Style>
+    <!--消息颜色-->
+    <Style x:Key="TxbMesColor"  TargetType="TextBlock">
+        <Setter Property="Foreground" Value="#FF000000"/>
+    </Style>
+    <!--登陆颜色-->
+    <Style x:Key="LoginTypeColor"  TargetType="TextBlock">
+        <Setter Property="Foreground" Value="#FF000000"/>
+    </Style>
+    <!--关闭按钮-->
+    <ControlTemplate x:Key="SkinBtnClose" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="23*"/>
+                <ColumnDefinition Width="72*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="2" x:Name="ImgSetUp" Source="/SkinImages/White/HM_Close.png"/>
+            <Label Grid.Column="1" x:Name="Word" Content="关闭程序" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/HM_Close_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF3F6FFF"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--录制按钮-->
+    <ControlTemplate x:Key="SkinBtnRecord" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="23*"/>
+                <ColumnDefinition Width="72*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="2" x:Name="ImgRecord" Source="/SkinImages/White/Toolbar_LZ.png"/>
+            <Label Grid.Column="1" x:Name="Word" Content="开始录制" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF3F6FFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF999999"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--录制暂停按钮-->
+    <ControlTemplate x:Key="SkinBtnRecordSuspend" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="23*"/>
+                <ColumnDefinition Width="72*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="2" x:Name="ImgRecordSuspend" Source="/SkinImages/White/Toolbar_LZZT.png"/>
+            <Label Grid.Column="1" x:Name="Word" Content="录制暂停" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF3F6FFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF999999"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--录制保存按钮-->
+    <ControlTemplate x:Key="SkinBtnRecordStop" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="23*"/>
+                <ColumnDefinition Width="72*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="2" x:Name="ImgRecordStop" Source="/SkinImages/White/Toolbar_Save.png"/>
+            <Label Grid.Column="1" x:Name="Word" Content="保存录制" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF3F6FFF"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_MI.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FF999999"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!--录屏按钮-->
+    <ControlTemplate x:Key="SkinBtnScreenRecording" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgScreenRecording" Source="/SkinImages/White/Toolbar_LP.png" Stretch="Fill" />
+            <Label Grid.Column="1" x:Name="Word" Content="录屏" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--截图按钮-->
+    <ControlTemplate x:Key="SkinBtnScreenshot" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgScreenshot" Source="/SkinImages/White/Toolbar_JT.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="截图" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/White/Toolbar_JT_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/White/Toolbar_JT_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/White/Toolbar_JT_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--导入按钮-->
+    <ControlTemplate x:Key="SkinBtnImport" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgImport" Source="/SkinImages/White/Toolbar_DR.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="导入" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/White/Toolbar_DR_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/White/Toolbar_DR_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/White/Toolbar_DR_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--加页按钮-->
+    <ControlTemplate x:Key="SkinBtnAdd" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgAdd" Source="/SkinImages/White/Toolbar_JY.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="加页" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/White/Toolbar_JY_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/White/Toolbar_JY_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/White/Toolbar_JY_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--打印按钮-->
+    <ControlTemplate x:Key="SkinBtnPrint" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgPrint" Source="/SkinImages/White/Toolbar_DY.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="打印" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/White/Toolbar_DY_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/White/Toolbar_DY_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/White/Toolbar_DY_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--我的按钮-->
+    <ControlTemplate x:Key="SkinBtnMy" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgMy" Source="/SkinImages/White/Toolbar_MY.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="我的" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/White/Toolbar_MY_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/White/Toolbar_MY_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/White/Toolbar_MY_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--检测按钮-->
+    <ControlTemplate x:Key="SkinBtnDevice" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgDevice" Source="/SkinImages/White/Toolbar_JC.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="检测" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/White/Toolbar_JC_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/White/Toolbar_JC_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/White/Toolbar_JC_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <!--设置按钮-->
+    <ControlTemplate x:Key="SkinBtnSetUp" TargetType="{x:Type Button}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="60*"/>
+                <ColumnDefinition Width="40*"/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.ColumnSpan="3" x:Name="ImgSetUp" Source="/SkinImages/White/Toolbar_SZ.png" Stretch="Fill"/>
+            <Label Grid.Column="1" x:Name="Word" Content="设置" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/Toolbar_SZ_MI.png"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/Toolbar_SZ_CL.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/Toolbar_SZ_N.png"/>
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    
+</ResourceDictionary>