界面UI整体更换

设备检测重做
已知BUG修复

XHWK.WKTool/App.config

@@ -9,8 +9,8 @@
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="88" />
-    <add key="VersionName" value="2.6.8" />
+    <add key="VersionCode" value="89" />
+    <add key="VersionName" value="2.6.9" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -123,7 +123,7 @@
                                     VerticalAlignment="Top"
                                     Content="创建"
                                     FontSize="21"
-                                    Foreground="#FF4B62EA" />
+                                    Foreground="#3F6FFF" />
                             </Grid>
                             <!--  讲解名称  -->
                             <Grid Grid.Row="1">
@@ -140,7 +140,7 @@
                                         FontSize="14"
                                         Foreground="#FF999999"
                                         Text="微课1" />
-                                    <Label Height="1.5" Background="#FF317EEC" />
+                                    <Label Height="1.5" Background="#3F6FFF" />
                                 </StackPanel>
                             </Grid>
                             <!--  存放路径  -->
@@ -168,17 +168,18 @@
                                         <Button
                                             x:Name="btnBrowse"
                                             Grid.Column="1"
-                                            Margin="0,5,0,0"
-                                            Background="#F7F7F7"
-                                            BorderBrush="#cccccc"
+                                            Margin="0,5,0,5"
+                                            Padding="4"
+                                            Background="#F1F2F8"
+                                            BorderBrush="#E1E1E1"
                                             BorderThickness="1"
                                             Click="BtnBrowse_Click"
                                             Content="浏览"
                                             Cursor="Hand"
-                                            FontSize="14"
-                                            Style="{StaticResource Button_Menu}" />
+                                            FontSize="12"
+                                            Foreground="#333333" />
                                     </Grid>
-                                    <Label Height="1.5" Background="#FF317EEC" />
+                                    <Label Height="1.5" Background="#3F6FFF" />
                                 </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"/>
@@ -229,7 +230,7 @@
                                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                                 BorderThickness="1"
                                                 CornerRadius="20">
-                                                <Border.Background>#FF1D64DA</Border.Background>
+                                                <Border.Background>#3F6FFF</Border.Background>
                                                 <ContentPresenter
                                                     HorizontalAlignment="Center"
                                                     VerticalAlignment="Center"

XHWK.WKTool/DeviceWindow.xaml

@@ -7,13 +7,13 @@
     xmlns:local="clr-namespace:XHWK.WKTool"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="设备检测"
-    Width="650"
-    Height="450"
+    Width="569"
+    Height="367"
     AllowsTransparency="True"
     BorderBrush="#FFE9E9E9"
     BorderThickness="1"
-    ShowInTaskbar="False"
-    WindowStartupLocation="CenterOwner"
+    ShowInTaskbar="True"
+    WindowStartupLocation="CenterScreen"
     WindowStyle="None"
     mc:Ignorable="d">
 
@@ -140,7 +140,7 @@
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="46" />
+            <RowDefinition Height="42" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid
@@ -160,29 +160,27 @@
                 Grid.Row="0"
                 Width="46"
                 HorizontalAlignment="Right"
-                VerticalAlignment="Top"
                 Click="BtnDown_Click"
                 Content="×"
                 Cursor="Hand"
                 FontSize="30"
-                Foreground="White"
-                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                Foreground="White" />
         </Grid>
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="100*" />
-                <ColumnDefinition Width="300*" />
+                <ColumnDefinition Width="140" />
+                <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0">
                 <Border BorderBrush="#FFE9E9E9" BorderThickness="0,0,1,0">
                     <StackPanel Margin="0,10" VerticalAlignment="Top">
                         <Button
                             x:Name="BtnCamera"
-                            Margin="0,10,0,10"
+                            Height="40"
+                            Margin="0,0,0,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
-                            Click="BtnCamera_Click"
-                            Cursor="Hand"
+                            IsEnabled="False"
                             Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                             <StackPanel Orientation="Horizontal">
                                 <Image
@@ -194,17 +192,19 @@
                                     Width="100"
                                     Padding="0,0,0,0"
                                     HorizontalAlignment="Center"
-                                    FontSize="18"
+                                    FontSize="16"
                                     Text="摄像头" />
                             </StackPanel>
+
+
                         </Button>
                         <Button
                             x:Name="BtnSpeaker"
-                            Margin="0,10,0,10"
+                            Height="40"
+                            Margin="0,0,0,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
-                            Click="BtnSpeaker_Click"
-                            Cursor="Hand"
+                            IsEnabled="False"
                             Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                             <StackPanel Orientation="Horizontal">
                                 <Image
@@ -216,17 +216,18 @@
                                     Width="100"
                                     Padding="0,0,0,0"
                                     HorizontalAlignment="Center"
-                                    FontSize="18"
+                                    FontSize="16"
                                     Text="扬声器" />
                             </StackPanel>
                         </Button>
                         <Button
                             x:Name="BtnMicrophone"
-                            Margin="0,10,0,10"
+                            Height="40"
+                            Margin="0,0,0,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
-                            Click="BtnMicrophone_Click"
                             Cursor="Hand"
+                            IsEnabled="False"
                             Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                             <StackPanel Orientation="Horizontal">
                                 <Image
@@ -238,17 +239,17 @@
                                     Width="100"
                                     Padding="0,0,0,0"
                                     HorizontalAlignment="Center"
-                                    FontSize="18"
+                                    FontSize="16"
                                     Text="麦克风" />
                             </StackPanel>
                         </Button>
                         <Button
                             x:Name="BtnDetectionPage"
-                            Margin="0,10,0,10"
+                            Height="40"
+                            Margin="0,0,0,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
-                            Click="BtnDetectionPage_Click"
-                            Cursor="Hand"
+                            IsEnabled="False"
                             Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                             <StackPanel Orientation="Horizontal">
                                 <Image
@@ -260,187 +261,63 @@
                                     Width="100"
                                     Padding="0,0,0,0"
                                     HorizontalAlignment="Center"
-                                    FontSize="18"
-                                    Text="设备检测" />
+                                    FontSize="16"
+                                    Text="检测结果" />
                             </StackPanel>
                         </Button>
                     </StackPanel>
                 </Border>
             </Grid>
-            <Grid
-                x:Name="GridDetection"
-                Grid.Column="1"
-                Margin="25,15"
-                Visibility="Visible">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="50*" />
-                    <ColumnDefinition Width="50*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="50*" />
-                    <RowDefinition Height="50*" />
-                    <RowDefinition Height="50*" />
-                    <RowDefinition Height="50*" />
-                    <RowDefinition Height="50*" />
-                    <RowDefinition Height="50*" />
-                    <RowDefinition Height="50*" />
-                </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Grid.Column="0">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="18"
-                        Foreground="#FF999999"
-                        Text="设备名称" />
-                </Grid>
-                <Grid Grid.Row="0" Grid.Column="1">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="18"
-                        Foreground="#FF999999"
-                        Text="检测结果" />
-                </Grid>
-                <!--  摄像头  -->
-                <Grid Grid.Row="1" Grid.Column="0">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="17"
-                        Foreground="#FF000000"
-                        Text="摄像头" />
-                </Grid>
-                <Grid Grid.Row="1" Grid.Column="1">
-                    <TextBlock
-                        x:Name="TxbCamera"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="17"
-                        Foreground="#FF000000"
-                        Text="" />
-                </Grid>
-                <!--  扬声器  -->
-                <Grid Grid.Row="2" Grid.Column="0">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="17"
-                        Foreground="#FF000000"
-                        Text="扬声器" />
-                </Grid>
-                <Grid Grid.Row="2" Grid.Column="1">
-                    <TextBlock
-                        x:Name="TxbSpeaker"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="17"
-                        Foreground="#FF000000"
-                        Text="" />
-                </Grid>
-                <!--  麦克风  -->
-                <Grid Grid.Row="3" Grid.Column="0">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="17"
-                        Foreground="#FF000000"
-                        Text="麦克风" />
-                </Grid>
-                <Grid Grid.Row="3" Grid.Column="1">
-                    <TextBlock
-                        x:Name="TxbMicrophone"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="17"
-                        Foreground="#FF000000"
-                        Text="" />
-                </Grid>
 
-                <Grid Grid.Row="6" Grid.Column="1">
-                    <Button
-                        x:Name="BtnDetection"
-                        Grid.Row="2"
-                        Width="116"
-                        Height="46"
-                        Margin="0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Stretch"
-                        Click="BtnDetection_Click"
-                        Content="开始检测"
-                        Cursor="Hand"
-                        FontSize="17"
-                        Foreground="White"
-                        IsDefault="True"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                        <Button.Template>
-                            <ControlTemplate TargetType="{x:Type Button}">
-                                <Border
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="23">
-                                    <Border.Background>
-                                        <Brush>#3f6fff</Brush>
-                                    </Border.Background>
-                                    <ContentPresenter
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Content="{TemplateBinding Content}" />
-                                </Border>
-                            </ControlTemplate>
-                        </Button.Template>
-                    </Button>
-                </Grid>
-            </Grid>
             <Grid
                 x:Name="GridCamera"
                 Grid.Column="1"
-                Visibility="Collapsed">
+                Visibility="Visible">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="66*" />
-                    <RowDefinition Height="250*" />
-                    <RowDefinition Height="70*" />
+                    <RowDefinition Height="64" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="64" />
                 </Grid.RowDefinitions>
                 <StackPanel
                     Grid.Row="0"
-                    Margin="30,20,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Top"
+                    Margin="30,0,0,0"
                     Orientation="Horizontal">
                     <TextBlock
                         Margin="0,5,0,0"
                         HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        FontSize="17"
+                        VerticalAlignment="Center"
+                        FontSize="16"
                         Foreground="#FF000000"
-                        Text="摄像头：" />
+                        Text="摄像头" />
                     <ComboBox
                         x:Name="CmbCameraList"
-                        Width="210"
-                        Padding="30,0,10,0"
+                        Width="236"
+                        Margin="16,0,0,0"
+                        Padding="30,0,0,0"
                         HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
+                        VerticalAlignment="Center"
                         HorizontalContentAlignment="Center"
                         VerticalContentAlignment="Center"
                         Background="White"
                         BorderThickness="0"
                         Cursor="Hand"
-                        DisplayMemberPath="Value"
+                        DisplayMemberPath="Name"
                         FontSize="14"
-                        SelectedValuePath="Key"
+                        SelectionChanged="CmbCameraList_SelectionChanged"
                         Style="{StaticResource stlComboBox}"
                         Text="请选择" />
                 </StackPanel>
                 <Grid
                     Grid.Row="1"
                     Width="300"
-                    Height="250"
+                    Height="160"
                     Margin="30,0,0,0"
                     HorizontalAlignment="Left"
-                    VerticalAlignment="Top"
-                    Background="#FFF1F2F8">
+                    VerticalAlignment="Top">
                     <Image
                         x:Name="imgPlayer"
                         RenderTransformOrigin="0.5,0.5"
+                        Stretch="Fill"
                         Visibility="Visible">
                         <Image.RenderTransform>
                             <ScaleTransform ScaleX="-1" />
@@ -449,103 +326,37 @@
                 </Grid>
                 <StackPanel
                     Grid.Row="2"
-                    Margin="30,15,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Top"
+                    Margin="30,0,0,0"
+                    HorizontalAlignment="Right"
                     Orientation="Horizontal">
                     <Button
-                        x:Name="BtnCameraStat"
-                        Width="70"
-                        Height="30"
-                        Margin="0,0,0,0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Click="BtnCameraStat_Click"
-                        Content="播放"
-                        Cursor="Hand"
-                        FontSize="15"
-                        Foreground="White"
-                        IsDefault="True"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                        <Button.Template>
-                            <ControlTemplate TargetType="{x:Type Button}">
-                                <Border
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="7">
-                                    <Border.Background>
-                                        <Brush>#3f6fff</Brush>
-                                    </Border.Background>
-                                    <ContentPresenter
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Content="{TemplateBinding Content}" />
-                                </Border>
-                            </ControlTemplate>
-                        </Button.Template>
-                    </Button>
-                    <Button
-                        x:Name="BtnCameraStop"
-                        Width="70"
+                        x:Name="btn_camera_good"
+                        Width="100"
                         Height="30"
-                        Margin="10,0,0,0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Click="BtnCameraStop_Click"
-                        Content="停止"
+                        Margin="0,0,10,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Background="#3f6fff"
+                        Click="btn_camera_good_Click"
+                        Content="可以看见"
                         Cursor="Hand"
                         FontSize="15"
                         Foreground="White"
-                        IsDefault="True"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                        <Button.Template>
-                            <ControlTemplate TargetType="{x:Type Button}">
-                                <Border
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="7">
-                                    <Border.Background>
-                                        <Brush>#CCCCCC</Brush>
-                                    </Border.Background>
-                                    <ContentPresenter
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Content="{TemplateBinding Content}" />
-                                </Border>
-                            </ControlTemplate>
-                        </Button.Template>
-                    </Button>
+                        IsDefault="True" />
                     <Button
-                        x:Name="BtnCameraSave"
-                        Width="70"
+                        x:Name="btn_camera_bad"
+                        Width="100"
                         Height="30"
-                        Margin="80,0,0,0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Click="BtnCameraSave_Click"
-                        Content="设置"
+                        Margin="0,0,10,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Background="#F1F2F3"
+                        Click="btn_camera_bad_Click"
+                        Content="看不见"
                         Cursor="Hand"
                         FontSize="15"
-                        Foreground="White"
-                        IsDefault="True"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                        <Button.Template>
-                            <ControlTemplate TargetType="{x:Type Button}">
-                                <Border
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="7">
-                                    <Border.Background>
-                                        <Brush>#3f6fff</Brush>
-                                    </Border.Background>
-                                    <ContentPresenter
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Content="{TemplateBinding Content}" />
-                                </Border>
-                            </ControlTemplate>
-                        </Button.Template>
-                    </Button>
+                        Foreground="#333333"
+                        IsDefault="True" />
                 </StackPanel>
             </Grid>
             <Grid
@@ -553,9 +364,9 @@
                 Grid.Column="1"
                 Visibility="Collapsed">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="56*" />
-                    <RowDefinition Height="180*" />
-                    <RowDefinition Height="150*" />
+                    <RowDefinition Height="64" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="64" />
                 </Grid.RowDefinitions>
                 <Grid Grid.Row="0">
                     <StackPanel
@@ -605,16 +416,21 @@
                             Stretch="Fill"
                             Visibility="Hidden"
                             Volume="1" />
-                        <!--<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">
+                    <!--<MediaElement Source="/SkinImages/Other/Dev_AcousticWave2.gif" OpacityMask="#FF000000" HorizontalAlignment="Left" Margin="10,0,0,0" LoadedBehavior="{Binding ElementName=MediaAudio,Path=LoadedBehavior}" />-->
+                    <Grid
+                        Width="300"
+                        Height="100"
+                        Margin="30,0,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        Background="#FFF1F2F8">
                         <Image
                             x:Name="ImgAcousticWave"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
                             gif:ImageBehavior.AnimatedSource="/SkinImages/Other/Dev_AcousticWave2.gif"
                             gif:ImageBehavior.AutoStart="True"
                             gif:ImageBehavior.RepeatBehavior="Forever"
@@ -623,25 +439,38 @@
                 </Grid>
                 <Grid Grid.Row="2">
                     <StackPanel
+                        Grid.Row="2"
                         Margin="30,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
+                        HorizontalAlignment="Right"
                         Orientation="Horizontal">
-                        <TextBlock
-                            Margin="0,5,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            FontSize="17"
-                            Foreground="#FF000000"
-                            Text="声音采集：" />
-                        <TextBlock
-                            x:Name="TbxSpeakerDetection"
-                            Margin="0,5,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            FontSize="17"
-                            Foreground="#FF000000"
-                            Text="待检测" />
+                        <Button
+                            x:Name="btn_speaker_good"
+                            Width="100"
+                            Height="30"
+                            Margin="0,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Background="#3f6fff"
+                            Click="btn_speaker_good_Click"
+                            Content="可以听见"
+                            Cursor="Hand"
+                            FontSize="15"
+                            Foreground="White"
+                            IsDefault="True" />
+                        <Button
+                            x:Name="btn_speaker_bad"
+                            Width="100"
+                            Height="30"
+                            Margin="0,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Background="#F1F2F3"
+                            Click="btn_speaker_bad_Click"
+                            Content="听不见"
+                            Cursor="Hand"
+                            FontSize="15"
+                            Foreground="#333333"
+                            IsDefault="True" />
                     </StackPanel>
                 </Grid>
             </Grid>
@@ -650,10 +479,9 @@
                 Grid.Column="1"
                 Visibility="Collapsed">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="50*" />
-                    <RowDefinition Height="45*" />
-                    <RowDefinition Height="196*" />
-                    <RowDefinition Height="95*" />
+                    <RowDefinition Height="64" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="64" />
                 </Grid.RowDefinitions>
                 <StackPanel
                     Grid.Row="0"
@@ -665,13 +493,14 @@
                         Margin="0,5,0,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
-                        FontSize="17"
+                        FontSize="16"
                         Foreground="#FF000000"
-                        Text="麦克风：" />
+                        Text="麦克风" />
                     <ComboBox
                         x:Name="CmbMicrophoneList"
-                        Width="210"
-                        Padding="30,0,10,0"
+                        Width="236"
+                        Margin="16,0,0,0"
+                        Padding="30,0,0,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
                         HorizontalContentAlignment="Center"
@@ -684,174 +513,214 @@
                         SelectedValuePath="Key"
                         Style="{StaticResource stlComboBox}"
                         Text="请选择" />
-                    <Button
-                        x:Name="BtnMicrophoneSave"
-                        Grid.Row="2"
-                        Width="70"
-                        Height="30"
-                        Margin="10,0,0,0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Click="BtnMicrophoneSave_Click"
-                        Content="设置"
-                        Cursor="Hand"
-                        FontSize="15"
-                        Foreground="White"
-                        IsDefault="True"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                        <Button.Template>
-                            <ControlTemplate TargetType="{x:Type Button}">
-                                <Border
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="7">
-                                    <Border.Background>
-                                        <Brush>#3f6fff</Brush>
-                                    </Border.Background>
-                                    <ContentPresenter
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Content="{TemplateBinding Content}" />
-                                </Border>
-                            </ControlTemplate>
-                        </Button.Template>
-                    </Button>
                 </StackPanel>
-                <StackPanel
-                    Grid.Row="1"
-                    Margin="30,0,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Orientation="Horizontal">
-                    <Button
-                        x:Name="BtnMicrophoneDetection"
-                        Width="100"
-                        Height="30"
-                        Margin="0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Click="BtnMicrophoneDetection_Click"
-                        Content="开始录音"
-                        Cursor="Hand"
-                        FontSize="15"
-                        Foreground="White"
-                        IsDefault="True"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                        <Button.Template>
-                            <ControlTemplate TargetType="{x:Type Button}">
-                                <Border
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="7">
-                                    <Border.Background>
-                                        <Brush>#3f6fff</Brush>
-                                    </Border.Background>
-                                    <ContentPresenter
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Content="{TemplateBinding Content}" />
-                                </Border>
-                            </ControlTemplate>
-                        </Button.Template>
-                    </Button>
-
-                    <Button
-                        x:Name="BtnMicrophoneDetectionPlay"
-                        Width="100"
-                        Height="30"
-                        Margin="10,0,0,0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Click="BtnMicrophoneDetectionPlay_Click"
-                        Content="播放"
-                        Cursor="Hand"
-                        FontSize="15"
-                        Foreground="White"
-                        IsDefault="True"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                        <Button.Template>
-                            <ControlTemplate TargetType="{x:Type Button}">
-                                <Border
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="7">
-                                    <Border.Background>
-                                        <Brush>#3f6fff</Brush>
-                                    </Border.Background>
-                                    <ContentPresenter
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Content="{TemplateBinding Content}" />
-                                </Border>
-                            </ControlTemplate>
-                        </Button.Template>
-                    </Button>
-                    <MediaElement
-                        x:Name="MediaAudioMicPlay"
-                        Width="0"
-                        LoadedBehavior="Manual"
-                        MediaEnded="MediaAudioMicPlay_MediaEnded"
-                        Stretch="Fill"
-                        Visibility="Hidden"
-                        Volume="1" />
-                </StackPanel>
-                <Grid Grid.Row="3">
-                    <StackPanel
-                        Margin="30,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Orientation="Horizontal">
-                        <TextBlock
-                            Margin="0,5,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            FontSize="17"
-                            Foreground="#FF000000"
-                            Text="麦克风采集：" />
-                        <TextBlock
-                            x:Name="TbxMicrophoneDetection"
-                            Margin="0,5,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            FontSize="17"
-                            Foreground="#FF000000"
-                            Text="待检测" />
-                    </StackPanel>
-                    <CheckBox
-                        x:Name="CbxRecordingMicrophone"
-                        Margin="30,40,0,0"
-                        Padding="5,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        VerticalContentAlignment="Center"
-                        Click="CbxRecordingMicrophone_Click"
-                        Content="录制麦克风"
-                        FontSize="16"
-                        IsChecked="True" />
 
-                </Grid>
-                <!--<StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0">
-                </StackPanel>-->
-                <Grid Grid.Row="2">
+                <Grid Grid.Row="1">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="64" />
+                    </Grid.RowDefinitions>
                     <Grid
                         x:Name="GridMicImg"
-                        Width="320"
-                        Height="180"
+                        Width="300"
+                        Height="100"
                         Margin="30,0,0,0"
                         HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
                         Background="#FFF1F2F8"
                         Visibility="Visible">
                         <Image
                             x:Name="ImgMicAcousticWave"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
                             gif:ImageBehavior.AnimatedSource="/SkinImages/Other/Dev_AcousticWave2.gif"
                             gif:ImageBehavior.AutoStart="True"
                             gif:ImageBehavior.RepeatBehavior="Forever"
                             Visibility="Hidden" />
                     </Grid>
+
+                    <StackPanel
+                        Grid.Row="1"
+                        Margin="30,0,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Button
+                            x:Name="BtnMicrophoneDetection"
+                            Width="100"
+                            Height="30"
+                            Margin="0"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="#3f6fff"
+                            Click="BtnMicrophoneDetection_Click"
+                            Content="回响测试"
+                            Cursor="Hand"
+                            FontSize="15"
+                            Foreground="White"
+                            IsDefault="True" />
+
+                        <TextBlock
+                            x:Name="TbxMicrophoneDetection"
+                            Margin="10,0,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="16"
+                            Foreground="#FF000000"
+                            Text="待检测" />
+                        <MediaElement
+                            x:Name="MediaAudioMicPlay"
+                            Width="0"
+                            LoadedBehavior="Manual"
+                            MediaEnded="MediaAudioMicPlay_MediaEnded"
+                            Stretch="Fill"
+                            Visibility="Hidden"
+                            Volume="1" />
+                    </StackPanel>
+                </Grid>
+
+                <Grid Grid.Row="2">
+                    <StackPanel
+                        Grid.Row="2"
+                        Margin="30,0,0,0"
+                        HorizontalAlignment="Right"
+                        Orientation="Horizontal">
+                        <Button
+                            x:Name="btn_microphone_good"
+                            Width="100"
+                            Height="30"
+                            Margin="0,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Background="#3f6fff"
+                            Click="btn_microphone_good_Click"
+                            Content="可以听见"
+                            Cursor="Hand"
+                            FontSize="15"
+                            Foreground="White"
+                            IsDefault="True" />
+                        <Button
+                            x:Name="btn_microphone_bad"
+                            Width="100"
+                            Height="30"
+                            Margin="0,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Background="#F1F2F3"
+                            Click="btn_microphone_bad_Click"
+                            Content="听不见"
+                            Cursor="Hand"
+                            FontSize="15"
+                            Foreground="#333333"
+                            IsDefault="True" />
+                    </StackPanel>
+                </Grid>
+            </Grid>
+            <Grid
+                x:Name="GridDetection"
+                Grid.Column="1"
+                Margin="25,15"
+                Visibility="Collapsed">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="50*" />
+                    <ColumnDefinition Width="50*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="50*" />
+                    <RowDefinition Height="50*" />
+                    <RowDefinition Height="50*" />
+                    <RowDefinition Height="50*" />
+                    <RowDefinition Height="50*" />
+                    <RowDefinition Height="50*" />
+                    <RowDefinition Height="50*" />
+                </Grid.RowDefinitions>
+                <Grid Grid.Row="0" Grid.Column="0">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="#FF999999"
+                        Text="设备名称" />
+                </Grid>
+                <Grid Grid.Row="0" Grid.Column="1">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="#FF999999"
+                        Text="检测结果" />
+                </Grid>
+                <!--  摄像头  -->
+                <Grid Grid.Row="1" Grid.Column="0">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="#FF000000"
+                        Text="摄像头" />
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="1">
+                    <TextBlock
+                        x:Name="TxbCamera"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="#FF000000"
+                        Text="" />
+                </Grid>
+                <!--  扬声器  -->
+                <Grid Grid.Row="2" Grid.Column="0">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="#FF000000"
+                        Text="扬声器" />
+                </Grid>
+                <Grid Grid.Row="2" Grid.Column="1">
+                    <TextBlock
+                        x:Name="TxbSpeaker"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="#FF000000"
+                        Text="" />
+                </Grid>
+                <!--  麦克风  -->
+                <Grid Grid.Row="3" Grid.Column="0">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="#FF000000"
+                        Text="麦克风" />
+                </Grid>
+                <Grid Grid.Row="3" Grid.Column="1">
+                    <TextBlock
+                        x:Name="TxbMicrophone"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="#FF000000"
+                        Text="" />
+                </Grid>
+
+                <Grid Grid.Row="6" Grid.Column="1">
+                    <Button
+                        x:Name="BtnDetection"
+                        Grid.Row="2"
+                        Width="116"
+                        Height="30"
+                        Margin="0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Stretch"
+                        Background="#3f6fff"
+                        Click="BtnDetection_Click"
+                        Content="重新检测"
+                        Cursor="Hand"
+                        FontSize="14"
+                        Foreground="White"
+                        IsDefault="True" />
                 </Grid>
             </Grid>
         </Grid>
     </Grid>
-</Window>
+</Window>

XHWK.WKTool/DeviceWindow.xaml.cs

@@ -1,8 +1,16 @@
-using Common.system;
+using Accord.Video;
+using Accord.Video.DirectShow;
+
+using Common.system;
+
+using NAudio.CoreAudioApi;
 
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Windows;
 using System.Windows.Input;
@@ -17,10 +25,17 @@ namespace XHWK.WKTool
     /// </summary>
     public partial class DeviceWindow : Window
     {
+        private bool cameraGood = false;
+        private bool microphoneGood = false;
+        private bool loudspeakerGood = false;
+
         public DeviceWindow()
         {
             InitializeComponent();
+
+            cameraCheck();
         }
+
         /// <summary>
         /// 初始化
         /// </summary>
@@ -29,19 +44,9 @@ namespace XHWK.WKTool
             TxbCamera.Text = "";
             TxbSpeaker.Text = "";
             TxbMicrophone.Text = "";
-            BtnDetection.Content = "开始检测";
-            HidePage();
-            GridDetection.Visibility = Visibility.Visible;
-            bool IsRecordingMicrophone = FileToolsCommon.GetConfigValue("IsRecordingMicrophone") == "1";
-            if(IsRecordingMicrophone)
-            {
-                CbxRecordingMicrophone.IsChecked = true;
-            }
-            else
-            {
-                CbxRecordingMicrophone.IsChecked = false;
-            }
+       
         }
+
         /// <summary>
         /// 窗体移动
         /// </summary>
@@ -51,6 +56,7 @@ namespace XHWK.WKTool
         {
             DragMove();
         }
+
         /// <summary>
         /// 关闭当前页
         /// </summary>
@@ -59,259 +65,94 @@ namespace XHWK.WKTool
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
             imgPlayer.Visibility = Visibility.Hidden;
-            try
-            {
-                CameraHelper.CloseDevice();
-            }
-            catch (Exception)
-            {
-            }
-            Hide();
+
+            Close();
         }
 
-        #region 设备检测
-        /// <summary>
-        /// 开始检测
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnDetection_Click(object sender, RoutedEventArgs e)
+        #region 摄像头
+
+        private void cameraCheck()
         {
-            string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
-            FileToolsCommon.CreateDirectory(AudioPath);
-            string audioSpeakerPath = AudioPath + "adoS" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";//FileToolsCommon.GetFileAbsolutePath("adoS.m");
-            string audioMicrophonePath = AudioPath + "adoM" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";//FileToolsCommon.GetFileAbsolutePath("adoM.m");
-            string PhotoPath = AudioPath + "Photo" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".jpg";
-            TxbCamera.Text = "检测中...";
-            TxbSpeaker.Text = "检测中...";
-            TxbMicrophone.Text = "检测中...";
-            BtnDetection.Content = "正在检测";
-            BtnDetection.IsEnabled = false;
-            try
-            {
-                FileToolsCommon.DeleteFile(audioSpeakerPath);
-                FileToolsCommon.DeleteFile(audioMicrophonePath);
-                FileToolsCommon.DeleteFile(PhotoPath);
-            }
-            catch (Exception)
-            {
+            HidePage();
+            GridCamera.Visibility = Visibility.Visible;
 
+            var devs = new FilterInfoCollection(FilterCategory.VideoInputDevice);//获取摄像头列表
+            CmbCameraList.ItemsSource = devs;
+            if (devs.Count > 0)
+            {
+                CmbCameraList.SelectedIndex = 0;
             }
-            new Thread(new ThreadStart(new Action(() =>
-                {
-                    #region 检测摄像头
-                    try
-                    {
-                        //new Thread(new ThreadStart(new Action(() =>
-                        //{
-                        //Dispatcher.Invoke(() =>
-                        //{
-                        //});
-                        //}))).Start();
-                        Dispatcher.Invoke(() =>
-                        {
-                            CameraHelper.UpdateCameraDevices();
-                        });
-                        Thread.Sleep(500);
-                        if (CameraHelper.CameraDevices != null && CameraHelper.CameraDevices.Count > 0)
-                        {
-                            Dispatcher.Invoke(() =>
-                            {
-                                int CameraIndex = 0;
-                                for (int i = 0; i < CameraHelper.CameraDevices.Count; i++)
-                                {
-                                    if (CameraHelper.CameraDevices[i].Name == "screen-capture-recorder")
-                                    {
-                                        continue;
-                                    }
-                                    if (CameraHelper.CameraDevices[i].MonikerString == APP.CameraName)
-                                    {
-                                        CameraIndex = i;
-                                    }
-                                }
-                                CameraHelper.SetCameraDevice(CameraIndex);
-                            });
-                            Thread.Sleep(2000);
-                            //while()
-                            Dispatcher.Invoke(() =>
-                            {
-                                long time = Timestamp();
-                                string path = CameraHelper.CaptureImage(PhotoPath, time.ToString());
-
-                                if (string.IsNullOrWhiteSpace(path))
-                                {
-                                    TxbCamera.Text = "不可用";
-
-                                }
-                                else
-                                {
-                                    TxbCamera.Text = "正常";
-                                }
-                                CameraHelper.CloseDevice();
-                            });
-                        }
-                        else
-                        {
-                            Dispatcher.Invoke(() =>
-                            {
-                                TxbCamera.Text = "无设备";
-                            });
-                        }
-                    }
-                    catch (Exception)
-                    {
-                        Dispatcher.Invoke(() =>
-                        {
-                            TxbCamera.Text = "不可用";
-                        });
-                    }
-                    #endregion
-                    #region 检测扬声器
-                    if (APP.FFmpeg.StartRecordSpeakerAudio(audioSpeakerPath))
-                    {
-                        Dispatcher.Invoke(() =>
-                        {
-                            TxbSpeaker.Text = "正常";
-                        });
-                    }
-                    else
-                    {
-                        //无法录制扬声器音频
-
-                        Dispatcher.Invoke(() =>
-                        {
-                            TxbSpeaker.Text = "不可用";
-                        });
-                    }
-                    APP.FFmpeg.StopRecordAudio(2);
-                    #endregion
-                    Thread.Sleep(300);
-                    #region 检测麦克风
-                    if (APP.FFmpeg.StartRecordAudio(audioMicrophonePath, APP.MicrophoneName))
-                    {
-                        Dispatcher.Invoke(() =>
-                        {
-                            TxbMicrophone.Text = "正常";
-                        });
-                    }
-                    else
-                    {
-                        //无法录制麦克风
-                        Dispatcher.Invoke(() =>
-                        {
-                            TxbMicrophone.Text = "不可用";
-                            CbxRecordingMicrophone.IsChecked = false;
-                            FileToolsCommon.SetConfigValue("IsRecordingMicrophone", "0");
-                        });
-                    }
-                    APP.FFmpeg.StopRecordAudio(1);
-                    #endregion
-                    Dispatcher.Invoke(() =>
-                    {
-                        BtnDetection.Content = "再次检测";
-                        BtnDetection.IsEnabled = true;
-                    });
-                }))).Start();
         }
 
-        /// <summary>
-        /// 返回一个时间戳到毫秒
-        /// </summary>
-        /// <returns></returns>
-        public static long Timestamp()
+        private void CmbCameraList_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
         {
-            TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-            long timestr = Convert.ToInt64(ts.TotalMilliseconds);
-            return timestr;
+            Console.WriteLine("选择变化");
+            checkCamera();
         }
-        #endregion
 
-        #region 摄像头
+        private VideoCaptureDevice Camera;//用来操作摄像头
+
         /// <summary>
-        /// 设置摄像头
+        /// 检测
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void BtnCameraSave_Click(object sender, RoutedEventArgs e)
+        private void checkCamera()
         {
             try
             {
-                for (int i = 0; i < CameraHelper.CameraDevices.Count; i++)
-                {
-                    if (CameraHelper.CameraDevices[i].Name == "screen-capture-recorder")
-                    {
-                        continue;
-                    }
-                    if (CameraHelper.CameraDevices[i].Name == CmbCameraList.Text)
-                    {
-                        APP.CameraName = CameraHelper.CameraDevices[i].Name;
-                    }
-                }
-                if (times != null && times.Enabled == true)
-                {
-                    times.Enabled = false;
-                }
-                imgPlayer.Visibility = Visibility.Hidden;
-                try
-                {
-                    CameraHelper.CloseDevice();
-                }
-                catch (Exception)
+                closeCamera();
+
+                imgPlayer.Visibility = Visibility.Visible;
+                if (CmbCameraList.SelectedIndex >= 0)
                 {
+                    var info = CmbCameraList.SelectedItem as FilterInfo;
+                    Camera = new VideoCaptureDevice(info.MonikerString);
+                    //配置录像参数(宽,高,帧率,比特率等参数)VideoCapabilities这个属性会返回摄像头支持哪些配置
+                    Camera.VideoResolution = Camera.VideoCapabilities[0];
+                    Camera.NewFrame += Camera_NewFrame;//设置回调,aforge会不断从这个回调推出图像数据,SnapshotFrame也是有待比较
+                    Camera.Start();//打开摄像头
                 }
-                I = 9999;
-                MessageWindow.Show("设置成功！");
             }
             catch (Exception ex)
             {
-                APP.CameraName = "";
-                MessageWindow.Show("当前无法设置摄像头！");
-                LogHelper.WriteErrLog("【摄像头检测】（DeviceWindow）当前无法设置摄像头：" + ex.Message, ex);
+                LogHelper.WriteErrLog("【摄像头检测】（DeviceWindow）摄像头不可用：" + ex.Message, ex);
             }
-            //APP.CameraListIndex = CmbCameraList.SelectedIndex;
         }
-        /// <summary>
-        /// 检测
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnCameraStat_Click(object sender, RoutedEventArgs e)
+
+        private void closeCamera()
         {
             try
             {
-                imgPlayer.Visibility = Visibility.Visible;
-                CameraHelper.UpdateCameraDevices();
-                if (CameraHelper.CameraDevices.Count > 0)
+                if (Camera != null)
                 {
-                    int CameraIndex = 0;
-                    for (int i = 0; i < CameraHelper.CameraDevices.Count; i++)
-                    {
-                        if (CameraHelper.CameraDevices[i].Name == "screen-capture-recorder")
-                        {
-                            continue;
-                        }
-                        if (CameraHelper.CameraDevices[i].MonikerString == APP.CameraName)
-                        {
-                            CameraIndex = i;
-                        }
-                    }
-                    CameraHelper.SetCameraDevice(CameraIndex);
-                    string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayertest");
-                    FileToolsCommon.CreateDirectory(imgPath);
-                    times = new System.Timers.Timer(200)//初始值为300
-                    {
-                        AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
-                    };//设置执行一次（false）还是一直执行(true)
-                    times.Elapsed += new System.Timers.ElapsedEventHandler(Times_Elapsed);
-                    times.Enabled = true; //启动计时器
+                    Camera.SignalToStop();
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                LogHelper.WriteErrLog("【摄像头检测】（DeviceWindow）摄像头不可用：" + ex.Message, ex);
             }
         }
 
+        /// <summary>
+        /// 摄像头输出回调
+        /// </summary>
+        private void Camera_NewFrame(object sender, NewFrameEventArgs eventArgs)
+        {
+            Dispatcher.Invoke(new Action(
+                    () =>
+                    {
+                        MemoryStream ms = new MemoryStream();
+                        eventArgs.Frame.Save(ms, ImageFormat.Bmp);
+                        BitmapImage image = new BitmapImage();
+                        image.BeginInit();
+                        image.StreamSource = new MemoryStream(ms.GetBuffer());
+                        ms.Close();
+                        image.EndInit();
+                        imgPlayer.Source = image;
+                    }));//同步显示
+        }
+
         /// <summary>
         /// 停止
         /// </summary>
@@ -319,52 +160,29 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnCameraStop_Click(object sender, RoutedEventArgs e)
         {
-            times.Enabled = false;
-            imgPlayer.Visibility = Visibility.Hidden;
-            try
+            if (Camera != null)
             {
-                CameraHelper.CloseDevice();
+                Camera.SignalToStop();
             }
-            catch (Exception ex)
-            {
-                LogHelper.WriteErrLog("【摄像头检测】（DeviceWindow）摄像头不可用：" + ex.Message, ex);
-            }
-            I = 9999;
         }
-        #region 检测摄像头
 
-        private System.Timers.Timer times;
+        #endregion 摄像头
+
+        #region 扬声器
 
-        private int I = 9999;
-        private void Times_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        /// <summary>
+        /// 扬声器
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Speaker_Check()
         {
-            try
-            {
-                Dispatcher.Invoke(() =>
-                {
-                    if (I > 10010)
-                    {
-                        long time = Timestamp();
-                        string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayertest");
-                        //string FilePathName = ImgPath + RsImgName.Count + ".png";
-                        string path = CameraHelper.CaptureImage(imgPath, time.ToString());
-                        if (!string.IsNullOrWhiteSpace(path))
-                        {
-                            imgPlayer.Source = new BitmapImage(new Uri(path));
-                        }
-                    }
-                    I++;
-                });
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteErrLog("【摄像】(Times_Elapsed)生成图片错误:" + ex.Message, ex);
-            }
+            closeCamera();
+            CmbCameraList.SelectedIndex = -1;
+            HidePage();
+            GridSpeaker.Visibility = Visibility.Visible;
         }
-        #endregion
-        #endregion
 
-        #region 扬声器
         /// <summary>
         /// 检测扬声器
         /// </summary>
@@ -372,53 +190,15 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnSpeakerDetection_Click(object sender, RoutedEventArgs e)
         {
-            string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
-            FileToolsCommon.CreateDirectory(AudioPath);
-            string audioSpeakerPath = AudioPath + "adoS" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
-            TbxSpeakerDetection.Text = "检测中...";
-            BtnSpeakerDetection.Content = "正在检测";
-            BtnSpeakerDetection.IsEnabled = false;
-            new Thread(new ThreadStart(new Action(() =>
-            {
-                Dispatcher.Invoke(() =>
-                {
-                    MediaAudio.Play();
-                    ImgAcousticWave.Visibility = Visibility.Visible;
-                });
-                Thread.Sleep(4000);
-                #region 检测扬声器
-                if (APP.FFmpeg.StartRecordSpeakerAudio(audioSpeakerPath))
-                {
-                    Dispatcher.Invoke(() =>
-                    {
-                        TbxSpeakerDetection.Text = "正常";
-                    });
-                }
-                else
-                {
-                    //无法录制扬声器音频
-                    Dispatcher.Invoke(() =>
-                    {
-                        TbxSpeakerDetection.Text = "不可用";
-                    });
-                }
-                APP.FFmpeg.StopRecordAudio(2);
-                #endregion
-
-                Dispatcher.Invoke(() =>
-                {
-                    ImgAcousticWave.Visibility = Visibility.Hidden;
-                    BtnSpeakerDetection.Content = "再次检测";
-                    BtnSpeakerDetection.IsEnabled = true;
-                });
-            }))).Start();
-
+            Console.WriteLine("播放");
+            MediaAudio.Source = new Uri(FileToolsCommon.GetFileAbsolutePath("/Resources/audiotest.mp3"));
+            MediaAudio.Position = TimeSpan.Zero;
+            MediaAudio.Play();
+            ImgAcousticWave.Visibility = Visibility.Visible;
         }
+
         #region 音频播放
-        ///// <summary>
-        ///// 计时器
-        ///// </summary>
-        //DispatcherTimer dispatcherTimer = new System.Windows.Threading.DispatcherTimer(); // 定义一个DT
+
         /// <summary>
         /// 音频播放 同步进度条和视频进度
         /// </summary>
@@ -426,48 +206,62 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void MediaAudio_MediaOpened(object sender, RoutedEventArgs e)
         {
-            //timelineSlider.Maximum = MediaAudio.NaturalDuration.TimeSpan.TotalMilliseconds;  //设置slider最大值
-            //int sec = (int)MediaAudio.NaturalDuration.TimeSpan.TotalSeconds;
-            //dispatcherTimer.Start(); //DT启动 
-        }
-        /// <summary>
-        /// slider滑动值随播放内容位置变化
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dispatcherTimer_Tick(object sender, EventArgs e)
-        {
-            //timelineSlider.Value = MediaAudio.Position.TotalMilliseconds; //slider滑动值随播放内容位置变化
+            Console.WriteLine("播放中。。。");
         }
+
         private void MediaAudio_MediaEnded(object sender, RoutedEventArgs e)
         {
-            //dispatcherTimer.Stop();
-            //timelineSlider.Value = 0;
             MediaAudio.Stop();
             MediaAudio.Position = TimeSpan.Zero;
         }
-        #endregion
-        #endregion
+
+        #endregion 音频播放
+
+        #endregion 扬声器
 
         #region 麦克风
+
         /// <summary>
-        /// 设置麦克风
+        /// 麦克风
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void BtnMicrophoneSave_Click(object sender, RoutedEventArgs e)
-        {
-            //CmbMicrophoneList.SelectedValue.ToString();
-            APP.MicrophoneName = CmbMicrophoneList.Text;
-        }
-        /// <summary>
-        /// 加载麦克风列表
-        /// </summary>
-        void lodingMicrophoneList()
+        private void Microphone_Check()
         {
-            //string name = APP.FFmpeg.GetMicrophoneName();
-            //List<string> MicrophoneList = APP.FFmpeg.GetMicrophoneNameList();
+            MediaAudio.Stop();
+            ImgAcousticWave.Visibility = Visibility.Collapsed;
+            HidePage();
+            GridMicrophone.Visibility = Visibility.Visible;
+
+            ImgMicAcousticWave.Visibility = Visibility.Hidden;
+            string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
+            FileToolsCommon.DeleteDirectory(AudioPath);
+
+            DataTable data = new DataTable();
+            List<string> MicrophoneList = APP.FFmpeg.GetMicrophoneNameList();
+            if (MicrophoneList.Count > 0)
+            {
+                data.Columns.Add("Value");
+                data.Columns.Add("Key");
+                for (int i = 0; i < MicrophoneList.Count; i++)
+                {
+                    //创建一行
+                    DataRow row = data.NewRow();
+                    //将此行添加到table中
+                    data.Rows.Add(row);
+                    data.Rows[i]["Value"] = MicrophoneList[i];
+                    data.Rows[i]["Key"] = i.ToString();
+                }
+                CmbMicrophoneList.ItemsSource = data.DefaultView;
+                int CameraIndex = 0;
+                if (MicrophoneList.Exists(x => x == APP.MicrophoneName))
+                {
+                    CameraIndex = MicrophoneList.FindIndex(x => x == APP.MicrophoneName);
+                }
+                CmbMicrophoneList.SelectedIndex = CameraIndex;
+            }
         }
+
         /// <summary>
         /// 检测麦克风
         /// </summary>
@@ -475,7 +269,6 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         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/");
@@ -487,12 +280,13 @@ namespace XHWK.WKTool
             new Thread(new ThreadStart(new Action(() =>
             {
                 #region 检测麦克风
+
                 bool Record = APP.FFmpeg.StartRecordAudio(audioMicrophonePath, APP.MicrophoneName, false);
                 for (int i = 5; i > 0; i--)
                 {
                     Dispatcher.Invoke(() =>
                     {
-                        TbxMicrophoneDetection.Text = "录制中..." + i + "s";
+                        TbxMicrophoneDetection.Text = "请说话(" + i + "s)";
                     });
                     Thread.Sleep(1000);
                 }
@@ -503,9 +297,13 @@ namespace XHWK.WKTool
                         Dispatcher.Invoke(() =>
                         {
                             TbxMicrophoneDetection.Text = "录制成功";
-                            BtnMicrophoneDetectionPlay.Visibility = Visibility.Visible;
-                            //GridMicImg.Visibility = Visibility.Visible;
+
                             MediaAudioMicPlay.Source = new Uri(audioMicrophonePath);
+
+                            ImgMicAcousticWave.Visibility = Visibility.Visible;
+                            MediaAudioMicPlay.Play();
+
+                            BtnMicrophoneDetection.Content = "回响中";
                         });
                     }
                     else
@@ -514,8 +312,7 @@ namespace XHWK.WKTool
                         Dispatcher.Invoke(() =>
                         {
                             TbxMicrophoneDetection.Text = "不可用";
-                            BtnMicrophoneDetectionPlay.Visibility = Visibility.Hidden;
-                            CbxRecordingMicrophone.IsChecked = false;
+
                             FileToolsCommon.SetConfigValue("IsRecordingMicrophone", "0");
                             //GridMicImg.Visibility = Visibility.Hidden;
                         });
@@ -527,33 +324,23 @@ namespace XHWK.WKTool
                     Dispatcher.Invoke(() =>
                     {
                         TbxMicrophoneDetection.Text = "不可用";
-                        BtnMicrophoneDetectionPlay.Visibility = Visibility.Hidden;
-                        CbxRecordingMicrophone.IsChecked = false;
+
                         FileToolsCommon.SetConfigValue("IsRecordingMicrophone", "0");
                         //GridMicImg.Visibility = Visibility.Hidden;
                     });
                 }
                 APP.FFmpeg.StopRecordAudio(1);
-                #endregion
+
+                #endregion 检测麦克风
+
                 Dispatcher.Invoke(() =>
                 {
-                    BtnMicrophoneDetection.Content = "重新录制";
+                    BtnMicrophoneDetection.Content = "重新测试";
                     BtnMicrophoneDetection.IsEnabled = true;
                 });
             }))).Start();
         }
-        /// <summary>
-        /// 播放录音
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnMicrophoneDetectionPlay_Click(object sender, RoutedEventArgs e)
-        {
-            BtnMicrophoneDetectionPlay.Content = "播放中";
-            BtnMicrophoneDetectionPlay.IsEnabled = false;
-            ImgMicAcousticWave.Visibility = Visibility.Visible;
-            MediaAudioMicPlay.Play();
-        }
+
         /// <summary>
         /// 播放结束
         /// </summary>
@@ -563,143 +350,55 @@ namespace XHWK.WKTool
         {
             MediaAudioMicPlay.Stop();
             MediaAudioMicPlay.Position = TimeSpan.Zero;
-            BtnMicrophoneDetectionPlay.Content = "播放";
-            BtnMicrophoneDetectionPlay.IsEnabled = true;
+
             ImgMicAcousticWave.Visibility = Visibility.Hidden;
+            BtnMicrophoneDetection.Content = "重新测试";
+            BtnMicrophoneDetection.IsEnabled = true;
         }
 
+        #endregion 麦克风
+
+        #region 页面切换
+
         /// <summary>
-        /// 修改录制麦克风
+        /// 检测页
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void CbxRecordingMicrophone_Click(object sender, RoutedEventArgs e)
+        private void result_show()
         {
-            if ((bool)CbxRecordingMicrophone.IsChecked)
+            HidePage();
+            GridDetection.Visibility = Visibility.Visible;
+            if (cameraGood)
             {
-                FileToolsCommon.SetConfigValue("IsRecordingMicrophone", "1");
+                TxbCamera.Text = "可用";
             }
             else
             {
-                FileToolsCommon.SetConfigValue("IsRecordingMicrophone", "0");
+                TxbCamera.Text = "不可用";
             }
-        }
-        #endregion
 
-        #region 页面切换
-        /// <summary>
-        /// 摄像头
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnCamera_Click(object sender, RoutedEventArgs e)
-        {
-            HidePage();
-            GridCamera.Visibility = Visibility.Visible;
-
-            DataTable data = new DataTable();
-            CameraHelper.UpdateCameraDevices();
-            if (CameraHelper.CameraDevices.Count > 0)
+            if (loudspeakerGood)
             {
-                data.Columns.Add("Value");
-                data.Columns.Add("Key");
-                for (int i = 0; i < CameraHelper.CameraDevices.Count; i++)
-                {
-                    if (CameraHelper.CameraDevices[i].Name == "screen-capture-recorder")
-                    {
-                        continue;
-                    }
-                    //创建一行
-                    DataRow row = data.NewRow();
-                    //将此行添加到table中
-                    data.Rows.Add(row);
-                    data.Rows[i]["Value"] = CameraHelper.CameraDevices[i].Name;
-                    data.Rows[i]["Key"] = i.ToString();
-                }
-                CmbCameraList.ItemsSource = data.DefaultView;
-                int CameraIndex = 0;
-                for (int i = 0; i < CameraHelper.CameraDevices.Count; i++)
-                {
-                    if (CameraHelper.CameraDevices[i].Name == "screen-capture-recorder")
-                    {
-                        continue;
-                    }
-                    if (CameraHelper.CameraDevices[i].MonikerString == APP.CameraName)
-                    {
-                        CameraIndex = i;
-                    }
-                }
-                CmbCameraList.SelectedIndex = CameraIndex;
+                TxbSpeaker.Text = "可用";
+            }
+            else
+            {
+                TxbSpeaker.Text = "不可用";
             }
 
-        }
-        /// <summary>
-        /// 扬声器
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnSpeaker_Click(object sender, RoutedEventArgs e)
-        {
-            HidePage();
-            GridSpeaker.Visibility = Visibility.Visible;
-
-            MediaAudio.Source = new Uri(FileToolsCommon.GetFileAbsolutePath("/Resources/AudioFrequency.mp3"));
-            //dispatcherTimer.Tick += new EventHandler(dispatcherTimer_Tick); //超过计时间隔时发生
-            //dispatcherTimer.Interval = new TimeSpan(0, 0, 0, 0, 500); //DT间隔
-
-        }
-        /// <summary>
-        /// 麦克风
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnMicrophone_Click(object sender, RoutedEventArgs e)
-        {
-            HidePage();
-            GridMicrophone.Visibility = Visibility.Visible;
-            BtnMicrophoneDetectionPlay.Visibility = Visibility.Hidden;
-            ImgMicAcousticWave.Visibility = Visibility.Hidden;
-            string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
-            FileToolsCommon.DeleteDirectory(AudioPath);
-
-            DataTable data = new DataTable();
-            List<string> MicrophoneList = APP.FFmpeg.GetMicrophoneNameList();
-            if (MicrophoneList.Count > 0)
+            if (microphoneGood)
             {
-                data.Columns.Add("Value");
-                data.Columns.Add("Key");
-                for (int i = 0; i < MicrophoneList.Count; i++)
-                {
-                    //创建一行
-                    DataRow row = data.NewRow();
-                    //将此行添加到table中
-                    data.Rows.Add(row);
-                    data.Rows[i]["Value"] = MicrophoneList[i];
-                    data.Rows[i]["Key"] = i.ToString();
-                }
-                CmbMicrophoneList.ItemsSource = data.DefaultView;
-                int CameraIndex = 0;
-                if (MicrophoneList.Exists(x => x == APP.MicrophoneName))
-                {
-                    CameraIndex = MicrophoneList.FindIndex(x => x == APP.MicrophoneName);
-                }
-                CmbMicrophoneList.SelectedIndex = CameraIndex;
+                TxbMicrophone.Text = "可用";
+            }
+            else
+            {
+                TxbMicrophone.Text = "不可用";
             }
         }
-        /// <summary>
-        /// 检测页
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnDetectionPage_Click(object sender, RoutedEventArgs e)
-        {
-            HidePage();
-            GridDetection.Visibility = Visibility.Visible;
-        }
+
         /// <summary>
         /// 隐藏页
         /// </summary>
-        void HidePage()
+        private void HidePage()
         {
             GridDetection.Visibility = Visibility.Collapsed;
             GridCamera.Visibility = Visibility.Collapsed;
@@ -714,7 +413,56 @@ namespace XHWK.WKTool
             }
         }
 
-        #endregion
+        #endregion 页面切换
+
+        #region 事件
+
+        private void btn_camera_good_Click(object sender, RoutedEventArgs e)
+        {
+            cameraGood = true;
+            Speaker_Check();
+        }
+
+        private void btn_camera_bad_Click(object sender, RoutedEventArgs e)
+        {
+            cameraGood = false;
+            Speaker_Check();
+        }
+
+        private void btn_speaker_good_Click(object sender, RoutedEventArgs e)
+        {
+            loudspeakerGood = true;
+            Microphone_Check();
+        }
+
+        private void btn_speaker_bad_Click(object sender, RoutedEventArgs e)
+        {
+            loudspeakerGood = false;
+            Microphone_Check();
+        }
+
+        private void btn_microphone_good_Click(object sender, RoutedEventArgs e)
+        {
+            microphoneGood = true;
+            result_show();
+        }
+
+        private void btn_microphone_bad_Click(object sender, RoutedEventArgs e)
+        {
+            microphoneGood = false;
+            result_show();
+        }
+
+        /// <summary>
+        /// 重新
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnDetection_Click(object sender, RoutedEventArgs e)
+        {
+            cameraCheck();
+        }
 
+        #endregion 事件
     }
-}
+}

XHWK.WKTool/LoginWindow.xaml

@@ -1,54 +1,66 @@
-<Window x:Class="XHWK.WKTool.LoginWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:XHWK.WKTool"
-        mc:Ignorable="d"
-        Title="LoginWindow" Height="497" Width="312"   AllowsTransparency="True"
+<Window
+    x:Class="XHWK.WKTool.LoginWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:XHWK.WKTool"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="LoginWindow"
+    Width="312"
+    Height="497"
+    AllowsTransparency="True"
+    BorderBrush="#eeeeee"
+    BorderThickness="1"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
-    WindowStyle="None"  BorderThickness="7">
-    <Window.Effect>
-        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
-    </Window.Effect>
+    WindowStyle="None"
+    mc:Ignorable="d">
+
     <Window.Resources>
         <Style x:Key="CheckBoxStyle1" TargetType="{x:Type CheckBox}">
-            <Setter Property="OverridesDefaultStyle" Value="True"/>
-            <Setter Property="SnapsToDevicePixels" Value="True"/>
+            <Setter Property="OverridesDefaultStyle" Value="True" />
+            <Setter Property="SnapsToDevicePixels" Value="True" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type CheckBox}">
-                        <BulletDecorator FlowDirection="LeftToRight" VerticalAlignment="Center">
+                        <BulletDecorator VerticalAlignment="Center" FlowDirection="LeftToRight">
                             <BulletDecorator.Bullet>
-                                <Border x:Name="bd"  
-                                    BorderThickness="1"  
-                                    BorderBrush="#B2B2B2"  
-                                    MinHeight="13"  
-                                    MinWidth="13"  
-                                    VerticalAlignment="Center" Background="White">
-                                    <Path x:Name="cp" Width="12" Height="12"  
-                                      Stroke="#4892E7"  
-                                      StrokeThickness="2"/>
+                                <Border
+                                    x:Name="bd"
+                                    MinWidth="13"
+                                    MinHeight="13"
+                                    VerticalAlignment="Center"
+                                    Background="White"
+                                    BorderBrush="#B2B2B2"
+                                    BorderThickness="1">
+                                    <Path
+                                        x:Name="cp"
+                                        Width="12"
+                                        Height="12"
+                                        Stroke="#3F6FFF"
+                                        StrokeThickness="2" />
                                 </Border>
 
                             </BulletDecorator.Bullet>
-                            <TextBlock x:Name="textBlock" Margin="2,0" Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}" FontFamily="Microsoft YaHei UI" FontSize="13.333"></TextBlock>
+                            <TextBlock
+                                x:Name="textBlock"
+                                Margin="2,0"
+                                FontFamily="Microsoft YaHei UI"
+                                FontSize="13.333"
+                                Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}" />
                         </BulletDecorator>
-                        <!-- 
-                        控件触发器 
-                    -->
+                        <!--
+                            控件触发器
+                        -->
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="True">
-                                <!-- 画上一个勾 -->
-                                <Setter TargetName="cp" Property="Data"  
-                                    Value="M 2,6 L 5,9 11,2"/>
-                                <Setter Property="Foreground" TargetName="textBlock" Value="#FFE60E0E"/>
+                                <!--  画上一个勾  -->
+                                <Setter TargetName="cp" Property="Data" Value="M 2,6 L 5,9 11,2" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="#FFE60E0E" />
 
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="bd" Property="BorderBrush" Value="#1583DD">
-                                </Setter>
+                                <Setter TargetName="bd" Property="BorderBrush" Value="#1583DD" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -56,16 +68,25 @@
             </Setter>
         </Style>
         <Style x:Key="NoMouseOverButtonStyle" TargetType="{x:Type Button}">
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="Padding" Value="1"/>
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Padding" Value="1" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border x:Name="Chrome" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <Border
+                            x:Name="Chrome"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            SnapsToDevicePixels="true">
+                            <ContentPresenter
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
@@ -73,107 +94,224 @@
         </Style>
     </Window.Resources>
     <Grid>
-        <Border Background="White" CornerRadius="15" MouseLeftButtonDown="Border_MouseLeftButtonDown" >
+        <Border
+            Background="White"
+            CornerRadius="15"
+            MouseLeftButtonDown="Border_MouseLeftButtonDown">
             <Grid>
-                <Image Source="/SkinImages/ImgCarousel/CM_RightDown.png" HorizontalAlignment="Right" VerticalAlignment="Top" Width="80" />
-                <!--创建内页 375-->
-                <Grid x:Name="GridLoginPage" Margin="20,0" Visibility="Visible">
+                <Image
+                    Width="80"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Source="/SkinImages/ImgCarousel/CM_RightDown.png" />
+                <!--  创建内页 375  -->
+                <Grid
+                    x:Name="GridLoginPage"
+                    Margin="20,0"
+                    Visibility="Visible">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="100*"/>
-                        <RowDefinition Height="70*"/>
-                        <RowDefinition Height="70*"/>
-                        <RowDefinition Height="15*"/>
-                        <RowDefinition Height="120*"/>
+                        <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" />
+                            <Label
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Top"
+                                Content="登录"
+                                FontSize="28"
+                                Foreground="#FF4B62EA" />
+                            <Label
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Top"
+                                Content="星火微课系统"
+                                FontSize="14"
+                                Foreground="#FF000000" />
                         </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"/>
+                            <Label
+                                Content="账号:"
+                                FontSize="12"
+                                Foreground="#FF666666" />
+                            <TextBox
+                                x:Name="txbAccountNumber"
+                                Margin="5,5"
+                                BorderBrush="{x:Null}"
+                                BorderThickness="0"
+                                FontSize="14"
+                                Foreground="#FF999999"
+                                InputMethod.IsInputMethodEnabled="False"
+                                PreviewTextInput="txbAccountNumber_PreviewTextInput"
+                                Text="" />
+                            <Label Height="1.5" Background="#3F6FFF" />
                         </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"/>
+                            <Label
+                                Content="密码:"
+                                FontSize="12"
+                                Foreground="#FF666666" />
+                            <PasswordBox
+                                x:Name="pobPassword"
+                                Margin="5,5"
+                                BorderBrush="{x:Null}"
+                                BorderThickness="0"
+                                FontSize="14"
+                                Foreground="#FF999999"
+                                PasswordChar="*" />
+                            <Label Height="1.5" Background="#3F6FFF" />
                         </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}"/>
+                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                            <Viewbox Margin="0,0,5,0" VerticalAlignment="Center">
+                                <CheckBox
+                                    x:Name="ckSaveName"
+                                    Click="CkSaveName_Click"
+                                    Cursor="Hand"
+                                    Style="{DynamicResource CheckBoxStyle1}" />
                             </Viewbox>
-                            <TextBlock Text="记住账号" FontSize="10" VerticalAlignment="Center" Foreground="#FFB2B2B2"/>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="10"
+                                Foreground="#FFB2B2B2"
+                                Text="记住账号" />
                         </StackPanel>
 
-                        <Label x:Name="LblCreate" Content="创建微课中..." FontSize="12" Foreground="#FF999999" HorizontalAlignment="Right" Visibility="Hidden" Margin="0"/>
+                        <Label
+                            x:Name="LblCreate"
+                            Margin="0"
+                            HorizontalAlignment="Right"
+                            Content="创建微课中..."
+                            FontSize="12"
+                            Foreground="#FF999999"
+                            Visibility="Hidden" />
                     </Grid>
-                    <!--按钮-->
+                    <!--  按钮  -->
                     <Grid Grid.Row="4">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="35*"/>
-                            <RowDefinition Height="35*"/>
-                            <RowDefinition Height="5*"/>
-                            <RowDefinition Height="35*"/>
-                            <RowDefinition Height="15*"/>
-                            <RowDefinition Height="25*"/>
-                            <RowDefinition Height="5*"/>
+                            <RowDefinition Height="35*" />
+                            <RowDefinition Height="35*" />
+                            <RowDefinition Height="5*" />
+                            <RowDefinition Height="35*" />
+                            <RowDefinition Height="15*" />
+                            <RowDefinition Height="25*" />
+                            <RowDefinition Height="5*" />
                         </Grid.RowDefinitions>
-                        <Button Grid.Row="1" Cursor="Hand" x:Name="btnStart" IsDefault="True" Content="登录" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Click="BtnStart_Click" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
+                        <Button
+                            x:Name="btnStart"
+                            Grid.Row="1"
+                            Grid.ColumnSpan="2"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Click="BtnStart_Click"
+                            Content="登录"
+                            Cursor="Hand"
+                            FontSize="18"
+                            Foreground="#FFFFFF"
+                            IsDefault="True"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                             <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
+                                        BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                        BorderThickness="1"
+                                        CornerRadius="20">
+                                        <Border.Background>#3F6FFF</Border.Background>
+                                        <ContentPresenter
+                                            Margin="0,5"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Content="{TemplateBinding ContentControl.Content}" />
                                     </Border>
                                 </ControlTemplate>
                             </Button.Template>
                         </Button>
-                        <Button Grid.Row="3" Cursor="Hand" x:Name="BtnStop" IsDefault="True" Content="关闭" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0" Click="BtnDown_Click" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" Padding="2" VerticalContentAlignment="Center">
+                        <Button
+                            x:Name="BtnStop"
+                            Grid.Row="3"
+                            Grid.ColumnSpan="2"
+                            Margin="0"
+                            Padding="2"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Click="BtnDown_Click"
+                            Content="关闭"
+                            Cursor="Hand"
+                            FontSize="18"
+                            Foreground="#FFFFFF"
+                            IsDefault="True"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
-                                    <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="20">
+                                    <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" />
+                                        <ContentPresenter
+                                            Margin="0,5"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Content="{TemplateBinding ContentControl.Content}" />
                                     </Border>
                                 </ControlTemplate>
                             </Button.Template>
                         </Button>
 
-                        <Button Grid.Row="5" FontSize="{Binding WordSize12}" Cursor="Hand" x:Name="BtnServiceAddress" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnServiceAddress_Click" HorizontalAlignment="Right" Margin="0" VerticalAlignment="Stretch" >
+                        <Button
+                            x:Name="BtnServiceAddress"
+                            Grid.Row="5"
+                            Margin="0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Stretch"
+                            Click="BtnServiceAddress_Click"
+                            Cursor="Hand"
+                            FontSize="{Binding WordSize12}"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Grid>
-                                        <Label Grid.Column="1" x:Name="Word" Content="服务地址设置" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFC3C3C3"/>
+                                        <Label
+                                            x:Name="Word"
+                                            Grid.Column="1"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Content="服务地址设置"
+                                            FontSize="{TemplateBinding FontSize}"
+                                            Foreground="#FFC3C3C3" />
                                     </Grid>
                                     <ControlTemplate.Triggers>
                                         <Trigger Property="IsMouseOver" Value="True">
-                                            <Setter TargetName="Word" Property="Foreground" Value="#FF3F6FFF"/>
+                                            <Setter TargetName="Word" Property="Foreground" Value="#FF3F6FFF" />
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
@@ -181,67 +319,161 @@
                         </Button>
                     </Grid>
                 </Grid>
-                <Grid x:Name="GridServiceAddress" Margin="20,0" Visibility="Collapsed">
+                <Grid
+                    x:Name="GridServiceAddress"
+                    Margin="20,0"
+                    Visibility="Collapsed">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="100*"/>
-                        <RowDefinition Height="80*"/>
-                        <RowDefinition Height="70*"/>
-                        <RowDefinition Height="15*"/>
-                        <RowDefinition Height="120*"/>
+                        <RowDefinition Height="100*" />
+                        <RowDefinition Height="80*" />
+                        <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" />
+                            <Label
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Top"
+                                Content="服务地址"
+                                FontSize="28"
+                                Foreground="#FF4B62EA" />
+                            <Label
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Top"
+                                Content="设置"
+                                FontSize="14"
+                                Foreground="#FF000000" />
                         </StackPanel>
                     </Grid>
 
-                    <!--服务地址-->
+                    <!--  服务地址  -->
                     <Grid Grid.Row="1">
                         <StackPanel VerticalAlignment="Center">
-                            <Label Content="服务地址:" FontSize="12" Foreground="#FF666666"/>
-                            <TextBox x:Name="TbxServiceAddress" InputMethod.IsInputMethodEnabled="False" Text="" FontSize="14" Foreground="#FF999999" BorderBrush="{x:Null}" BorderThickness="0" Margin="5,5"/>
-                            <Label Background="#FF317EEC" Height="1.5"/>
+                            <Label
+                                Content="服务地址:"
+                                FontSize="12"
+                                Foreground="#FF666666" />
+                            <TextBox
+                                x:Name="TbxServiceAddress"
+                                Margin="5,5"
+                                BorderBrush="{x:Null}"
+                                BorderThickness="0"
+                                FontSize="14"
+                                Foreground="#FF999999"
+                                InputMethod.IsInputMethodEnabled="False"
+                                Text="" />
+                            <Label Height="1.5" Background="#3F6FFF" />
                         </StackPanel>
                     </Grid>
 
-                    <!--切换网络-->
+                    <!--  切换网络  -->
                     <Grid Grid.Row="2">
                         <StackPanel VerticalAlignment="Center">
-                            <Label Content="切换网络:" FontSize="12" Foreground="#FF666666"/>
-                            <StackPanel Orientation="Horizontal" Grid.Row="6" HorizontalAlignment="Left" Margin="0,10,0,0">
-                                <RadioButton x:Name="RbnIsOutsideSchool" Content="校外" FontSize="14" HorizontalAlignment="Left" Foreground="#FF333333"  Margin="20,0,0,0" IsChecked="True" Checked="RbnIsOutsideSchool_Checked" VerticalContentAlignment="Center"/>
-                                <RadioButton x:Name="RbnSchool" Content="校内" FontSize="14" HorizontalAlignment="Left" Foreground="#FF333333" Margin="20,0,0,0" Checked="RbnSchool_Checked" VerticalContentAlignment="Center"/>
+                            <Label
+                                Content="切换网络:"
+                                FontSize="12"
+                                Foreground="#FF666666" />
+                            <StackPanel
+                                Grid.Row="6"
+                                Margin="0,10,0,0"
+                                HorizontalAlignment="Left"
+                                Orientation="Horizontal">
+                                <RadioButton
+                                    x:Name="RbnIsOutsideSchool"
+                                    Margin="20,0,0,0"
+                                    HorizontalAlignment="Left"
+                                    VerticalContentAlignment="Center"
+                                    Checked="RbnIsOutsideSchool_Checked"
+                                    Content="校外"
+                                    FontSize="14"
+                                    Foreground="#FF333333"
+                                    IsChecked="True" />
+                                <RadioButton
+                                    x:Name="RbnSchool"
+                                    Margin="20,0,0,0"
+                                    HorizontalAlignment="Left"
+                                    VerticalContentAlignment="Center"
+                                    Checked="RbnSchool_Checked"
+                                    Content="校内"
+                                    FontSize="14"
+                                    Foreground="#FF333333" />
                             </StackPanel>
                         </StackPanel>
                     </Grid>
-                    <!--按钮-->
+                    <!--  按钮  -->
                     <Grid Grid.Row="4">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="35*"/>
-                            <RowDefinition Height="35*"/>
-                            <RowDefinition Height="5*"/>
-                            <RowDefinition Height="35*"/>
-                            <RowDefinition Height="15*"/>
-                            <RowDefinition Height="25*"/>
-                            <RowDefinition Height="5*"/>
+                            <RowDefinition Height="35*" />
+                            <RowDefinition Height="35*" />
+                            <RowDefinition Height="5*" />
+                            <RowDefinition Height="35*" />
+                            <RowDefinition Height="15*" />
+                            <RowDefinition Height="25*" />
+                            <RowDefinition Height="5*" />
                         </Grid.RowDefinitions>
-                        <Button Grid.Row="1" Cursor="Hand" x:Name="BtnSetServiceAddress" IsDefault="True" Content="设置" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Click="BtnSetServiceAddress_Click">
+                        <Button
+                            x:Name="BtnSetServiceAddress"
+                            Grid.Row="1"
+                            Grid.ColumnSpan="2"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Click="BtnSetServiceAddress_Click"
+                            Content="设置"
+                            Cursor="Hand"
+                            FontSize="18"
+                            FontWeight="Bold"
+                            Foreground="#FFFFFF"
+                            IsDefault="True"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                             <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
+                                        BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                        BorderThickness="1"
+                                        CornerRadius="20">
+                                        <Border.Background>#3F6FFF</Border.Background>
+                                        <ContentPresenter
+                                            Margin="0,5"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Content="{TemplateBinding ContentControl.Content}" />
                                     </Border>
                                 </ControlTemplate>
                             </Button.Template>
                         </Button>
-                        <Button Grid.Row="3" Cursor="Hand" x:Name="BtnCancel" IsDefault="True" Content="取消" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" Padding="2" VerticalContentAlignment="Center" Click="BtnCancel_Click">
+                        <Button
+                            x:Name="BtnCancel"
+                            Grid.Row="3"
+                            Grid.ColumnSpan="2"
+                            Margin="0"
+                            Padding="2"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Click="BtnCancel_Click"
+                            Content="取消"
+                            Cursor="Hand"
+                            FontSize="18"
+                            FontWeight="Bold"
+                            Foreground="#FFFFFF"
+                            IsDefault="True"
+                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
-                                    <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="20">
+                                    <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" />
+                                        <ContentPresenter
+                                            Margin="0,5"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Content="{TemplateBinding ContentControl.Content}" />
                                     </Border>
                                 </ControlTemplate>
                             </Button.Template>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="ScreenRecordingToolbarWindow"
-    Width="423"
+    Width="420"
     Height="58"
     Margin="0"
     AllowsTransparency="True"
@@ -24,15 +24,15 @@
             MouseLeave="gridToobarTwo_MouseLeave"
             Visibility="Visible">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="56*" />
-                <ColumnDefinition Width="361*" />
+                <ColumnDefinition Width="60" />
+                <ColumnDefinition Width="360" />
             </Grid.ColumnDefinitions>
             <Border
                 Grid.ColumnSpan="2"
                 Background="White"
                 BorderBrush="#FF638AFF"
-                BorderThickness="3"
-                CornerRadius="29" />
+                BorderThickness="3,3,0,3"
+                CornerRadius="29 0 0 29" />
             <!--  开始暂停  -->
             <Grid Grid.Column="0">
                 <Button
@@ -47,7 +47,7 @@
                             <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" />
+                                    <Setter TargetName="BtnImages" Property="Opacity" Value="0.6" />
                                 </Trigger>
                                 <Trigger Property="IsPressed" Value="True">
                                     <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Start.png" />
@@ -71,7 +71,7 @@
                             <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" />
+                                    <Setter TargetName="BtnImages" Property="Opacity" Value="0.6" />
                                 </Trigger>
                                 <Trigger Property="IsPressed" Value="True">
                                     <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Pause.png" />
@@ -92,17 +92,17 @@
                     <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*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="38" />
+                    <ColumnDefinition Width="20" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="20" />
+                    <ColumnDefinition Width="38" />
+                    <ColumnDefinition Width="6" />
+                    <ColumnDefinition Width="38" />
+                    <ColumnDefinition Width="20" />
+                    <ColumnDefinition Width="38" />
+                    <ColumnDefinition Width="10" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Row="1" Grid.Column="1">
                     <!--  停止  -->
@@ -114,16 +114,16 @@
                         ToolTip="停止">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
-                                <Image x:Name="BtnImages" Source="/SkinImages/SR/SR_Stop.png" />
+                                <Image
+                                    x:Name="BtnImages"
+                                    Width="24"
+                                    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" />
+                                        <Setter TargetName="BtnImages" Property="Opacity" Value="0.4" />
                                     </Trigger>
                                     <Trigger Property="IsEnabled" Value="False">
-                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Stop_N.png" />
+                                        <Setter TargetName="BtnImages" Property="Opacity" Value="0.4" />
                                     </Trigger>
                                 </ControlTemplate.Triggers>
                             </ControlTemplate>
@@ -153,7 +153,7 @@
                         Padding="0"
                         HorizontalContentAlignment="Center"
                         VerticalContentAlignment="Center"
-                        Content="00:00"
+                        Content="00:00:00"
                         FontFamily="/星火微课;component/Resources/#Quartz"
                         FontSize="36"
                         Foreground="#FF3F6FFF"
@@ -179,19 +179,16 @@
                         Click="BtnBrush_Click"
                         Cursor="Hand"
                         Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                        ToolTip="批注">
+                        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" />
+                                        <Setter TargetName="BtnImages" Property="Opacity" Value="0.4" />
                                     </Trigger>
                                     <Trigger Property="IsEnabled" Value="False">
-                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_PenBlue_N.png" />
+                                        <Setter TargetName="BtnImages" Property="Opacity" Value="0.4" />
                                     </Trigger>
                                 </ControlTemplate.Triggers>
                             </ControlTemplate>
@@ -207,7 +204,7 @@
                         Visibility="Collapsed">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
-                                <Image x:Name="BtnImages" Source="/SkinImages/SR/SR_PenBlue_CL.png" />
+                                <Image x:Name="BtnImages" Source="/SkinImages/SR/SR_PenBlue.png" />
                             </ControlTemplate>
                         </Button.Template>
                     </Button>
@@ -225,13 +222,10 @@
                                 <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" />
+                                        <Setter TargetName="BtnImages" Property="Opacity" Value="0.4" />
                                     </Trigger>
                                     <Trigger Property="IsEnabled" Value="False">
-                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_PenRed_N.png" />
+                                        <Setter TargetName="BtnImages" Property="Opacity" Value="0.4" />
                                     </Trigger>
                                 </ControlTemplate.Triggers>
                             </ControlTemplate>
@@ -247,7 +241,7 @@
                         Visibility="Collapsed">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
-                                <Image x:Name="BtnImages" Source="/SkinImages/SR/SR_PenRed_CL.png" />
+                                <Image x:Name="BtnImages" Source="/SkinImages/SR/SR_PenRed.png" />
                             </ControlTemplate>
                         </Button.Template>
                     </Button>
@@ -278,10 +272,10 @@
                                 <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" />
+                                        <Setter TargetName="BtnImages" Property="Opacity" Value="0.4" />
                                     </Trigger>
                                     <Trigger Property="IsEnabled" Value="False">
-                                        <Setter TargetName="BtnImages" Property="Source" Value="/SkinImages/SR/SR_Out_N.png" />
+                                        <Setter TargetName="BtnImages" Property="Opacity" Value="0.4" />
                                     </Trigger>
                                 </ControlTemplate.Triggers>
                             </ControlTemplate>
@@ -290,195 +284,5 @@
                 </Grid>
             </Grid>
         </Grid>
-        <Viewbox Visibility="Collapsed">
-            <StackPanel>
-                <Viewbox Visibility="Collapsed">
-                    <Grid x:Name="gridToobar" MouseLeftButtonDown="Grid_MouseLeftButtonDown">
-                        <Image x:Name="imgCanvas" Visibility="Collapsed" />
-                        <InkCanvas
-                            x:Name="blackboard_canvas"
-                            Grid.RowSpan="2"
-                            Background="Transparent"
-                            Visibility="Collapsed" />
-                        <!--  画笔工具栏  -->
-                        <Grid x:Name="gridToolbar" Visibility="Collapsed">
-                            <Image HorizontalAlignment="Right" Source="./Images/Toobar22.png" />
-                            <StackPanel
-                                Margin="0,5,10,0"
-                                HorizontalAlignment="Right"
-                                Orientation="Vertical">
-                                <Button
-                                    x:Name="btnToolbarDown"
-                                    Margin="0,5,0,0"
-                                    Click="BtnToolbarDown_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                                    <Image Source="./Images/Toobar5.png" />
-                                </Button>
-                                <Button
-                                    x:Name="btnEraser"
-                                    Margin="0,5,0,0"
-                                    Click="BtnEraser_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                                    <Image Source="./Images/Toobar12.png" />
-                                </Button>
-                                <Button
-                                    x:Name="btnPen"
-                                    Margin="0,5,0,0"
-                                    Click="BtnPen_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                                    <Image Source="./Images/Toobar9.png" />
-                                </Button>
-                                <Button
-                                    Margin="0,5,0,0"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                                    <Image Source="./Images/Toobar16.png" />
-                                </Button>
-                                <Button
-                                    x:Name="btnRectangle"
-                                    Margin="0,5,0,0"
-                                    Click="BtnRectangle_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                                    <Image Source="./Images/Toobar3.png" />
-                                </Button>
-                                <Button
-                                    x:Name="btnRound"
-                                    Margin="0,5,0,0"
-                                    Click="BtnRound_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                                    <Image Source="./Images/Toobar23.png" />
-                                </Button>
-                                <Button
-                                    x:Name="btnThickness"
-                                    Margin="0,5,0,0"
-                                    Click="BtnThickness_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                                    <Image Source="./Images/Toobar1.png" />
-                                </Button>
-                                <Button
-                                    x:Name="btnColour"
-                                    Margin="0,5,0,0"
-                                    Click="BtnColour_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                                    <Image Source="./Images/Toobar18.png" />
-                                </Button>
-                            </StackPanel>
-                        </Grid>
-                        <!--  字体颜色  -->
-                        <Grid x:Name="gridColour" Visibility="Collapsed">
-                            <Image
-                                Margin="0,200,62,0"
-                                HorizontalAlignment="Right"
-                                Source="./Images/Toobar20.png" />
-                            <StackPanel
-                                Margin="0,215,68,0"
-                                HorizontalAlignment="Right"
-                                Orientation="Vertical">
-                                <Button
-                                    x:Name="btnWhite"
-                                    Width="15"
-                                    Height="15"
-                                    Margin="0,0,0,0"
-                                    Background="#FFFFFF"
-                                    Click="BtnWhite_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
-                                <Button
-                                    x:Name="btnRed"
-                                    Width="15"
-                                    Height="15"
-                                    Margin="0,8,0,0"
-                                    Background="#FF0000"
-                                    Click="BtnRed_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
-                                <Button
-                                    x:Name="btnGray"
-                                    Width="15"
-                                    Height="15"
-                                    Margin="0,8,0,0"
-                                    Background="#A7A9AC"
-                                    Click="BtnGray_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
-                                <Button
-                                    x:Name="btnCyanBlue"
-                                    Width="15"
-                                    Height="15"
-                                    Margin="0,8,0,0"
-                                    Background="#63D600"
-                                    Click="BtnCyanBlue_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
-                                <Button
-                                    x:Name="btnYellow"
-                                    Width="15"
-                                    Height="15"
-                                    Margin="0,8,0,0"
-                                    Background="#FFBC00"
-                                    Click="BtnYellow_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
-                                <Button
-                                    x:Name="btnBlue"
-                                    Width="15"
-                                    Height="15"
-                                    Margin="0,8,0,0"
-                                    Background="#00B4FC"
-                                    Click="BtnBlue_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
-                            </StackPanel>
-                        </Grid>
-                        <!--  字体粗细  -->
-                        <Grid x:Name="gridThickness" Visibility="Collapsed">
-                            <Image
-                                Margin="0,200,62,0"
-                                HorizontalAlignment="Right"
-                                Source="./Images/Toobar21.png" />
-                            <StackPanel
-                                Margin="0,260,62,0"
-                                HorizontalAlignment="Right"
-                                Orientation="Vertical">
-                                <Button
-                                    x:Name="btnFine"
-                                    Width="20"
-                                    Height="3"
-                                    Margin="0,0,0,0"
-                                    Background="#FFFFFF"
-                                    Click="BtnFine_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
-                                <Button
-                                    x:Name="btnIn"
-                                    Width="20"
-                                    Height="5"
-                                    Margin="0,10,0,0"
-                                    Background="#FFFFFF"
-                                    Click="BtnIn_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
-                                <Button
-                                    x:Name="btnCrude"
-                                    Width="20"
-                                    Height="10"
-                                    Margin="0,10,0,0"
-                                    Background="#FFFFFF"
-                                    Click="BtnCrude_Click"
-                                    Cursor="Hand"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
-                            </StackPanel>
-                        </Grid>
-                    </Grid>
-                </Viewbox>
-            </StackPanel>
-        </Viewbox>
     </Grid>
-</Window>
+</Window>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -131,7 +131,7 @@ namespace XHWK.WKTool
             drawingAttributes = new DrawingAttributes();
             //将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用
             //InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型
-            blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+
             drawingAttributes.FitToCurve = true;
             //隐藏画笔工具栏
             BtnRecordingScreen.Visibility = Visibility.Visible;
@@ -143,8 +143,7 @@ namespace XHWK.WKTool
             BtnPenRed.Visibility = Visibility.Visible;
             BtnPenBlue_CL.Visibility = Visibility.Collapsed;
             BtnPenRed_CL.Visibility = Visibility.Collapsed;
-            TxbTime.Content = "00:00";
-
+            TxbTime.Content = "00:00:00";
         }
 
         private void K_hook_KeyDownEvent(object sender, System.Windows.Forms.KeyEventArgs e)
@@ -165,7 +164,6 @@ namespace XHWK.WKTool
 
         #region 事件
 
-
         private DateTime SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
 
         /// <summary>
@@ -180,14 +178,7 @@ namespace XHWK.WKTool
                 SRTime = SRTime.AddMilliseconds(1000);
             }
 
-            if (SRTime.Hour > 0)
-            {
-                TxbTime.Content = SRTime.ToString("HH:mm:ss");
-            }
-            else
-            {
-                TxbTime.Content = SRTime.ToString("mm:ss");
-            }
+            TxbTime.Content = SRTime.ToString("HH:mm:ss");
         }
 
         /// <summary>
@@ -218,11 +209,9 @@ namespace XHWK.WKTool
                 VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_" + num + "." + fileType;
             }
 
-
             TempVideoPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_" + num + ".avi";
             TempAudioPathName1 = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_" + num + "_1.mp3";
             TempAudioPathName2 = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_" + num + "_2.mp3";
-
         }
 
         /// <summary>
@@ -231,13 +220,13 @@ namespace XHWK.WKTool
         private bool IsPressButton = false;
 
         //录制麦克风的声音
-        ZAudioRecordHelper helper1 = null;
+        private ZAudioRecordHelper helper1 = null;
 
         //录制扬声器的声音
-        ZAudioRecordHelper helper2 = null;
+        private ZAudioRecordHelper helper2 = null;
 
         //桌面录制
-        ZVideoRecordHelper helper3 = null;
+        private ZVideoRecordHelper helper3 = null;
 
         public IntPtr winHandle;// 当前窗体指针
 
@@ -292,7 +281,6 @@ namespace XHWK.WKTool
                     WkType = Enum_WKVidetype.RecordingScreen
                 };
                 SetUpVideoPathName();
-       
 
                 if (APP.W_CountdownWindow == null)
                 {
@@ -305,8 +293,6 @@ namespace XHWK.WKTool
                 }
                 APP.W_CountdownWindow.Show();
 
-
-
                 BtnRecordingScreen.Visibility = Visibility.Collapsed;
                 BtnRecordingScreenPause.Visibility = Visibility.Visible;
                 BtnStopRecordingScreen.IsEnabled = true; //停止录制按钮可点击
@@ -354,8 +340,6 @@ namespace XHWK.WKTool
                         helper1.StartRecordAudio();
                         helper2.StartRecordAudio();
                         helper3.StartRecordVideo();
-
-                       
                     });
 
                     Thread.Sleep(1000);
@@ -364,7 +348,6 @@ namespace XHWK.WKTool
                     {
                         k_hook.Start();//安装键盘钩子
                     });
-                   
                 })
                 { IsBackground = true }.Start();
 
@@ -390,7 +373,6 @@ namespace XHWK.WKTool
                 BtnRecordingScreen.Visibility = Visibility.Collapsed;
                 BtnRecordingScreenPause.Visibility = Visibility.Visible;
             }
-
         }
 
         /// <summary>
@@ -501,7 +483,6 @@ namespace XHWK.WKTool
 
             SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
             TxbTime.Content = "00:00";
-
         }
 
         public void MaxToobar()
@@ -518,19 +499,6 @@ namespace XHWK.WKTool
 
         #region 画笔相关
 
-        /// <summary>
-        /// 画笔工具栏关闭事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnToolbarDown_Click(object sender, RoutedEventArgs e)
-        {
-            gridToolbar.Visibility = Visibility.Hidden;
-            gridColour.Visibility = Visibility.Hidden;
-            gridThickness.Visibility = Visibility.Hidden;
-            APP.W_PracticeWindow.Hide();
-        }
-
         /// <summary>
         /// 笔调用批注
         /// </summary>
@@ -749,142 +717,6 @@ namespace XHWK.WKTool
             return Convert.ToInt64(ts.TotalMilliseconds).ToString();
         }
 
-        /// <summary>
-        /// 画笔粗细事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnThickness_Click(object sender, RoutedEventArgs e)
-        {
-            gridThickness.Visibility = Visibility.Visible;
-            gridColour.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 画笔颜色事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnColour_Click(object sender, RoutedEventArgs e)
-        {
-            gridColour.Visibility = Visibility.Visible;
-            gridThickness.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 白色
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnWhite_Click(object sender, RoutedEventArgs e)
-        {
-            //drawingAttributes.Color = Colors.White;
-            APP.W_PracticeWindow.White();
-            gridColour.Visibility = Visibility.Collapsed;
-            gridThickness.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 红色
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnRed_Click(object sender, RoutedEventArgs e)
-        {
-            //drawingAttributes.Color = Colors.Red;
-            APP.W_PracticeWindow.Red();
-            gridColour.Visibility = Visibility.Collapsed;
-            gridThickness.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 黄色
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnYellow_Click(object sender, RoutedEventArgs e)
-        {
-            //drawingAttributes.Color = Colors.Gold;
-            APP.W_PracticeWindow.Yellow();
-            gridColour.Visibility = Visibility.Collapsed;
-            gridThickness.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 青色
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnCyanBlue_Click(object sender, RoutedEventArgs e)
-        {
-            //drawingAttributes.Color = Colors.LimeGreen;
-            APP.W_PracticeWindow.CyanBlue();
-            gridColour.Visibility = Visibility.Collapsed;
-            gridThickness.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 灰色
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnGray_Click(object sender, RoutedEventArgs e)
-        {
-            //drawingAttributes.Color = Colors.Gray;
-            APP.W_PracticeWindow.Gray();
-            gridColour.Visibility = Visibility.Collapsed;
-            gridThickness.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 蓝色
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnBlue_Click(object sender, RoutedEventArgs e)
-        {
-            //drawingAttributes.Color = Colors.DeepSkyBlue;
-            APP.W_PracticeWindow.Blue();
-            gridColour.Visibility = Visibility.Collapsed;
-            gridThickness.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 画笔 细
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnFine_Click(object sender, RoutedEventArgs e)
-        {
-            APP.W_PracticeWindow.Fine();
-            gridColour.Visibility = Visibility.Collapsed;
-            gridThickness.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 画笔 中
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnIn_Click(object sender, RoutedEventArgs e)
-        {
-            APP.W_PracticeWindow.In();
-            gridColour.Visibility = Visibility.Collapsed;
-            gridThickness.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 画笔粗
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnCrude_Click(object sender, RoutedEventArgs e)
-        {
-            APP.W_PracticeWindow.Crude();
-            gridColour.Visibility = Visibility.Collapsed;
-            gridThickness.Visibility = Visibility.Collapsed;
-        }
-
         /// <summary>
         /// 橡皮
         /// </summary>
@@ -939,8 +771,6 @@ namespace XHWK.WKTool
         /// </summary>
         public event StopRecordingScreen Click_stopRecordingScreen;
 
-
-
         /// <summary>
         /// 移动工具栏
         /// </summary>
@@ -1061,7 +891,7 @@ namespace XHWK.WKTool
                 {
                     return;
                 }
-                BtnStopRecordingScreen_Click(null,null);
+                BtnStopRecordingScreen_Click(null, null);
             }
             APP.W_XHMicroLessonSystemWindow.InitializeKeyDownEvent();
             APP.W_XHMicroLessonSystemWindow.InitPen();

XHWK.WKTool/UControl/Uc_VideoItem.xaml

@@ -184,7 +184,7 @@
                                 Height="30"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
-                                Background="#FFC3C3C3"
+                                Background="#f85e5e"
                                 Click="BtnDelVideo_Click"
                                 Content="删除"
                                 Cursor="Hand"

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -350,10 +350,9 @@ namespace XHWK.WKTool.UControl
             if ("上传成功".Equals(text))
             {
                 W_UploadWindow.Close();
-                //BtnUpload.Visibility = Visibility.Hidden;
-                BorUploadBtn.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#DDDDDD"));
-                BtnUpload.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#999999"));
+                //BorUploadBtn.Visibility = Visibility.Hidden;
                 BtnUpload.IsEnabled = false;
+                BtnUpload.Background.Opacity = 0.6;
             }
         }
         /// <summary>

XHWK.WKTool/Welcome.xaml.cs

@@ -12,6 +12,8 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
 
+            //new DeviceWindow().Show();
+            //Close();
 
             if (!File.Exists(APP.DataPath + "signature.txt"))//上次登录时间为空 或者签名为空 或者上次登录时间不是今天   都需要输入密匙验证 ，否则只验证本地的签名
             {
@@ -25,4 +27,4 @@ namespace XHWK.WKTool
             }
         }
     }
-}
+}

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -98,136 +98,7 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <DataTemplate x:Key="TongjiItem">
-            <UniformGrid
-                Height="50"
-                Margin="0,0,0,0"
-                Background="{Binding Colour}"
-                Columns="5"
-                Rows="1">
-                <!--  题号  -->
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    FontSize="16"
-                    Text="{Binding SerialNumber}" />
-                <Grid>
-                    <StackPanel
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Orientation="Horizontal">
-                        <TextBox
-                            Width="150"
-                            Height="30"
-                            Padding="0,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="16"
-                            IsEnabled="{Binding IsEnabled, Mode=TwoWay}"
-                            Text="{Binding VideoName, Mode=TwoWay}" />
-                        <Button
-                            x:Name="btnModify"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Click="BtnModify_Click"
-                            Cursor="Hand">
-                            <Grid>
-                                <Image
-                                    Height="20"
-                                    Margin="6,6,6,6"
-                                    Source="./Images/fileDirectory3.png" />
-                                <Image
-                                    Height="20"
-                                    Margin="6,6,6,6"
-                                    Source="./Images/fileDirectory4.png" />
-                            </Grid>
-                        </Button>
-                    </StackPanel>
-                </Grid>
-
-                <!--  分值  -->
-                <!--
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    FontSize="15"
-                    Text="{Binding VideoDuration}" />-->
-
-                <!--  平均时长  -->
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    FontSize="16"
-                    Text="{Binding VideoSize}" />
-                <!--  最短时长  -->
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    FontSize="16"
-                    Text="{Binding VideoTime}" />
 
-                <Grid>
-                    <StackPanel
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Orientation="Horizontal">
-                        <Button
-                            x:Name="btnPlay"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Click="BtnPlay_Click"
-                            Cursor="Hand">
-                            <Grid>
-                                <Image
-                                    Height="20"
-                                    Margin="10"
-                                    Source="./Images/fileDirectory1.png" />
-                                <Image
-                                    Height="20"
-                                    Margin="10"
-                                    Source="./Images/fileDirectory2.png" />
-                            </Grid>
-                        </Button>
-                        <Button
-                            x:Name="btnUpload"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Click="BtnUploads_Click"
-                            Cursor="Hand">
-                            <Grid>
-                                <Image
-                                    Height="20"
-                                    Margin="6,6,6,6"
-                                    Source="./Images/fileDirectory7.png"
-                                    Visibility="{Binding Visi}" />
-                                <Image
-                                    Height="20"
-                                    Margin="6,6,6,6"
-                                    Source="./Images/fileDirectory8.png"
-                                    Visibility="{Binding Coll}" />
-                            </Grid>
-                        </Button>
-                        <Button
-                            x:Name="btnDelete"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Click="BtnDelete_Click"
-                            Cursor="Hand">
-                            <Grid>
-                                <Image
-                                    Height="20"
-                                    Margin="6,6,6,6"
-                                    Source="./Images/fileDirectory5.png" />
-                                <Image
-                                    Height="20"
-                                    Margin="6,6,6,6"
-                                    Source="./Images/fileDirectory6.png" />
-                            </Grid>
-                        </Button>
-                    </StackPanel>
-                </Grid>
-            </UniformGrid>
-        </DataTemplate>
         <!--  摄像头样式  -->
         <Style x:Key="stlToggleButton" TargetType="ToggleButton">
             <Setter Property="Foreground" Value="White" />
@@ -1355,7 +1226,7 @@
                         <Grid Height="650">
                             <Grid Background="#FFFFFF">
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="200" />
+                                    <RowDefinition Height="146" />
                                     <RowDefinition Height="160*" />
                                     <RowDefinition Height="100*" />
                                     <RowDefinition Height="200*" />
@@ -1372,7 +1243,7 @@
                                     </Grid.RowDefinitions>
                                     <Grid Grid.Row="1" Grid.Column="0">
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="215*" />
+                                            <ColumnDefinition Width="100" />
                                             <ColumnDefinition Width="646*" />
                                         </Grid.ColumnDefinitions>
                                         <TextBlock
@@ -1385,15 +1256,15 @@
                                     </Grid>
                                     <Grid Grid.Row="2">
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="120*" />
+                                            <ColumnDefinition Width="100" />
                                             <ColumnDefinition Width="207*" />
                                             <ColumnDefinition Width="207*" />
                                             <ColumnDefinition Width="207*" />
                                             <ColumnDefinition Width="120*" />
                                         </Grid.ColumnDefinitions>
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="100*" />
-                                            <RowDefinition Height="36*" />
+                                            <RowDefinition Height="80" />
+                                            <RowDefinition Height="36" />
                                         </Grid.RowDefinitions>
                                         <Grid
                                             Grid.Row="0"
@@ -1458,8 +1329,7 @@
                                                 Source="/SkinImages/Skin/Skin_Select.png"
                                                 Visibility="Hidden" />
                                         </Grid>
-                                        <Grid Grid.Row="0" Grid.Column="3" />
-                                        <Grid Grid.Row="0" Grid.Column="4" />
+
                                         <Grid Grid.Row="1" Grid.Column="1">
                                             <TextBlock
                                                 HorizontalAlignment="Center"
@@ -1476,8 +1346,7 @@
                                                 Foreground="#333333"
                                                 Text="科技蓝" />
                                         </Grid>
-                                        <Grid Grid.Row="1" Grid.Column="3" />
-                                        <Grid Grid.Row="1" Grid.Column="4" />
+
                                     </Grid>
 
                                     <Label
@@ -1490,7 +1359,7 @@
                                 <Grid Grid.Row="1" Margin="100,0">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="215*" />
+                                            <ColumnDefinition Width="100" />
                                             <ColumnDefinition Width="215*" />
                                             <ColumnDefinition Width="215*" />
                                             <ColumnDefinition Width="216*" />
@@ -1534,7 +1403,8 @@
                                                     Cursor="Hand"
                                                     FontSize="{Binding WordSize16}"
                                                     Foreground="#333333"
-                                                    Style="{StaticResource radBase}" />
+                                                    Style="{StaticResource radBase}"
+                                                    Visibility="Collapsed" />
                                                 <RadioButton
                                                     x:Name="rbnAVI"
                                                     Margin="15,0,0,0"
@@ -1671,7 +1541,7 @@
                                 <Grid Grid.Row="2" Margin="100,0">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="215*" />
+                                            <ColumnDefinition Width="100" />
                                             <ColumnDefinition Width="430*" />
                                             <ColumnDefinition Width="215*" />
                                         </Grid.ColumnDefinitions>
@@ -1706,7 +1576,7 @@
                                                         BorderBrush="{x:Null}"
                                                         BorderThickness="0"
                                                         Content="D:\"
-                                                        FontSize="{Binding WordSize12}"
+                                                        FontSize="{Binding WordSize14}"
                                                         Foreground="#333333" />
                                                 </Border>
                                             </Grid>
@@ -1755,7 +1625,7 @@
                                 <!--  版权 快捷键 版本号 h200  -->
                                 <Grid Grid.Row="3" Margin="100,0">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="215*" />
+                                        <ColumnDefinition Width="100" />
                                         <ColumnDefinition Width="215*" />
                                         <ColumnDefinition Width="215*" />
                                         <ColumnDefinition Width="215*" />
@@ -1814,7 +1684,7 @@
                                             VerticalAlignment="Center"
                                             FontSize="{Binding WordSize16}"
                                             Foreground="#FF666666"
-                                            Text="正式版：" />
+                                            Text="正式版" />
                                     </Grid>
                                     <Grid Grid.Row="3" Grid.Column="1">
                                         <TextBlock
@@ -1831,11 +1701,11 @@
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="215*" />
                                         <ColumnDefinition Width="530*" />
-                                        <ColumnDefinition Width="115*" />
+                                        <ColumnDefinition Width="180*" />
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="50*" />
-                                        <RowDefinition Height="40*" />
+
                                     </Grid.RowDefinitions>
                                     <Grid Grid.Column="2">
                                         <!--  保存  -->
@@ -1844,7 +1714,7 @@
                                             Width="76"
                                             Height="30"
                                             HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
+                                            VerticalAlignment="Center"
                                             Background="#3f6fff"
                                             Click="BtnSave_Click"
                                             Content="保存"
@@ -1877,141 +1747,7 @@
                             </Grid>
                         </Grid>
                     </ScrollViewer>
-                    <!--  上传  废弃  -->
-                    <Grid x:Name="gridUpload" Visibility="Collapsed">
-                        <Border Background="#EFF1F8">
-                            <Grid Margin="0,0,0,0" Background="#FFFFFF">
-                                <!--  分4行  -->
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="30" />
-                                </Grid.RowDefinitions>
-                                <!--  第二行 内容  -->
-                                <Grid Grid.Row="0" Margin="0,0,0,0">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="45" />
-                                        <RowDefinition Height="*" />
-                                    </Grid.RowDefinitions>
-                                    <UniformGrid
-                                        x:Name="uniStatisticsByTitle"
-                                        Grid.Row="0"
-                                        Margin="0,0,0,0"
-                                        Background="#E6F0FF"
-                                        Columns="5"
-                                        Rows="1">
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="16"
-                                            Text="序号" />
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="16"
-                                            Text="视频名称" />
 
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="16"
-                                            Text="视频大小" />
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="16"
-                                            Text="日期" />
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="16"
-                                            Text="操作" />
-                                    </UniformGrid>
-                                    <ListBox
-                                        x:Name="listView1"
-                                        Grid.Row="1"
-                                        Margin="0,0,0,0"
-                                        BorderThickness="0"
-                                        FontSize="20"
-                                        ItemContainerStyle="{StaticResource ListBoxItemContainerStyle}"
-                                        ItemTemplate="{StaticResource TongjiItem}"
-                                        ItemsSource="{Binding menuList}"
-                                        ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                        ScrollViewer.VerticalScrollBarVisibility="Disabled" />
-                                </Grid>
-                                <StackPanel
-                                    x:Name="stpUp"
-                                    Grid.Row="3"
-                                    Grid.Column="1"
-                                    Width="180"
-                                    Height="30"
-                                    Margin="0,0,0,0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Bottom"
-                                    Background="Transparent"
-                                    Orientation="Horizontal">
-                                    <Button
-                                        x:Name="btnLastPage"
-                                        Width="60"
-                                        Height="20"
-                                        Click="BtnLastPage_Click"
-                                        Cursor="Hand"
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                                        <StackPanel>
-                                            <Image
-                                                Width="16"
-                                                Height="12"
-                                                Source=".\Images\class_p1.png" />
-                                        </StackPanel>
-                                    </Button>
-                                    <Grid Width="60" Background="Transparent">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="311*" />
-                                            <RowDefinition Height="483*" />
-                                        </Grid.RowDefinitions>
-                                        <StackPanel
-                                            Grid.Row="1"
-                                            Margin="0,-12,0,0"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            Background="Transparent">
-                                            <StackPanel
-                                                HorizontalAlignment="Center"
-                                                Background="Transparent"
-                                                Orientation="Horizontal">
-                                                <TextBlock
-                                                    x:Name="txbCurrpageTwo"
-                                                    FontSize="15"
-                                                    TextAlignment="Center" />
-                                                <TextBlock
-                                                    FontSize="15"
-                                                    Text="/"
-                                                    TextAlignment="Center" />
-                                                <TextBlock
-                                                    x:Name="txbPageNumTwo"
-                                                    FontSize="15"
-                                                    TextAlignment="Center" />
-                                            </StackPanel>
-                                        </StackPanel>
-                                    </Grid>
-                                    <Button
-                                        x:Name="btnNextPage"
-                                        Width="60"
-                                        Height="20"
-                                        Background="Transparent"
-                                        Click="BtnNextPage_Click"
-                                        Cursor="Hand"
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                                        <StackPanel>
-                                            <Image
-                                                Width="16"
-                                                Height="12"
-                                                Source=".\Images\class_p2.png" />
-                                        </StackPanel>
-                                    </Button>
-                                </StackPanel>
-                            </Grid>
-                        </Border>
-                    </Grid>
                     <!--  我的  -->
                     <Grid
                         x:Name="GridMyVideo"

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -303,8 +303,6 @@ namespace XHWK.WKTool
         {
             //设置
             gridSetUp.Visibility = Visibility.Collapsed;
-            //上传-无用
-            gridUpload.Visibility = Visibility.Collapsed;
             ////页码
             //GridPage.Visibility = Visibility.Collapsed;
             //我的
@@ -2187,7 +2185,7 @@ namespace XHWK.WKTool
                 GridMain.Visibility = Visibility.Visible;
                 GridM.IsEnabled = true;
                 GridRecordingTitle.Visibility = Visibility.Visible;
-               
+
             }
             else
             {
@@ -2195,7 +2193,7 @@ namespace XHWK.WKTool
                 GridMyVideo.Visibility = Visibility.Visible;
                 LoadUploadInitData();
             }
-     
+
         }
 
         /// <summary>
@@ -2209,98 +2207,11 @@ namespace XHWK.WKTool
             IsModify = false;
             //加载视频列表
             LoadingVideoList();
-            int i = 1;
-            bool isColour = true;
-            pageData.menuList.Clear();
-            //显示视频
-            foreach (Model_Video videoinfo in model_VideoList)
-            {
-                //是否已上传
-                //videoinfo.IsUpload;
-                //录制时间
-                //videoinfo.RSTime;
-                //文件大小
-                //videoinfo.VideoSize;
-                //文件缩略图路径
-                //videoinfo.ThumbnailPath;
-                //文件唯一标示 上传事件筛选需要上传的视频
-                //videoinfo.FileGuid;
-                //文件存储路径
-                //videoinfo.VidePath;
-
-                string colour = "#FFFFFF";
-                if (isColour == true)
-                {
-                    colour = "#FFFFFF";
-                    isColour = false;
-                }
-                else
-                {
-                    colour = "#E6F1FF";
-                    isColour = true;
-                }
-                string vis = "Visible";
-                string cos = "Collapsed";
-                if (!videoinfo.IsUpload)
-                {
-                    vis = "Collapsed";
-                    cos = "Visible";
-                }
-                //if(i==1)//ceshi
-                //{
-                //    vis = "Visible";
-                //    cos = "Collapsed";
-                //}
-                if (i <= 16)
-                {
-                    pageData.menuList.Add(new FileDirectoryModel()
-                    {
-                        SerialNumber = i,
-                        VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
-                        Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
-                        FilePath = videoinfo.VideoPath.Replace(FileToolsCommon.GetIOFileName(videoinfo.VideoPath), "").Trim(),
-                        VideoDuration = 0,
-                        VideoSize = videoinfo.VideoSize,
-                        VideoTime = videoinfo.RSTime,
-                        IsEnabled = false,
-                        Path = videoinfo.VideoPath,
-                        Colour = colour,
-                        Visi = vis,
-                        Coll = cos,
-                        FileGuid = videoinfo.FileGuid,
-                        VideoType = videoinfo.VideoType.ToString(),
-                        VideoSizes = videoinfo.VideoSizebyte
-                    }); ;
-                }
-                i++;
-            }
+
+
             Currpage = 0;
             PageNum = 0;
-            if (pageData.menuList.Count > 0)
-            {
-                Currpage = 1;
-                txbCurrpageTwo.Text = Currpage.ToString();
-                stpUp.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                stpUp.Visibility = Visibility.Hidden;
-            }
-            PageNum = model_VideoList.Count;
-            if (PageNum > 0)
-            {
-                int t = 1;
-                while (PageNum > 16 * t)
-                {
-                    t++;
-                }
-                PageNum = t;
-            }
-            else
-            {
-                PageNum = 0;
-            }
-            txbPageNumTwo.Text = PageNum.ToString();
+
             APP.myloading.Hide();
             DataContext = pageData;
         }
@@ -2367,154 +2278,8 @@ namespace XHWK.WKTool
             }
         }
 
-        ////定义事件
-        //public event ChangeTextHandler ChangeTextEvents;
-        /// <summary>
-        /// 上传
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnUploads_Click(object sender, RoutedEventArgs e)
-        {
-            Console.WriteLine("Subscript:" + Subscript);
-            if (APP.IsLoginType == false)
-            {
-                Login();
-                return;
-            }
 
-         
-            pageData.menuList[Subscript].IsEnabled = false;
-            List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnUpload");
-            for (int i = 0; i < buttons.Count; i++)
-            {
-                if (buttons[i] == sender)
-                {
-                    DAL_Upload dAL_Upload = new DAL_Upload();
 
-                    if (dAL_Upload.UploadVideo(pageData.menuList[i].FileGuid, out string ErrMessage))
-                    {
-                        //MessageWindow.Show("视频上传服务器成功！");
-                        if (APP.W_UploadWindow == null)
-                        {
-                            APP.W_UploadWindow = new UploadWindow
-                            {
-                                Owner = this
-                            };
-                            APP.W_UploadWindow.ChangeTextEvents += new ChangeTextHandlers(frm_ChangeTextEvents);
-                        }
-
-                        //long size = Convert.ToInt64(FileToolsCommon.GetFileSizeByMB(pageData.menuList[i].FilePath));
-                        APP.W_UploadWindow.Initialize(pageData.menuList[i].VideoName, pageData.menuList[i].VideoSizes, pageData.menuList[i].VideoType, pageData.menuList[i].FileGuid, i);
-                        APP.W_UploadWindow.ShowDialog();
-                    }
-                    else
-                    {
-                        MessageWindow.Show(ErrMessage);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// 上传返回事件
-        /// </summary>
-        /// <param name="text"></param>
-        private void frm_ChangeTextEvents(string text, int i)
-        {
-            if ("上传成功".Equals(text))
-            {
-                pageData.menuList[i].Visi = "Visible";
-                pageData.menuList[i].Coll = "Collapsed";
-
-                DataContext = pageData;
-            }
-        }
-
-        /// <summary>
-        /// 删除
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnDelete_Click(object sender, RoutedEventArgs e)
-        {
-            MessageBoxResult dr = MessageWindow.Show("确定删除该视频？", "提示", MessageBoxButton.OKCancel);
-            if (dr == MessageBoxResult.OK)
-            {
-                pageData.menuList[Subscript].IsEnabled = false;
-                List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnDelete");
-                for (int i = 0; i < buttons.Count; i++)
-                {
-                    if (buttons[i] == sender)
-                    {
-                        //if (APP.W_PromptWindow == null)
-                        //{
-                        //    APP.W_PromptWindow = new PromptWindow();
-                        //    APP.W_PromptWindow.Owner = this;
-                        //}
-                        //APP.W_PromptWindow.Initialize(pageData.menuList[i].VideoName);
-                        //APP.W_PromptWindow.ShowDialog();
-
-                        foreach (Model_WKData wKData in APP.WKDataList)
-                        {
-                            if (wKData.VideoList == null)
-                            {
-                                continue;
-                            }
-
-                            if (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[i].FileGuid))
-                            {
-                                try
-                                {
-                                    FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid).VideoPath);
-                                    FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid).ThumbnailPath);
-                                    wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid));
-                                    InitializeUpload();
-                                    return;
-                                }
-                                catch (Exception ex)
-                                {
-                                    MessageWindow.Show("无法删除视频！" + ex.Message);
-                                    return;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// 播放
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnPlay_Click(object sender, RoutedEventArgs e)
-        {
-            pageData.menuList[Subscript].IsEnabled = false;
-            List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnPlay");
-            for (int i = 0; i < buttons.Count; i++)
-            {
-                if (buttons[i] == sender)
-                {
-                    try
-                    {
-                        ProcessStartInfo psi = new ProcessStartInfo(pageData.menuList[i].Path);
-                        Process pro = new Process
-                        {
-                            StartInfo = psi
-                        };
-                        pro.Start();
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteErrLog("FileDirectoryWindow【BtnPlay_Click】" + ex.Message, ex);
-                        System.Windows.MessageBox.Show(ex.Message);
-                        return;
-                    }
-                }
-            }
-        }
 
         /// <summary>
         /// 搜索集合匹配的索引
@@ -2566,247 +2331,6 @@ namespace XHWK.WKTool
             return list;
         }
 
-        /// <summary>
-        /// 修改
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnModify_Click(object sender, RoutedEventArgs e)
-        {
-            if (IsModify)
-            {
-                try
-                {
-                    string newName = pageData.menuList[Subscript].VideoName + "." + pageData.menuList[Subscript].VideoType;
-                    bool isName = ModifyPathName(pageData.menuList[Subscript].FileGuid, newName, out string Errmessage);
-                    if (!isName)
-                    {
-                        MessageWindow.Show(Errmessage);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteErrLog("XHMicroLessonSystemWindow(BtnModify_Click)" + ex.Message, ex);
-                }
-                IsModify = false;
-                pageData.menuList[Subscript].IsEnabled = false;
-                listView1.DataContext = pageData;
-            }
-            else
-            {
-                List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnModify");
-                for (int i = 0; i < buttons.Count; i++)
-                {
-                    if (buttons[i] == sender)
-                    {
-                        pageData.menuList[i].IsEnabled = true;
-                        Subscript = i;
-                        IsModify = true;
-                    }
-                }
-            }
-        }
-
-        //private int MouseNumber = 0;
-        /// <summary>
-        /// 上传 上页
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnLastPage_Click(object sender, RoutedEventArgs e)
-        {
-            if (Currpage > 1)
-            {
-                Currpage -= 1;
-                txbCurrpageTwo.Text = Currpage.ToString();
-                int i = 1;
-                bool isColour = true;
-                pageData.menuList.Clear();
-                //显示视频
-                foreach (Model_Video videoinfo in model_VideoList)
-                {
-                    //是否已上传
-                    //videoinfo.IsUpload;
-                    //录制时间
-                    //videoinfo.RSTime;
-                    //文件大小
-                    //videoinfo.VideoSize;
-                    //文件缩略图路径
-                    //videoinfo.ThumbnailPath;
-                    //文件唯一标示 上传事件筛选需要上传的视频
-                    //videoinfo.FileGuid;
-                    //文件存储路径
-                    //videoinfo.VidePath;
-
-                    string colour = "#FFFFFF";
-                    if (isColour == true)
-                    {
-                        colour = "#FFFFFF";
-                        isColour = false;
-                    }
-                    else
-                    {
-                        colour = "#E6F1FF";
-                        isColour = true;
-                    }
-                    string vis = "Visible";
-                    string cos = "Collapsed";
-                    if (!videoinfo.IsUpload)
-                    {
-                        vis = "Collapsed";
-                        cos = "Visible";
-                    }
-                    if (i <= Currpage * 16 && i >= (Currpage - 1) * 16)
-                    {
-                        pageData.menuList.Add(new FileDirectoryModel()
-                        {
-                            SerialNumber = i,
-                            VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
-                            Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
-                            FilePath = videoinfo.VideoPath.Replace(FileToolsCommon.GetIOFileName(videoinfo.VideoPath), "").Trim(),
-                            VideoDuration = 0,
-                            VideoSize = videoinfo.VideoSize,
-                            VideoTime = videoinfo.RSTime,
-                            IsEnabled = false,
-                            Path = videoinfo.VideoPath,
-                            Colour = colour,
-                            Visi = vis,
-                            Coll = cos,
-                            FileGuid = videoinfo.FileGuid,
-                            VideoType = videoinfo.VideoType.ToString()
-                        }); ;
-                    }
-                    i++;
-                }
-                APP.myloading.Hide();
-            }
-        }
-
-        /// <summary>
-        /// 上传 下页
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnNextPage_Click(object sender, RoutedEventArgs e)
-        {
-            if (Currpage < PageNum)
-            {
-                Currpage += 1;
-                txbCurrpageTwo.Text = Currpage.ToString();
-                int i = 1;
-                bool isColour = true;
-                pageData.menuList.Clear();
-                //显示视频
-                foreach (Model_Video videoinfo in model_VideoList)
-                {
-                    //是否已上传
-                    //videoinfo.IsUpload;
-                    //录制时间
-                    //videoinfo.RSTime;
-                    //文件大小
-                    //videoinfo.VideoSize;
-                    //文件缩略图路径
-                    //videoinfo.ThumbnailPath;
-                    //文件唯一标示 上传事件筛选需要上传的视频
-                    //videoinfo.FileGuid;
-                    //文件存储路径
-                    //videoinfo.VidePath;
-
-                    string colour = "#FFFFFF";
-                    if (isColour == true)
-                    {
-                        colour = "#FFFFFF";
-                        isColour = false;
-                    }
-                    else
-                    {
-                        colour = "#E6F1FF";
-                        isColour = true;
-                    }
-                    string vis = "Visible";
-                    string cos = "Collapsed";
-                    if (!videoinfo.IsUpload)
-                    {
-                        vis = "Collapsed";
-                        cos = "Visible";
-                    }
-                    if (i <= Currpage * 16 && i > (Currpage - 1) * 16)
-                    {
-                        pageData.menuList.Add(new FileDirectoryModel()
-                        {
-                            SerialNumber = i,
-                            VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
-                            Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
-                            FilePath = videoinfo.VideoPath.Replace(FileToolsCommon.GetIOFileName(videoinfo.VideoPath), "").Trim(),
-                            VideoDuration = 0,
-                            VideoSize = videoinfo.VideoSize,
-                            VideoTime = videoinfo.RSTime,
-                            IsEnabled = false,
-                            Path = videoinfo.VideoPath,
-                            Colour = colour,
-                            Visi = vis,
-                            Coll = cos,
-                            FileGuid = videoinfo.FileGuid,
-                            VideoType = videoinfo.VideoType.ToString()
-                        }); ;
-                    }
-                    i++;
-                }
-                APP.myloading.Hide();
-            }
-        }
-
-        /// <summary>
-        /// 修改文件名
-        /// </summary>
-        /// <param name="Guid">唯一编号</param>
-        /// <param name="NewName">新文件名带后缀 不带路径</param>
-        /// <param name="Errmessage">错误信息</param>
-        /// <returns></returns>
-        private bool ModifyPathName(string FileGuid, string NewName, out string Errmessage)
-        {
-            Errmessage = "";
-            foreach (Model_WKData WKData in APP.WKDataList)
-            {
-                if (WKData.VideoList.Exists(x => x.FileGuid == FileGuid))
-                {
-                    Model_Video model_Video = WKData.VideoList.Find(x => x.FileGuid == FileGuid);
-
-                    string filePathName = model_Video.VideoPath;
-                    string filePath = FileToolsCommon.GetDirectoryName(filePathName);
-                    string newFilePathName = filePath + NewName;
-                    //缩略图
-                    string ThumbnailPath = filePath + "ThumbnailPath/";
-                    FileToolsCommon.CreateDirectory(ThumbnailPath);
-                    //缩略图存储位置
-                    string ThumbnailPathName = ThumbnailPath + NewName.Replace(".", "") + ".JPG";
-                    if (FileToolsCommon.IsExistFile(newFilePathName))
-                    {
-                        Errmessage = "文件已存在，请重新修改文件名！";
-                        return false;
-                    }
-                    else
-                    {
-                        //修改文件名
-                        FileToolsCommon.Copy(filePathName, newFilePathName);
-                        model_Video.VideoPath = newFilePathName;
-                        //修改缩略图名
-                        FileToolsCommon.DeleteFile(ThumbnailPathName);
-                        FileToolsCommon.Copy(model_Video.ThumbnailPath, ThumbnailPathName);
-                        model_Video.ThumbnailPath = ThumbnailPathName;
-                        APP.SaveWkData();
-                        return true;
-                    }
-                }
-                else
-                {
-                    continue;
-                }
-            }
-            Errmessage = "视频文件有改动，当前文件不存在，请关闭后重新打开“我的”";
-            return false;
-        }
-
         #endregion 上传 列表
 
         #region 新上传 显示缩略图
@@ -3711,19 +3235,12 @@ namespace XHWK.WKTool
                 TxbLoginType.Text = APP.UserInfo.Username;
                 ImgHeadImgN.Visibility = Visibility.Collapsed;
                 ImgHeadImg.Visibility = Visibility.Visible;
-
-                //APP.UserInfo.Userphone
-                //ImgUpload.Visibility = Visibility.Visible;
-                //ImgUploadTwo.Visibility = Visibility.Collapsed;
             }
             else
             {
                 TxbLoginType.Text = "未登录";
                 ImgHeadImgN.Visibility = Visibility.Visible;
                 ImgHeadImg.Visibility = Visibility.Collapsed;
-
-                //ImgUpload.Visibility = Visibility.Collapsed;
-                //ImgUploadTwo.Visibility = Visibility.Visible;
             }
         }
 

XHWK.WKTool/XHWK.WKTool.csproj

@@ -730,31 +730,15 @@
     <Resource Include="BlackImages\Device_Voice_B.png" />
     <Resource Include="BlackImages\Device_Voice_G.png" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\AudioFrequency.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="SkinImages\Other\Dev_AcousticWave1.gif" />
     <Resource Include="SkinImages\Other\Dev_AcousticWave2.gif" />
     <Resource Include="SkinImages\SR\SR_Out.png" />
-    <Resource Include="SkinImages\SR\SR_Out_MI.png" />
-    <Resource Include="SkinImages\SR\SR_Out_N.png" />
     <Resource Include="SkinImages\SR\SR_Pause.png" />
-    <Resource Include="SkinImages\SR\SR_Pause_MI.png" />
     <Resource Include="SkinImages\SR\SR_PenBlue.png" />
-    <Resource Include="SkinImages\SR\SR_PenBlue_CL.png" />
-    <Resource Include="SkinImages\SR\SR_PenBlue_MI.png" />
-    <Resource Include="SkinImages\SR\SR_PenBlue_N.png" />
     <Resource Include="SkinImages\SR\SR_PenRed.png" />
-    <Resource Include="SkinImages\SR\SR_PenRed_CL.png" />
-    <Resource Include="SkinImages\SR\SR_PenRed_MI.png" />
-    <Resource Include="SkinImages\SR\SR_PenRed_N.png" />
     <Resource Include="SkinImages\SR\SR_Start.png" />
-    <Resource Include="SkinImages\SR\SR_Start_MI.png" />
     <Resource Include="SkinImages\SR\SR_Stop.png" />
-    <Resource Include="SkinImages\SR\SR_Stop_MI.png" />
     <Resource Include="SkinImages\SR\SR_Stop_N.png" />
     <Resource Include="SkinImages\Skin\Skin_Select.png" />
     <Resource Include="SkinImages\Skin\Skin_TechnologyBlue.png" />
@@ -862,6 +846,11 @@
   <ItemGroup>
     <Resource Include="Images\shuoming.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\audiotest.mp3">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>xcopy /Y /i /e $(ProjectDir)\Extension $(TargetDir)\

XHWK.WKTool/system/FFMpeg.cs

@@ -1351,43 +1351,7 @@ namespace Common.system
             return devices;
         }
 
-        /// <summary>
-        /// 获取麦克风---废弃
-        /// </summary>
-        private string GetMicrophone()
-        {
-            List<string> devs = new List<string>();
-
-            MMDeviceEnumerator enumberator = new MMDeviceEnumerator();
-            MMDeviceCollection deviceCollection = enumberator.EnumerateAudioEndPoints(DataFlow.Capture, DeviceState.All);
-            for (int waveInDevice = 0; waveInDevice < WaveIn.DeviceCount; waveInDevice++)
-            {
-                WaveInCapabilities deviceInfo = WaveIn.GetCapabilities(waveInDevice);
-                foreach (MMDevice device in deviceCollection)
-                {
-                    try
-                    {
-                        if (device.FriendlyName.StartsWith(deviceInfo.ProductName))
-                        {
-                            devs.Add(device.FriendlyName);
-                            break;
-                        }
-                    }
-                    catch (Exception)
-                    {
-                    }
-                }
-            }
-            if (devs.Count > 0)
-            {
-                return devs[0];
-            }
-            else
-            {
-                return "";
-            }
-        }
-
+ 
         #endregion 获取麦克风
 
         #region 录音

打包脚本/Inno Setup星火微课.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "2.6.8"
+#define MyAppVersion "2.6.9"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\C#\xhwkclient\XHWK.WKTool\bin\x86\Debug\"