录制倒计时过程禁止暂停

录制保存过程中禁止退出
录制结束时禁止暂停
倒计时过程中禁止停止
倒计时时禁止退出

XHWK.WKTool/App.config

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

XHWK.WKTool/MainWindow.xaml

@@ -341,11 +341,11 @@
                                 Background="#FFE5E5E5" />
                         </Grid>
                         <!--  录屏按钮  -->
-                        <Grid Grid.Column="2">
+                        <Grid Name="start_pause_grid" Grid.Column="2">
                             <StackPanel Orientation="Horizontal" />
                             <Button
                                 x:Name="BtnRecord"
-                                Margin="10,5,0,5"
+                                Margin="5,0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Button.Template="{DynamicResource SkinBtnRecord}"
@@ -365,7 +365,7 @@
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                                 Visibility="Collapsed" />
                         </Grid>
-                        <Grid Grid.Column="3">
+                        <Grid Name="stop_grid" Grid.Column="3">
                             <Button
                                 x:Name="BtnStop"
                                 Margin="5,0"
@@ -380,7 +380,7 @@
                     </Grid>
 
                     <!--  关闭  -->
-                    <Grid Grid.Column="2">
+                    <Grid Name="close_grid" Grid.Column="2">
                         <Label
                             Width="2"
                             Margin="0,15"

XHWK.WKTool/MainWindow.xaml.cs

@@ -2835,6 +2835,8 @@ namespace XHWK.WKTool
         //录制麦克风的声音
         private WaveInEvent waveIn = null;
 
+        private bool waveIn_runing = false;
+
         //音频写入
         private WaveFileWriter writer = null;
 
@@ -2845,7 +2847,7 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="e">
         /// </param>
-        private void BtnRecord_Click(object sender, RoutedEventArgs e)
+        private async void BtnRecord_Click(object sender, RoutedEventArgs e)
         {
             #region 防止连击
 
@@ -2873,73 +2875,74 @@ namespace XHWK.WKTool
 
             if (RecordType == 0)
             {
-                ThreadPool.QueueUserWorkItem(o =>
+                bool microphoneGood = true;
+                start_pause_grid.Visibility = Visibility.Hidden;
+                stop_grid.Visibility = Visibility.Hidden;
+                close_grid.Visibility = Visibility.Hidden;
+                await Task.Run(() =>
                 {
-                    bool microphoneGood = ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.microphone);
+                    microphoneGood = ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.microphone);
+                });
+                if (!microphoneGood)
+                {
+                    start_pause_grid.Visibility = Visibility.Visible;
+                    stop_grid.Visibility = Visibility.Visible;
+                    close_grid.Visibility = Visibility.Visible;
+                    MessageWindow.Show("麦克风不可用");
+                    return;
+                }
 
-                    Dispatcher.Invoke(() =>
-                    {
-                        if (!microphoneGood)
-                        {
-                            MessageWindow.Show("麦克风不可用");
-                            return;
-                        }
+                blackboard_canvas.Visibility = Visibility.Visible;
+                if (RectImgBorder.Visibility != Visibility.Hidden)
+                {
+                    HideAngleBorder();
+                }
 
-                        //停止中开始录制
-                        RecordType = 3;
-                        blackboard_canvas.Visibility = Visibility.Visible;
-                        if (RectImgBorder.Visibility != Visibility.Hidden)
-                        {
-                            HideAngleBorder();
-                        }
+                Record();
 
-                        Record();
+                BtnPrint.IsEnabled = false;
+                BtnScreenshot.IsEnabled = false;
+                BtnImport.IsEnabled = false;
+                BtnScreenRecording.IsEnabled = false;
+                BtnUpload.IsEnabled = false;
+                BtnSetUp.IsEnabled = false;
+                BtnDevice.IsEnabled = false;
 
-                        BtnPrint.IsEnabled = false;
-                        BtnScreenshot.IsEnabled = false;
-                        BtnImport.IsEnabled = false;
-                        BtnScreenRecording.IsEnabled = false;
-                        BtnUpload.IsEnabled = false;
-                        BtnSetUp.IsEnabled = false;
-                        BtnDevice.IsEnabled = false;
+                BtnLoginType.IsEnabled = false;
+                blackboard_canvas.Visibility = Visibility.Visible;
 
-                        BtnLoginType.IsEnabled = false;
-                        blackboard_canvas.Visibility = Visibility.Visible;
+                TxbType.Text = "准备录制";
+                BtnRecord.Visibility = Visibility.Collapsed;
+                BtnRecordSuspend.Visibility = Visibility.Visible;
+                BtnRecord.IsEnabled = true;
+                BtnStop.IsEnabled = true;
 
-                        TxbType.Text = "准备录制";
-                        BtnRecord.Visibility = Visibility.Collapsed;
-                        BtnRecordSuspend.Visibility = Visibility.Visible;
-                        BtnRecord.IsEnabled = true;
-                        BtnStop.IsEnabled = true;
+                #region 录像倒计时
 
-                        #region 录像倒计时
+                if (APP.W_CountdownWindow == null)
+                {
+                    APP.W_CountdownWindow = new CountdownWindow();
+                    APP.W_CountdownWindow.Initialize();
+                }
+                else
+                {
+                    APP.W_CountdownWindow.Initialize();
+                }
+                APP.W_CountdownWindow.Show();
 
-                        if (APP.W_CountdownWindow == null)
-                        {
-                            APP.W_CountdownWindow = new CountdownWindow();
-                            APP.W_CountdownWindow.Initialize();
-                        }
-                        else
-                        {
-                            APP.W_CountdownWindow.Initialize();
-                        }
-                        APP.W_CountdownWindow.Show();
+                #endregion 录像倒计时
 
-                        #endregion 录像倒计时
+                await Task.Delay(3000);
+                //停止中开始录制
+                RecordType = 3;
+                close_grid.Visibility = Visibility.Visible;
 
-                        new Thread(new ThreadStart(new Action(() =>
-                        {
-                            Thread.Sleep(3000);
+                TxbType.Text = "正在录制";
+                RecordType = 1;
+                await StartRecord();
 
-                            Dispatcher.Invoke(() =>
-                            {
-                                TxbType.Text = "正在录制";
-                            });
-                            RecordType = 1;
-                            StartRecord();
-                        }))).Start();
-                    });
-                });
+                start_pause_grid.Visibility = Visibility.Visible;
+                stop_grid.Visibility = Visibility.Visible;
             }
             else if (RecordType == 1)
             {
@@ -3007,11 +3010,11 @@ namespace XHWK.WKTool
 
             if (RecordType != 0)
             {
-                RecordType = 0;
                 blackboard_canvas.Visibility = Visibility.Collapsed;
                 //鼠标模式
                 luoBoPenUtil.lb_device_mouse();
                 await EndRecord();
+                RecordType = 0;
             }
         }
 
@@ -3050,6 +3053,8 @@ namespace XHWK.WKTool
 
             TxbTime.Text = "00:00";
             TxbType.Text = "保存中";
+
+            start_pause_grid.Visibility = Visibility.Hidden;
             await Task.Run(() =>
             {
                 try
@@ -3057,7 +3062,11 @@ namespace XHWK.WKTool
                     videoWriter.Close();
                     waveIn.StopRecording();
 
-                    Thread.Sleep(300);
+                    //等待音频结束回调
+                    while (waveIn_runing)
+                    {
+                        Thread.Sleep(300);
+                    }
 
                     Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
                     foreach (Process KillProcess in KillProcessArray)
@@ -3134,6 +3143,7 @@ namespace XHWK.WKTool
             TxbType.Text = "准备就绪";
             BtnRecord.Visibility = Visibility.Visible;
             BtnRecordSuspend.Visibility = Visibility.Collapsed;
+            start_pause_grid.Visibility = Visibility.Visible;
         }
 
         /// <summary>
@@ -3170,75 +3180,77 @@ namespace XHWK.WKTool
         /// <summary>
         /// 开始录制和暂停录制
         /// </summary>
-        private void StartRecord()
+        private async Task StartRecord()
         {
-            //电子版切换笔模式
-            luoBoPenUtil.lb_device_hand();
-
-            VideoInfo = new Model_Video
+            await Task.Run(() =>
             {
-                VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType")),
-                WkType = Enum_WKVidetype.RecordingLessons
-            };
+                //电子版切换笔模式
+                luoBoPenUtil.lb_device_hand();
 
-            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
-            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+                VideoInfo = new Model_Video
+                {
+                    VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType")),
+                    WkType = Enum_WKVidetype.RecordingLessons
+                };
 
-            VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制." + VideoInfo.VideoType.ToString();
+                FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
+                FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
 
-            TempVideoPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制Syn.avi";
-            int num = 1;
-            while (FileToolsCommon.IsExistFile(VideoSavePathName))
-            {
-                VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制_" + num + "." + VideoInfo.VideoType.ToString();
-                TempVideoPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制Syn_" + num + ".avi";
-                num++;
-            }
+                VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制." + VideoInfo.VideoType.ToString();
 
-            TempAudioPathName = TempVideoPathName.Replace(".avi", ".mp3");
-            gridActWidth = (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f) / 2) * 2;
-            gridActHeight = (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f) / 2) * 2;
-
-            lock (this)
-            {
-                videoWriter.Open(
-                    TempVideoPathName,
-                    gridActWidth,
-                    gridActHeight,
-                    5,
-                    VideoCodec.MPEG4,
-                    gridActWidth * gridActHeight * 10
-                );
-
-                waveIn = new WaveInEvent();
-                writer = new WaveFileWriter(TempAudioPathName, waveIn.WaveFormat);
-                //开始录音，写数据
-                waveIn.DataAvailable += (s, a) =>
+                TempVideoPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制Syn.avi";
+                int num = 1;
+                while (FileToolsCommon.IsExistFile(VideoSavePathName))
                 {
-                    if (RecordType == 1)
-                    {
-                        writer.Write(a.Buffer, 0, a.BytesRecorded);
-                    }
-                };
+                    VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制_" + num + "." + VideoInfo.VideoType.ToString();
+                    TempVideoPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录制Syn_" + num + ".avi";
+                    num++;
+                }
 
-                //结束录音
-                waveIn.RecordingStopped += (s, a) =>
+                TempAudioPathName = TempVideoPathName.Replace(".avi", ".mp3");
+                gridActWidth = (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f) / 2) * 2;
+                gridActHeight = (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f) / 2) * 2;
+
+                lock (this)
                 {
-                    writer.Dispose();
-                    writer = null;
-                    waveIn.Dispose();
-                };
+                    videoWriter.Open(
+                        TempVideoPathName,
+                        gridActWidth,
+                        gridActHeight,
+                        5,
+                        VideoCodec.MPEG4,
+                        gridActWidth * gridActHeight * 10
+                    );
 
-                waveIn.StartRecording();
-            }
-            Dispatcher.Invoke(() =>
-            {
-                SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
-                Recorddt = DateTime.Now;
+                    waveIn = new WaveInEvent();
+                    waveIn_runing = true;
+                    writer = new WaveFileWriter(TempAudioPathName, waveIn.WaveFormat);
+                    //开始录音，写数据
+                    waveIn.DataAvailable += (s, a) =>
+                    {
+                        if (RecordType == 1)
+                        {
+                            writer.Write(a.Buffer, 0, a.BytesRecorded);
+                        }
+                    };
+
+                    //结束录音
+                    waveIn.RecordingStopped += (s, a) =>
+                    {
+                        writer.Dispose();
+                        writer = null;
+                        waveIn.Dispose();
+                        waveIn_runing = false;
+                    };
+
+                    waveIn.StartRecording();
+                }
             });
+            SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+            Recorddt = DateTime.Now;
 
             ///启动截图
-            timer = new System.Threading.Timer(new TimerCallback(Timer_Elapsed), null, 0, 200);
+            timer = new Timer(new TimerCallback(Timer_Elapsed), null, 0, 200);
         }
 
         /// <summary>

XHWK.WKTool/Skin/SkinDictionary_TechnologyBlue.xaml

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

星火微课/星火微课-正式.iss

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