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

# Conflicts:
#	XHWK.WKTool/XHMicroLessonSystemWindow.xaml
#	XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs
#	XHWK.WKTool/XHWK.WKTool.csproj

Common/system/FFMpeg.cs

@@ -880,7 +880,7 @@ namespace Common.system
                         {
                             waveIn.StopRecording();
                         }
-                        catch (Exception ex)
+                        catch (Exception)
                         {
                             waveIn = null;
                         }

XHWK.Model/Properties/AssemblyInfo.cs

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

XHWK.WKTool/App.config

@@ -4,6 +4,7 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
   <appSettings>
+    <!--0正式 1测试-->
     <add key="IsDebug" value="1"/>
     <!--图片压缩等级-->
     <add key="ImageCompressionLevel" value="30" />
@@ -32,7 +33,7 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1"/>
     <!--版本号-->
-    <add key="VersionCode" value="14"/>
-    <add key="VersionName" value="1.1.3"/>
+    <add key="VersionCode" value="15"/>
+    <add key="VersionName" value="1.1.4"/>
   </appSettings>
 </configuration>

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -27,21 +27,21 @@
             </Grid>
         </Border>
         <!--第二行 讲解名称-->
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,60,0,0" Grid.ColumnSpan="2">
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,60,0,1" Grid.ColumnSpan="2">
             <Label Content="*" FontSize="18" Padding="0,20,0,0" Foreground="#FF0000"/>
             <TextBlock Text="讲解名称" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
             <Border Background="#CDD6E0" Width="321" Height="43" CornerRadius="3">
-                <TextBox x:Name="txbExplainName" Text="微课1" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="319" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+                <TextBox x:Name="txbExplainName" Text="微课1" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="319" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
         </StackPanel>
         <!--第三行 存放路径-->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,30,0,0" Grid.ColumnSpan="2">
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,30,0,1" Grid.ColumnSpan="2">
             <Label Content="*" FontSize="18" Padding="0,20,0,0" Foreground="#FF0000"/>
             <TextBlock Text="存放路径" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
             <Border Background="#CDD6E0" Width="225" Height="43" CornerRadius="3">
-                <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+                <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
             <!--浏览按钮-->
             <Button  Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -26,6 +26,7 @@ namespace XHWK.WKTool
         public CreateAMicroLessonWindow()
         {
             InitializeComponent();
+            this.ResizeMode = ResizeMode.NoResize;
             if (!APP.CheckScreenCapturerRecorder())
             {
                 MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“OK-Next>-Next>Install”完成安装！");

XHWK.WKTool/LoginWindow.xaml

@@ -33,12 +33,12 @@
         <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,20,0,0">
             <TextBlock Text="登陆" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
-            <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
+            <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3" Margin="0,0,0,1">
                 <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
         </StackPanel>
         <!--第三行 密码-->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,20,0,0">
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,20,0,1">
             <TextBlock Text="密码" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
             <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
@@ -49,7 +49,7 @@
             <Viewbox Height="23">
                 <CheckBox   x:Name="ckSaveName" Click="CkSaveName_Click"/>
             </Viewbox>
-            <TextBlock Text="记住账号" FontSize="18" Height="30" Padding="5,3,0,0" Margin="0,9,0,1"/>
+            <TextBlock Text="记住账号" FontSize="18" Height="30" Padding="5,3,0,0" Margin="0,0,0,1"/>
         </StackPanel>
 
         <!--第五行 开始按钮-->

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -385,7 +385,8 @@ namespace XHWK.WKTool
             {
                 APP.W_ScreenRecordingToolbarWindow.flg = 1;
             }
-            Hide();
+            APP.W_ScreenRecordingToolbarWindow.ReturnPractice();
+            //Hide();
         }
     }
 }

XHWK.WKTool/PrintWindow.xaml

@@ -30,7 +30,8 @@
             </Setter>
         </Style>
     </Window.Resources>
-    <Grid>
+    <Viewbox>
+        <Grid x:Name="GridContent" Height="600" Width="900">
         <Grid.RowDefinitions>
             <RowDefinition Height="120"/>
             <RowDefinition Height="*"/>
@@ -56,7 +57,7 @@
                                 FontSize="14"
                                 SelectedValuePath="Key"
                                 />
-                <TextBlock Text="份数：" FontSize="20" Margin="120,0,0,0" Padding="0,5,0,0"/>
+                <TextBlock Text="份数：" FontSize="20" Margin="80,0,0,0" Padding="0,5,0,0" HorizontalAlignment="Right"/>
                 <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" FontSize="16" Padding="50,10,0,0" Background="White"/>
                 <Grid>
                     <Grid.RowDefinitions>
@@ -111,7 +112,7 @@
             VerticalAlignment="Center"
             Background="#FAFAFA"
             CornerRadius="4"
-            Visibility="Visible">
+            Visibility="Collapsed">
             <Grid>
 
                 <ProgressBar BorderBrush="#4597FF"
@@ -133,4 +134,5 @@
             </Grid>
         </Views:ZJClippingBorder>
     </Grid>
+    </Viewbox>
 </Window>

XHWK.WKTool/PrintWindow.xaml.cs

@@ -42,6 +42,14 @@ namespace XHWK.WKTool
         public PrintWindow()
         {
             InitializeComponent();
+            double proportion = 1036.0 / 1290.0;
+          double  Widths = (PrimaryScreen.ScaleWorkingAreaSize.Height) / proportion - (BorderThickness.Left + BorderThickness.Right);
+          double  Heights = PrimaryScreen.ScaleWorkingAreaSize.Height - (BorderThickness.Top + BorderThickness.Bottom);
+            Width = Widths / 1.42;
+            Height = Heights / 1.71;
+            GridContent.Width = Width+5;
+            GridContent.Height = Height;
+            this.ResizeMode = ResizeMode.NoResize;
             string defa = string.Empty;
             List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
             if (defaList.Count > 0)
@@ -94,10 +102,16 @@ namespace XHWK.WKTool
                 MessageWindow.Show("打印机不能为空！");
                 return;
             }
-            I = 1;
             APP.myloading.Show();
-            tip_outer.Visibility = Visibility.Visible;
-            Thread.Sleep(2000);
+            APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeServering, InvokeServerCompate);
+
+
+
+
+            //I = 1;
+            //APP.myloading.Show();
+            //tip_outer.Visibility = Visibility.Visible;
+            //Thread.Sleep(2000);
             //Times();
             //Dispatcher.Invoke(() =>
             //{
@@ -114,6 +128,90 @@ namespace XHWK.WKTool
 
 
 
+            //string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
+            //FileToolsCommon.CreateFile(imgPath);
+            //string pdf = imgPath + "\\101.pdf";
+            //string tpf = imgPath + "\\102.TPF";
+            //string msg = string.Empty;
+            //string outPut = string.Empty;
+            ////if(rbnSquarePoint.IsChecked==false)
+            ////{
+            ////    pyte = 1;
+            ////}
+            //LatticeFileHelper.GeneratingPDF(pdf, tpf, out int pr, out msg, out outPut/*, pyte*/);
+            //if (pr == 0)
+            //{
+            //    //outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
+            //    //APP.OutPut = outPut.Split(',');
+            //    //string []page= outPut.Split(',');
+            //    //for(int i=0;i<page.Length;i++) //增加页码编号
+            //    //{
+            //    //    APP.PageDrawList[i].PageCode = page[i];
+            //    //}
+
+            //    //string defa = string.Empty;
+            //    //List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
+
+            //    string standardError = string.Empty;
+            //    string standardOutput = string.Empty;
+            //    int frequency = Convert.ToInt32(txbNumberOfCopies.Text);
+            //    //for (int i=0;i< frequency;i++)
+            //    //{
+            //    LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
+            //    //}
+            //    if (printResult == 0)// 0为成功
+            //    {
+            //        new Thread(new ThreadStart(new Action(() =>
+            //        {
+            //            Dispatcher.Invoke(() =>
+            //            {
+            //                I = 100;
+            //                pgbProcess.Value = I * 100 / 100;
+            //                lbProcess.Content = string.Format("{0}/{1}", I, 100);
+            //                APP.myloading.Hide();
+            //                I = 0;
+            //            });
+            //            Thread.Sleep(2000);
+            //            Dispatcher.Invoke(() =>
+            //            {
+            //                //tip_outer.Visibility = Visibility.Collapsed;
+            //                MessageWindow.Show("打印成功");
+            //            });
+            //        }))).Start();
+
+
+                   
+                    
+                  
+            //    }
+            //    else
+            //    {
+            //        APP.myloading.Hide();
+            //        MessageWindow.Show(standardError);
+            //    }
+            //}
+            //else
+            //{
+            //    APP.myloading.Hide();
+            //    MessageWindow.Show(msg);
+            //}
+        }
+        /// <summary>
+        /// 打印-开始
+        /// </summary>
+        /// <returns></returns>
+        private object InvokeServering()
+        {
+            Dispatcher.Invoke(() =>
+                       {
+                           I = 1;
+                           pgbProcess.Value = I * 100 / 100;
+                           lbProcess.Content = string.Format("{0}/{1}", I, 100);
+                           tip_outer.Visibility = Visibility.Visible;
+                           //I = 0;
+                       });
+            Thread.Sleep(2000);
+
             string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
             FileToolsCommon.CreateFile(imgPath);
             string pdf = imgPath + "\\101.pdf";
@@ -140,47 +238,54 @@ namespace XHWK.WKTool
 
                 string standardError = string.Empty;
                 string standardOutput = string.Empty;
-                int frequency = Convert.ToInt32(txbNumberOfCopies.Text);
-                //for (int i=0;i< frequency;i++)
-                //{
-                LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
-                //}
-                if (printResult == 0)// 0为成功
+                int frequency = 1;
+                Dispatcher.Invoke(() =>
                 {
-                    new Thread(new ThreadStart(new Action(() =>
+                     frequency = Convert.ToInt32(txbNumberOfCopies.Text);
+                    LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
+                    if (printResult == 0)// 0为成功
                     {
-                        Dispatcher.Invoke(() =>
-                        {
-                            I = 100;
-                            pgbProcess.Value = I * 100 / 100;
-                            lbProcess.Content = string.Format("{0}/{1}", I, 100);
-                            APP.myloading.Hide();
-                            I = 0;
-                        });
-                        Thread.Sleep(2000);
-                        Dispatcher.Invoke(() =>
+                        new Thread(new ThreadStart(new Action(() =>
                         {
-                            //tip_outer.Visibility = Visibility.Collapsed;
-                            MessageWindow.Show("打印成功");
-                        });
-                    }))).Start();
-
-
-                   
-                    
-                  
-                }
-                else
-                {
-                    APP.myloading.Hide();
-                    MessageWindow.Show(standardError);
-                }
+                            Dispatcher.Invoke(() =>
+                            {
+                                I = 100;
+                                pgbProcess.Value = I * 100 / 100;
+                                lbProcess.Content = string.Format("{0}/{1}", I, 100);
+                                APP.myloading.Hide();
+                                I = 0;
+                            });
+                            Thread.Sleep(3000);
+                            Dispatcher.Invoke(() =>
+                            {
+                                tip_outer.Visibility = Visibility.Collapsed;
+                                //tip_outer.Visibility = Visibility.Collapsed;
+                                MessageWindow.Show("打印成功");
+                            });
+                        }))).Start();
+                    }
+                    else
+                    {
+                        APP.myloading.Hide();
+                        MessageWindow.Show(standardError);
+                    }
+                });
+             
             }
             else
             {
                 APP.myloading.Hide();
                 MessageWindow.Show(msg);
             }
+            return "";
+        }
+        /// <summary>
+        /// 打印-结束
+        /// </summary>
+        /// <returns></returns>
+        public void InvokeServerCompate(object obj)
+        {
+            APP.myloading.Hide();
         }
         /// <summary>
         /// 时钟回调
@@ -211,13 +316,21 @@ namespace XHWK.WKTool
             }
 
             string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
-            if(I <= 90 && I != 0)
+            if(I < 90 && I != 0)
             {
                 Dispatcher.Invoke(() =>
                 {
+                 
                     pgbProcess.Value = I * 100 / 100;
             lbProcess.Content = string.Format("{0}/{1}", I, 100);
-            I++;
+                    if (I == 1)
+                    {
+                        I = 30;
+                    }
+                    else
+                    {
+                        I += 30;
+                    }
                 });
             }
         }
@@ -301,5 +414,10 @@ namespace XHWK.WKTool
                 txbNumberOfCopies.Text = num.ToString();
             }
         }
+
+        private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
+        {
+
+        }
     }
 }

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -409,13 +409,13 @@ namespace XHWK.WKTool
                 IsSuspend = true;
                 ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
                 BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
-                imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
-                btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
-                imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
-                btnBlackPenTwo.IsEnabled = false;//红笔不可点击
+                //imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
+                //btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
+                //imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
+                //btnBlackPenTwo.IsEnabled = false;//红笔不可点击
                 txbTime.Visibility = Visibility.Hidden;//时间不显示
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
-                //btnReturn.IsEnabled = true;//返回主界面可点击
+                btnReturn.IsEnabled = true;//返回主界面可点击
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -1005,5 +1005,18 @@ namespace XHWK.WKTool
             APP.W_XHMicroLessonSystemWindow.Show();
             Hide();
         }
+        /// <summary>
+        /// 批注退出
+        /// </summary>
+        public void ReturnPractice()
+        {
+            Dispatcher.Invoke(() =>
+            {
+                borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+            });
+            flg = 0;
+            APP.W_PracticeWindow.Hide();
+        }
     }
 }

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -89,7 +89,7 @@ namespace XHWK.WKTool.UControl
         {
             if(e.ClickCount==2)
             {
-                TxtModify.Text = TbName.Text;
+                TxtModify.Text = TbName.ToolTip.ToString();
                 TbName.Visibility = Visibility.Hidden;
                 TxtModify.Visibility = Visibility.Visible;
                 BtnNameModifyOK.Visibility = Visibility.Visible;

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -9,7 +9,7 @@
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
         Title="星火微课系统" Height="1036" Width="1290" 
-    WindowStyle="None"  WindowStartupLocation="CenterScreen"  AllowsTransparency="True"  Background="Transparent"    ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
+    WindowStyle="None"  WindowStartupLocation="CenterScreen"  AllowsTransparency="True"  Background="Transparent"    ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
@@ -25,6 +25,26 @@
         </Border>
     </Grid>-->
     <Window.Resources>
+        <Style x:Key="radBase" TargetType="RadioButton">
+            <Setter Property="IsChecked" Value="False"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Foreground" Value="#555"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <DockPanel  Background="{TemplateBinding Background}" ToolTip="{TemplateBinding Content}" LastChildFill="False" Width="{TemplateBinding Width}">
+                            <Image Margin="2 0 0 0" DockPanel.Dock="Left" x:Name="_img"  Stretch="None" Source="./Images/rdo_no.png"/>
+                            <TextBlock DockPanel.Dock="Left" Margin="3 0 0 0" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Content}" />
+                        </DockPanel>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="true">
+                                <Setter TargetName="_img" Property="Source" Value="./Images/rdo_yes.png"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
         <Style x:Key="NoMouseOverButtonStyle" TargetType="{x:Type Button}">
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
@@ -275,11 +295,10 @@
                     </Button>
                 </StackPanel>
             </Grid>
-
             <!--主内容-->
-            <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible">
-                <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible">
-                    <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780">
+            <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                    <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
                         <Grid>
                             <Border Grid.Row="1"  CornerRadius="5">
                                 <Grid x:Name="IMG" Margin="0,0,0,0">
@@ -312,12 +331,9 @@
                             </Border>
                         </Grid>
                         <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top"/>
-
                         <!--导入图片-->
                         <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
-                        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2" />
-
-
+                        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2"/>
                         <!--摄像头-->
                         <!--<wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Height="124" Width="172" HorizontalAlignment="Right" Margin="0,10,30.10,0" VerticalAlignment="Top">
                     <aforge:VideoSourcePlayer x:Name="player" Height="124" Width="172"  />
@@ -339,20 +355,20 @@
                 <!--<TextBlock x:Name="txbTime" Text="123456" FontSize="20" Foreground="#000000" Margin="0,0,0,10" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>-->
             </Grid>
             <!--页码-->
-            <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed">
-                <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center"
-            Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
+            <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
                     <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="last_button"
                     Width="60" Height="20"
                     Click="last_button_Click">
+
                         <Button.Content>
                             <StackPanel>
                                 <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
                             </StackPanel>
                         </Button.Content>
                     </Button>
-                    <Grid Width="60"  Background="Transparent">
+                    <Grid Width="60"  Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="311*"/>
                             <RowDefinition Height="483*"/>
@@ -378,126 +394,129 @@
                 </StackPanel>
             </Grid>
             <!--设置-->
-            <Grid Grid.Row="1" x:Name="gridSetUp"  Background="#FFFFFF" Visibility="Collapsed" Width="1276">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="90"/>
-                    <RowDefinition Height="70"/>
-                    <RowDefinition Height="50"/>
-                    <RowDefinition Height="60"/>
-                    <RowDefinition Height="70"/>
-                    <RowDefinition Height="70"/>
-                    <RowDefinition Height="70"/>
-                    <RowDefinition Height="70"/>
-                    <RowDefinition Height="70"/>
-                    <RowDefinition Height="70"/>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock Grid.Row="0" Grid.Column="0" Text="智能笔" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Margin="0,30,0,0"/>
-                <TextBlock Grid.Row="0" Grid.Column="1" x:Name="txbNotConnecteds"  Text="未连接" FontSize="14" Foreground="#333333" Margin="30,30,0,0"/>
-
-                <TextBlock Grid.Row="1" Grid.Column="0" Text="视频格式" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
-                <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                    <RadioButton x:Name="rbnMP4" Cursor="Hand" Content="MP4" FontSize="14" Foreground="#333333" Margin="0,2,0,0" IsChecked="True"/>
-                    <RadioButton x:Name="rbnFLV" Cursor="Hand" Content="FLV" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                    <RadioButton x:Name="rbnAVI" Cursor="Hand" Content="AVI" FontSize="14" Foreground="#333333" Margin="20,2,0,0" Visibility="Collapsed"/>
-                </StackPanel>
+            <ScrollViewer x:Name="gridSetUp" Grid.Row="1" VerticalScrollBarVisibility="Auto" Visibility="Collapsed">
+                <Grid Grid.Row="1"   Background="#FFFFFF" >
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="90"/>
+                        <RowDefinition Height="70"/>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="60"/>
+                        <RowDefinition Height="70"/>
+                        <RowDefinition Height="70"/>
+                        <RowDefinition Height="70"/>
+                        <RowDefinition Height="70"/>
+                        <RowDefinition Height="70"/>
+                        <RowDefinition Height="70"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Grid.Row="0" Grid.Column="0" Text="智能笔" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Margin="0,30,0,0"/>
+                    <TextBlock Grid.Row="0" Grid.Column="1" x:Name="txbNotConnecteds"  Text="未连接" FontSize="14" Foreground="#333333" Margin="30,30,0,0"/>
+
+                    <TextBlock Grid.Row="1" Grid.Column="0" Text="视频格式" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
+                    <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+
+                        <RadioButton x:Name="rbnMP4"  Cursor="Hand" Style="{StaticResource radBase}" Content=" MP4" FontSize="14" Foreground="#333333" VerticalAlignment="Top" IsChecked="True"/>
+                        <RadioButton x:Name="rbnFLV" Cursor="Hand" Style="{StaticResource radBase}" Content=" FLV" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
+                        <RadioButton x:Name="rbnAVI" Cursor="Hand" Style="{StaticResource radBase}" Content=" AVI" FontSize="14" Foreground="#333333" Margin="20,-26,0,0" Visibility="Collapsed"/>
+                    </StackPanel>
 
-                <TextBlock Grid.Row="2" Grid.Column="0" Text="摄像头位置" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
-                <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                    <RadioButton Cursor="Hand" x:Name="rbnRight" Content="右上" FontSize="14" Foreground="#333333" Margin="0,2,0,0" IsChecked="True"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Content="右下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnLeft" Content="左上" FontSize="14" Foreground="#333333" Margin="20,2,0,0" />
-                    <RadioButton Cursor="Hand" x:Name="rbnLeftUnder" Content="左下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                </StackPanel>
-                <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0" Visibility="Collapsed">
-                    <TextBlock Text="视频声音" FontSize="16" Foreground="#2D8CF0" Width="80"/>
-                    <RadioButton x:Name="rbnY" Cursor="Hand" Content="有" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
-                    <RadioButton x:Name="rbnN" Cursor="Hand" Content="无" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                </StackPanel>
+                    <TextBlock Grid.Row="2" Grid.Column="0" Text="摄像头位置" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
+                    <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                        <RadioButton Cursor="Hand" x:Name="rbnRight" Style="{StaticResource radBase}" Content=" 右上" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="0,0,0,0" IsChecked="True"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Style="{StaticResource radBase}" Content=" 右下" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnLeft" Style="{StaticResource radBase}" Content=" 左上" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0" />
+                        <RadioButton Cursor="Hand" x:Name="rbnLeftUnder" Style="{StaticResource radBase}" Content=" 左下" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
+                    </StackPanel>
+                    <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0" Visibility="Collapsed">
+                        <TextBlock Text="视频声音" FontSize="16" Foreground="#2D8CF0" Width="80"/>
+                        <RadioButton x:Name="rbnY" Cursor="Hand" Content="有" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
+                        <RadioButton x:Name="rbnN" Cursor="Hand" Content="无" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
+                    </StackPanel>
 
 
-                <!--接口地址-->
-                <TextBlock Grid.Row="3" Grid.Column="0" Text="接口地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,20,0,0"/>
-                <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
-                    <TextBlock Text="http://" FontSize="16" Padding="0,20,5,0"/>
-                    <TextBox x:Name="txbInterfaceAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
-                </StackPanel>
+                    <!--接口地址-->
+                    <TextBlock Grid.Row="3" Grid.Column="0" Text="接口地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,20,0,0"/>
+                    <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" Margin="30,0,0,0">
+                        <TextBlock Text="http://" FontSize="16" Padding="0,20,5,0"/>
+                        <TextBox x:Name="txbInterfaceAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+                    </StackPanel>
 
-                <!--上传地址-->
-                <TextBlock Grid.Row="4" Grid.Column="0" Text="上传地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,35,0,0"/>
-                <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal" Margin="30,20,0,0">
-                    <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
-                    <TextBox x:Name="txbImageUploadAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
-                </StackPanel>
+                    <!--上传地址-->
+                    <TextBlock Grid.Row="4" Grid.Column="0" Text="上传地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,35,0,0"/>
+                    <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal" Margin="30,20,0,0">
+                        <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
+                        <TextBox x:Name="txbImageUploadAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+                    </StackPanel>
 
-                <!--下载地址-->
-                <TextBlock Grid.Row="5" Grid.Column="0" Text="下载地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,35,0,0"/>
-                <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" Margin="30,20,0,0">
-                    <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
-                    <TextBox x:Name="txbPictureShowsAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
-                </StackPanel>
+                    <!--下载地址-->
+                    <TextBlock Grid.Row="5" Grid.Column="0" Text="下载地址" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right" Padding="0,35,0,0"/>
+                    <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" Margin="30,20,0,0">
+                        <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
+                        <TextBox x:Name="txbPictureShowsAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+                    </StackPanel>
 
-                <TextBlock Grid.Row="6" Grid.Column="0" x:Name="txbFilePath" Text="文件路径" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Padding="0,35,0,0" />
-                <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,20,0,0">
-                    <Border Background="#CDD6E0" Width="522" Height="43" CornerRadius="3" Margin="0,0,0,0">
-                        <Label x:Name="txbStoragePath" Background="#FFFFFF" Content="D:\" FontSize="16" Foreground="#333333" Padding="10,12,2,2" Width="520" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
-                    </Border>
-                    <!--浏览按钮-->
-                    <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
-                        <Button.Template>
-                            <ControlTemplate TargetType="{x:Type Button}">
-                                <Border
+                    <TextBlock Grid.Row="6" Grid.Column="0" x:Name="txbFilePath" Text="文件路径" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Padding="0,35,0,0" />
+                    <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,20,0,0">
+                        <Border Background="#CDD6E0" Width="522" Height="43" CornerRadius="3" Margin="0,0,0,0">
+                            <Label x:Name="txbStoragePath" Background="#FFFFFF" Content="D:\" FontSize="16" Foreground="#333333" Padding="10,12,2,2" Width="520" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
+                        </Border>
+                        <!--浏览按钮-->
+                        <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
+                            <Button.Template>
+                                <ControlTemplate TargetType="{x:Type Button}">
+                                    <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="2">
-                                    <Border.Background>#EBEFF3</Border.Background>
-                                    <ContentPresenter
+                                        <Border.Background>#EBEFF3</Border.Background>
+                                        <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Content="{TemplateBinding ContentControl.Content}" />
-                                </Border>
-                            </ControlTemplate>
-                        </Button.Template>
-                    </Button>
-                </StackPanel>
+                                    </Border>
+                                </ControlTemplate>
+                            </Button.Template>
+                        </Button>
+                    </StackPanel>
 
-                <TextBlock Grid.Row="7" Grid.Column="0" Text="版本号" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
-                <StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
-                    <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333"/>
-                </StackPanel>
+                    <TextBlock Grid.Row="7" Grid.Column="0" Text="版本号" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
+                    <StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+                        <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333"/>
+                    </StackPanel>
 
-                <TextBlock Grid.Row="8" Grid.Column="0" Text="版权所有" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
-                <StackPanel Grid.Row="8" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
-                    <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333"/>
-                </StackPanel>
+                    <TextBlock Grid.Row="8" Grid.Column="0" Text="版权所有" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
+                    <StackPanel Grid.Row="8" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+                        <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333"/>
+                    </StackPanel>
 
-                <TextBlock Grid.Row="9" Grid.Column="0" Text="录屏快捷键" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
-                <StackPanel Grid.Row="9" Grid.Column="1">
-                    <TextBlock  FontSize="14" Foreground="#333333" Text="开始/暂停：Ctrl+F5     停止：Ctrl+S     退出讲评：鼠标右键" Margin="30,30,0,0"/>
-                </StackPanel>
-                <!--第四行 开始按钮-->
-                <Button Cursor="Hand" Grid.Row="10" Grid.ColumnSpan="2" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,0,10,0" Click="BtnSave_Click">
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border
+                    <TextBlock Grid.Row="9" Grid.Column="0" Text="录屏快捷键" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" FontWeight="Black" Margin="0,30,0,0"/>
+                    <StackPanel Grid.Row="9" Grid.Column="1">
+                        <TextBlock  FontSize="14" Foreground="#333333" Text="开始/暂停：Ctrl+F5     停止：Ctrl+S     退出讲评：鼠标右键" Margin="30,30,0,0"/>
+                    </StackPanel>
+                    <!--第四行 开始按钮-->
+                    <Button Cursor="Hand" Grid.Row="10" Grid.ColumnSpan="2" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,10,10,10" Click="BtnSave_Click">
+                        <Button.Template>
+                            <ControlTemplate TargetType="{x:Type Button}">
+                                <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="2">
-                                <Border.Background>#2D8CF0</Border.Background>
-                                <ContentPresenter
+                                    <Border.Background>#2D8CF0</Border.Background>
+                                    <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Content="{TemplateBinding ContentControl.Content}" />
-                            </Border>
-                        </ControlTemplate>
-                    </Button.Template>
-                </Button>
-            </Grid>
+                                </Border>
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                </Grid>
+            </ScrollViewer>
             <!--上传-->
             <Grid Grid.Row="1" x:Name="gridUpload" Visibility="Hidden">
                 <Border Background="#EFF1F8">
@@ -596,7 +615,6 @@
                                 </Button.Content>
                             </Button>
                         </StackPanel>
-
                     </Grid>
                 </Border>
             </Grid>
@@ -613,8 +631,8 @@
             </Grid>
 
             <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">
-                <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
-                    <TextBlock Text="颜色：" FontSize="14" Padding="10,5,0,0"/>
+                <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
+                    <TextBlock Text="颜色：" FontSize="14" Padding="10,3,0,0"/>
                     <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
 
                     <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
@@ -649,22 +667,21 @@
                             <Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                         </Button>
                     </Border>
-                    <TextBlock Text="粗细：" FontSize="14" Padding="15,0,0,0" Margin="5,5,0,0"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnFine" Content="细" FontSize="14" Margin="0,7,0,0" IsChecked="True" Click="RbnFine_Click"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,7,0,0" Click="RbnIn_Click"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnCrude" Content="粗" FontSize="14" Margin="5,7,0,0" Click="RbnCrude_Click"/>
+                    <TextBlock Text="粗细：" FontSize="14" Padding="15,0,0,0" Margin="5,3,0,0"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnFine" Content=" 细" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" IsChecked="True" Click="RbnFine_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnIn" Content=" 中" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnIn_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnCrude" Content=" 粗" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnCrude_Click"/>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="摄像头：" FontSize="14" Padding="15,6,0,0"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnOpen" Content="开" FontSize="14" Margin="0,7,0,0" Click="RbnOpen_Click"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content="关" FontSize="14" Margin="5,7,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
+                        <TextBlock Text="摄像头：" FontSize="14" Padding="20,3,0,0"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnOpen" Content=" 开" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" Click="RbnOpen_Click"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content=" 关" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
                     </StackPanel>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,10,5">
                     <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,4,0,0"/>
                     <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,4,5,0"/>
                 </StackPanel>
             </Grid>
-
         </Grid>
     </Viewbox>
 </Window>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -564,124 +564,131 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnSave_Click(object sender, RoutedEventArgs e)
         {
-            ImgRecord.Visibility = Visibility.Visible;//设置结束时可录制
-            ImgRecordTwo.Visibility = Visibility.Collapsed;//设置结束时可录制
-            BtnRecord.IsEnabled = true;//设置结束时可录制
-
-            if (!string.IsNullOrWhiteSpace(txbInterfaceAddress.Text))
-            {
-                string ApplicationData = APP.dataPath + "interfaceAddress.txt";
-                string temp = "http://" + txbInterfaceAddress.Text;
-                System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
-            }
-            else
-            {
-                MessageWindow.Show("接口地址未输入");
-                return;
-            }
-            if (!string.IsNullOrWhiteSpace(txbImageUploadAddress.Text))//图片上传地址
-            {
-                string ApplicationData = APP.dataPath + "imageUploadAddress.txt";
-                string temp = "http://" + txbImageUploadAddress.Text + "/";
-                System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
-            }
-            else
-            {
-                MessageWindow.Show("上传地址未输入");
-                return;
-            }
-            if (!string.IsNullOrWhiteSpace(txbPictureShowsAddress.Text))
-            {
-                string ApplicationData = APP.dataPath + "pictureShowsAddress.txt";
-                string temp = "http://" + txbPictureShowsAddress.Text + "/static/";
-                System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
-            }
-            else
-            {
-                MessageWindow.Show("下载地址未输入");
-                return;
-            }
-            if (!APP.apiUrl.Equals("http://" + txbInterfaceAddress.Text))
+            try
             {
-                APP.apiUrl = "http://" + txbInterfaceAddress.Text;
-              
-                if(!txbLoginType.Text.Equals("未登录"))
+                ImgRecord.Visibility = Visibility.Visible;//设置结束时可录制
+                ImgRecordTwo.Visibility = Visibility.Collapsed;//设置结束时可录制
+                BtnRecord.IsEnabled = true;//设置结束时可录制
+
+                if (!string.IsNullOrWhiteSpace(txbInterfaceAddress.Text))
                 {
-                    LoginType();
-                    MessageWindow.Show("接口地址已修改，请重新登陆！");
+                    string ApplicationData = APP.dataPath + "interfaceAddress.txt";
+                    string temp = "http://" + txbInterfaceAddress.Text;
+                    System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
                 }
-            }
-            if (!APP.uploadUrl.Equals(txbImageUploadAddress.Text))
-            {
-                APP.uploadUrl = "http://" + txbImageUploadAddress.Text + "/";
-            }
-            if (!APP.showImageUrl.Equals(txbPictureShowsAddress.Text))
-            {
-                APP.showImageUrl = "http://" + txbPictureShowsAddress.Text + "/static/";
-            }
-            if (rbnMP4.IsChecked == true)
-            {
-                //存储文件
-                FileToolsCommon.SetConfigValue("VideoType", "1");
-            }
-            else if (rbnFLV.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("VideoType", "2");
-            }
-            else
-            {
-                FileToolsCommon.SetConfigValue("VideoType", "3");
-            }
-            if (rbnY.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("IsSound", "true");
-            }
-            else
-            {
-                FileToolsCommon.SetConfigValue("IsSound", "false");
-            }
-            ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
-            if (rbnRight.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("CameraPosition", "1");
-            }
-            else if (rbnLeft.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("CameraPosition", "2");
-            }
-            else if (rbnRightUnder.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("CameraPosition", "3");
-            }
-            else if (rbnLeftUnder.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("CameraPosition", "4");
-            }
+                else
+                {
+                    MessageWindow.Show("接口地址未输入");
+                    return;
+                }
+                if (!string.IsNullOrWhiteSpace(txbImageUploadAddress.Text))//图片上传地址
+                {
+                    string ApplicationData = APP.dataPath + "imageUploadAddress.txt";
+                    string temp = "http://" + txbImageUploadAddress.Text + "/";
+                    System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
+                }
+                else
+                {
+                    MessageWindow.Show("上传地址未输入");
+                    return;
+                }
+                if (!string.IsNullOrWhiteSpace(txbPictureShowsAddress.Text))
+                {
+                    string ApplicationData = APP.dataPath + "pictureShowsAddress.txt";
+                    string temp = "http://" + txbPictureShowsAddress.Text + "/static/";
+                    System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
+                }
+                else
+                {
+                    MessageWindow.Show("下载地址未输入");
+                    return;
+                }
+                if (!APP.apiUrl.Equals("http://" + txbInterfaceAddress.Text))
+                {
+                    APP.apiUrl = "http://" + txbInterfaceAddress.Text;
 
-            if (rbnMP4.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("VideoType", "1");
-            }
-            else if (rbnFLV.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("VideoType", "2");
-            }
-            else if (rbnAVI.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("VideoType", "3");
+                    if (!txbLoginType.Text.Equals("未登录"))
+                    {
+                        LoginType();
+                        MessageWindow.Show("接口地址已修改，请重新登陆！");
+                    }
+                }
+                if (!APP.uploadUrl.Equals(txbImageUploadAddress.Text))
+                {
+                    APP.uploadUrl = "http://" + txbImageUploadAddress.Text + "/";
+                }
+                if (!APP.showImageUrl.Equals(txbPictureShowsAddress.Text))
+                {
+                    APP.showImageUrl = "http://" + txbPictureShowsAddress.Text + "/static/";
+                }
+                if (rbnMP4.IsChecked == true)
+                {
+                    //存储文件
+                    FileToolsCommon.SetConfigValue("VideoType", "1");
+                }
+                else if (rbnFLV.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("VideoType", "2");
+                }
+                else
+                {
+                    FileToolsCommon.SetConfigValue("VideoType", "3");
+                }
+                if (rbnY.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("IsSound", "true");
+                }
+                else
+                {
+                    FileToolsCommon.SetConfigValue("IsSound", "false");
+                }
+                ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
+                if (rbnRight.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("CameraPosition", "1");
+                }
+                else if (rbnLeft.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("CameraPosition", "2");
+                }
+                else if (rbnRightUnder.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("CameraPosition", "3");
+                }
+                else if (rbnLeftUnder.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("CameraPosition", "4");
+                }
+
+                if (rbnMP4.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("VideoType", "1");
+                }
+                else if (rbnFLV.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("VideoType", "2");
+                }
+                else if (rbnAVI.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("VideoType", "3");
+                }
+                APP.CameraPosition = FileToolsCommon.GetConfigValue("CameraPosition");
+                GridMain.Visibility = Visibility.Visible;
+                gridSetUp.Visibility = Visibility.Collapsed;
+                imgPlayerRight.Visibility = Visibility.Collapsed;
+                imgPlayerLeft.Visibility = Visibility.Collapsed;
+                imgPlayerRightUnder.Visibility = Visibility.Collapsed;
+                imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
+                if (!txbStoragePath.Content.ToString().Equals(APP.WKData.WkPath))
+                {
+                    //存储文件
+                    FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Content.ToString());
+                    MessageWindow.Show("路径已变更，下次创建微课时自动生效！！！");
+                }
             }
-            APP.CameraPosition = FileToolsCommon.GetConfigValue("CameraPosition");
-            GridMain.Visibility = Visibility.Visible;
-            gridSetUp.Visibility = Visibility.Collapsed;
-            imgPlayerRight.Visibility = Visibility.Collapsed;
-            imgPlayerLeft.Visibility = Visibility.Collapsed;
-            imgPlayerRightUnder.Visibility = Visibility.Collapsed;
-            imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
-            if (!txbStoragePath.Content.ToString().Equals(APP.WKData.WkPath))
+            catch (Exception ex)
             {
-                //存储文件
-                FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Content.ToString());
-                MessageWindow.Show("路径已变更，下次创建微课时自动生效！！！");
+                LogHelper.WriteErrLog("XHMicroLessonSystemWindow(设置保存事件报错：)" + ex.Message,ex);
             }
         }
         /// <summary>
@@ -986,7 +993,7 @@ namespace XHWK.WKTool
                 };
 
 
-                APP.myloading.Show();
+                //APP.myloading.Show();
                 APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeServering, InvokeServerCompate);
 
 
@@ -1019,13 +1026,16 @@ namespace XHWK.WKTool
             Dispatcher.Invoke(new Action(() =>
             {
                 result = ofd.ShowDialog();
-                if (result == System.Windows.Forms.DialogResult.OK)
+            }));
+            if (result == System.Windows.Forms.DialogResult.OK)
                 {
                     if (ofd.FileName != "")
+                    {
+                    Dispatcher.Invoke(new Action(() =>
                     {
                         APP.myloading.Show();
-
                         myblackboard.changepage(APP.pageData.pagenum);
+                    }));
                         #region PPT转PDF
                         string filepath = ofd.FileName;
                         string path = ofd.SafeFileName.Replace(".ppt", "").Replace(".pptx", "").Trim();
@@ -1077,8 +1087,11 @@ namespace XHWK.WKTool
                                         File.Delete(filePathOutPut);
                                     }
                                 }
-                                #endregion
-                                string[] page = images.ToArray();
+                            #endregion
+
+                            Dispatcher.Invoke(new Action(() =>
+                            {
+                            string[] page = images.ToArray();
                                 int num = 0;
                                 for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
                                 {
@@ -1101,6 +1114,7 @@ namespace XHWK.WKTool
                                         };
                                         APP.PageDrawList.Add(model_DrawData);
                                     }
+                      
                                     ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
                                     ImgPrintTwo.Visibility = Visibility.Collapsed;
                                     btnPrint.IsEnabled = true;
@@ -1130,11 +1144,11 @@ namespace XHWK.WKTool
                                     ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                                     btnScreenshot.IsEnabled = true;
                                 }
-                                APP.myloading.Hide();
-                            }
+                           
+                            }));
+                        }
                             catch (Exception ex)
                             {
-                                APP.myloading.Hide();
                                 MessageWindow.Show("文件无效或者文件被加密！");
                                 LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
                             }
@@ -1238,6 +1252,8 @@ namespace XHWK.WKTool
                                 string paths = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
                                 string[] page = ConvertWordToImage(filepath, paths, "", 0, 0, null, 0).ToArray();
                                 int num = 0;
+                            Dispatcher.Invoke(new Action(() =>
+                            {
                                 for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
                                 {
                                     if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
@@ -1290,8 +1306,9 @@ namespace XHWK.WKTool
                                     ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                                     btnScreenshot.IsEnabled = true;
                                 }
-                                APP.myloading.Hide();
-                            }
+                                
+                            }));
+                        }
                             catch (Exception ex)
                             {
                                 APP.myloading.Hide();
@@ -1300,31 +1317,6 @@ namespace XHWK.WKTool
                         }
                     }
                 }
-            }
-                   ));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
             //OpenDialog();
             return "";
         }
@@ -1335,7 +1327,7 @@ namespace XHWK.WKTool
         public void InvokeServerCompate(object obj)
         {
             //APP.myloading.Hide();
-           
+            APP.myloading.Hide();
         }
         /// <summary>
         /// 导入文档
@@ -4718,5 +4710,17 @@ namespace XHWK.WKTool
         {
             HideAngleBorder();
         }
+        /// <summary>
+        /// 鼠标左键点击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
+        {
+            if (RectImgBorder.Visibility != Visibility.Hidden)
+            {
+                HideAngleBorder();
+            }
+        }
     }
 }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -1607,6 +1607,8 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\VideoList_OK.png" />
+    <Resource Include="Images\rdo_no.png" />
+    <Resource Include="Images\rdo_yes.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>