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

XHWK.WKTool/PracticeWindow.xaml

@@ -14,6 +14,6 @@
     WindowStyle="None">
     <Grid>
         <Image x:Name="imgCanvas"/>
-        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" Background="Transparent" Visibility="Visible" Grid.ColumnSpan="2" MouseDown="blackboard_canvas_MouseDown" MouseMove="blackboard_canvas_MouseMove" Width="{Binding ElementName=imgMeasure, Path=ActualWidth}" Height="{Binding ElementName=imgMeasure, Path=ActualHeight}" EditingMode="None" Strokes="{Binding InkStrokes, Mode=TwoWay}" PreviewMouseLeftButtonUp="blackboard_canvas_PreviewMouseLeftButtonUp" />
+        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" PreviewMouseRightButtonDown="blackboard_canvas_PreviewMouseRightButtonDown" Background="Transparent" Visibility="Visible" Grid.ColumnSpan="2"/>
     </Grid>
 </Window>

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -347,6 +347,49 @@ namespace XHWK.WKTool
             StrokeRound = null;
             StrokeRectangle = null;
         }
+        /// <summary>
+        /// 鼠标右键
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (APP.W_ScreenRecordingToolbarWindow.flg==10)
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 0;
+            }
+            else
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 1;
+            }
+            this.Hide();
+        }
+
+        private void blackboard_canvas_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (APP.W_ScreenRecordingToolbarWindow.flg == 10)
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 0;
+            }
+            else
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 1;
+            }
+            this.Hide();
+        }
+
+        private void blackboard_canvas_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (APP.W_ScreenRecordingToolbarWindow.flg == 10)
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 0;
+            }
+            else
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 1;
+            }
+            this.Hide();
+        }
     }
 }
 

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -74,24 +74,24 @@
 
             <Image Grid.Row="1"  Source="./Images/Toobar0.png"/>
             <Button Grid.Row="1" x:Name="BtnRecordingScreen" HorizontalAlignment="Left"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="46,0,15,0" Click="BtnRecordingScreen_Click">
-                <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar25.png"/>
+                <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar26.png"/>
             </Button>
-            <TextBlock Grid.Row="1" x:Name="txbTime" Text="00:00" FontSize="20" Foreground="#FFFFFF" Margin="39,80,0,0" Visibility="Hidden"/>
+            <TextBlock Grid.Row="1" x:Name="txbTime" Text="00:00" FontSize="20" Foreground="#FFFFFF" Margin="43,80,0,0" Visibility="Hidden"/>
             <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,15,0">
                 <!--<Button x:Name="BtnRecordingScreen"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnRecordingScreen_Click">
                     <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar25.png"/>
                 </Button>-->
                 <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnStopRecordingScreen_Click">
-                    <Image x:Name="ImgEndRecordingScreen" Source="./Images/Toobar14.png"/>
+                    <Image x:Name="ImgEndRecordingScreen" Source="./Images/Toobar15.png"/>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnBlackPenOne" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPen_Click">
-                    <Image Source="./Images/Toobar27.png"/>
+                <Button  Cursor="Hand" x:Name="btnBlackPenOne" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBrush_Click">
+                    <Image x:Name="imgBlackPenOne" Source="./Images/31.png"/>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnBlackPenTwo" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPen_Click">
-                    <Image Source="./Images/Toobar28.png"/>
+                <Button  Cursor="Hand" x:Name="btnBlackPenTwo" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPenTwo_Click">
+                    <Image x:Name="imgBlackPenTwo" Source="./Images/31.png"/>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnBlackPen" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPen_Click">
-                    <Image Source="./Images/Toobar29.png"/>
+                <Button  Cursor="Hand" x:Name="btnReturn" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnReturn_Click">
+                    <Image x:Name="imgReturn" Source="./Images/Toobar29.png"/>
                 </Button>
             </StackPanel>
         </Grid>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -58,6 +58,10 @@ namespace XHWK.WKTool
         private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
 
         KeyboardHookCommon k_hook;
+        /// <summary>
+        /// 🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
+        /// </summary>
+       public int flg = 0;
         #endregion
 
         #region 初始化
@@ -87,7 +91,17 @@ namespace XHWK.WKTool
             gridToolbar.Visibility = Visibility.Hidden;
             gridColour.Visibility = Visibility.Hidden;
             gridThickness.Visibility = Visibility.Hidden;
-            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));
+
+            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
+            ImgEndRecordingScreen.Source= new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.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;//红笔不可点击
+            imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
+            btnReturn.IsEnabled = true;//返回主界面可点击
+            txbTime.Visibility = Visibility.Hidden;//时间不显示
             if (t == null)
             {
                 t = new DispatcherTimer();
@@ -114,6 +128,7 @@ namespace XHWK.WKTool
                 //结束
                 BtnStopRecordingScreen_Click(null, null);
             }
+
         }
         #endregion
 
@@ -186,9 +201,9 @@ namespace XHWK.WKTool
             FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "tempsr/");
             VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
             int num = 1;
-            while(FileToolsCommon.IsExistFile(VideoSavePathName))
+            while (FileToolsCommon.IsExistFile(VideoSavePathName))
             {
-                VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_"+ num + "." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+                VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_" + num + "." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
                 num++;
             }
         }
@@ -226,8 +241,17 @@ namespace XHWK.WKTool
                 //APP.W_CountdownWindow.Show();
                 //#endregion
 
-                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
-                txbTime.Visibility = Visibility.Visible;
+
+                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));//播放状态
+                ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
+                BtnStopRecordingScreen.IsEnabled = true; //停止录制按钮可点击
+                imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar27.png"));
+                btnBlackPenOne.IsEnabled = true;//蓝笔可点击
+                imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar28.png"));
+                btnBlackPenTwo.IsEnabled = true;//红笔可点击
+                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
+                btnReturn.IsEnabled = false;//返回主界面不可点击
+                txbTime.Visibility = Visibility.Visible;//时间显示
                 try
                 {
                     if (APP.W_CountdownWindow == null)
@@ -263,7 +287,14 @@ namespace XHWK.WKTool
             {
                 TimeOut();
                 IsSuspend = true;
-                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
+                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
+                ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.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;//红笔不可点击
+                txbTime.Visibility = Visibility.Hidden;//时间不显示
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -275,6 +306,7 @@ namespace XHWK.WKTool
                     Thread.Sleep(2000);
                     Dispatcher.Invoke(() =>
                     {
+                        ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
                         BtnRecordingScreen.IsEnabled = true;
                         BtnStopRecordingScreen.IsEnabled = true;
                     });
@@ -300,9 +332,9 @@ namespace XHWK.WKTool
             k_hook.Stop();
             IsSuspend = true;
             txbTime.Text = "00:00";
+            txbTime.Visibility = Visibility.Hidden;
             End();
-            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
-            if (gridToolbar.Visibility==Visibility.Visible)
+            if (gridToolbar.Visibility == Visibility.Visible)
             {
                 gridToolbar.Visibility = Visibility.Hidden;
                 gridColour.Visibility = Visibility.Hidden;
@@ -390,15 +422,21 @@ namespace XHWK.WKTool
                 Directory.CreateDirectory(tempPath);
             }
             string imagePath = Path.Combine(tempPath, time + ".jpg");
-            //ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath);
-            if (gridToolbar.Visibility == Visibility.Visible)
-            {
-                gridToolbar.Visibility = Visibility.Hidden;
-            }
-            else
+            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+
+            try
             {
-                gridToolbar.Visibility = Visibility.Visible;
-                try
+                if (flg == 11)
+                {
+                    flg = 1;
+                    APP.W_PracticeWindow.Hide();
+                }
+                else if(flg==10)
+                {
+                    APP.W_PracticeWindow.Blue();
+                    flg = 11;
+                }
+                else
                 {
                     if (APP.W_PracticeWindow == null)
                     {
@@ -411,15 +449,18 @@ namespace XHWK.WKTool
                         //practiceWin.Owner = this;
                     }
                     APP.W_PracticeWindow.Initialize(imagePath);
+                    flg = 11;
+                    APP.W_PracticeWindow.Blue();
                     APP.W_PracticeWindow.Show();
                 }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
-                }
             }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
+            }
+
             //imgCanvas.Source = new BitmapImage(new Uri(imagePath));
-         
+
         }
         /// <summary>
         /// 屏幕宽
@@ -627,5 +668,124 @@ namespace XHWK.WKTool
         {
             DragMove();
         }
+        /// <summary>
+        /// 红笔
+        /// </summary>
+        /// <param name="sender"></param> 
+        /// <param name="e"></param>
+        private void BtnBlackPenTwo_Click(object sender, RoutedEventArgs e)
+        {
+            string time = GetTimeStamp();
+            string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
+            if (!Directory.Exists(tempPath))
+            {
+                Directory.CreateDirectory(tempPath);
+            }
+            string imagePath = Path.Combine(tempPath, time + ".jpg");
+            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+
+            try
+            {
+                if (flg == 10)
+                {
+                    flg = 0;
+                    APP.W_PracticeWindow.Hide();
+                }
+                else if(flg==11)
+                {
+                    flg = 10;
+                    APP.W_PracticeWindow.Red();
+                }
+                else
+                {
+                    if (APP.W_PracticeWindow == null)
+                    {
+                        APP.W_PracticeWindow = new PracticeWindow();
+                        //APP.W_PracticeWindow.Topmost = true;
+                        APP.W_PracticeWindow.Width = pwidth;
+                        APP.W_PracticeWindow.Height = pHeight;
+                        APP.W_PracticeWindow.Left = 0;
+                        APP.W_PracticeWindow.Top = 0;
+                        //practiceWin.Owner = this;
+                    }
+                    APP.W_PracticeWindow.Initialize(imagePath);
+                    flg = 10;
+                    APP.W_PracticeWindow.Red();
+                    APP.W_PracticeWindow.Show();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
+            }
+        }
+        /// <summary>
+        /// 鼠标右键按下事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void RightButtonDown()
+        {
+            if (flg > 9)
+            {
+                APP.W_PracticeWindow.Hide();
+            }
+            else
+            {
+                string time = GetTimeStamp();
+                string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
+                if (!Directory.Exists(tempPath))
+                {
+                    Directory.CreateDirectory(tempPath);
+                }
+                string imagePath = Path.Combine(tempPath, time + ".jpg");
+                ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+
+                try
+                {
+                    if (APP.W_PracticeWindow == null)
+                    {
+                        APP.W_PracticeWindow = new PracticeWindow();
+                        //APP.W_PracticeWindow.Topmost = true;
+                        APP.W_PracticeWindow.Width = pwidth;
+                        APP.W_PracticeWindow.Height = pHeight;
+                        APP.W_PracticeWindow.Left = 0;
+                        APP.W_PracticeWindow.Top = 0;
+                        //practiceWin.Owner = this;
+                    }
+                    APP.W_PracticeWindow.Initialize(imagePath);
+
+                    if (flg == 0)
+                    {
+                        flg = 10;
+                        APP.W_PracticeWindow.Red();
+                    }
+                    else
+                    {
+                        flg = 11;
+                        APP.W_PracticeWindow.Blue();
+                    }
+                    APP.W_PracticeWindow.Show();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 返回主界面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnReturn_Click(object sender, RoutedEventArgs e)
+        {
+            if (APP.W_XHMicroLessonSystemWindow == null)
+            {
+                APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+            }
+            APP.W_XHMicroLessonSystemWindow.Show();
+            this.Hide();
+        }
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -22,6 +22,114 @@
             </Border.Effect>
         </Border>
     </Grid>-->
+    <Window.Resources>
+        <!--  ListBox容器样式  -->
+        <Style x:Key="ListBoxItemContainerStyle" TargetType="{x:Type ListBoxItem}">
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                        <Border
+                            x:Name="itemBox"
+                            Background="Transparent"
+                            BorderBrush="Transparent"
+                            BorderThickness="0">
+                            <ContentPresenter />
+                        </Border>
+                        <ControlTemplate.Triggers />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <DataTemplate x:Key="TongjiItem">
+            <UniformGrid
+                Height="50"
+                Margin="0,0,0,0"
+                Background="{Binding Colour}"
+                Columns="5"
+                Rows="1">
+                <!--题号-->
+                <TextBlock 
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Text="{Binding SerialNumber}" />
+                <Grid>
+                    <StackPanel Orientation="Horizontal"   HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                        <TextBox IsEnabled="{Binding IsEnabled}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16" Height="30" Padding="0,5,0,0"
+                    Text="{Binding VideoName,Mode=TwoWay}" Width="150"/>
+                        <Button x:Name="btnModify" Background="Transparent"
+                                Cursor="Hand"
+                        BorderThickness="0" Click="BtnModify_Click">
+                            <Grid>
+                                <Image Source="./Images/fileDirectory3.png" Margin="6,6,6,6" Height="20" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory4.png" Margin="6,6,6,6" Height="20" Visibility="{Binding cos}"/>
+                            </Grid>
+                        </Button>
+                    </StackPanel>
+                </Grid>
+
+
+                <!--分值-->
+                <!--
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="{Binding VideoDuration}" />-->
+
+                <!--平均时长-->
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Text="{Binding VideoSize}" />
+                <!--最短时长-->
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Text="{Binding VideoTime}" />
+
+                <Grid>
+                    <StackPanel Orientation="Horizontal"   HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                        <Button x:Name="btnPlay" Background="Transparent" 
+                                Cursor="Hand"
+                        BorderThickness="0" Click="BtnPlay_Click">
+                            <Grid>
+                                <Image Source="./Images/fileDirectory1.png" Margin="10" Height="20" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory2.png" Margin="10"  Height="20" Visibility="{Binding cos}"/>
+                            </Grid>
+                        </Button>
+                        <Button x:Name="btnUpload" Background="Transparent"
+                                Cursor="Hand"
+                        BorderThickness="0" Click="BtnUploads_Click">
+                            <Grid>
+                                <Image Source="./Images/fileDirectory7.png" Margin="6,6,6,6" Height="20" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory8.png" Margin="6,6,6,6" Height="20" Visibility="{Binding cos}"/>
+                            </Grid>
+                        </Button>
+                        <Button x:Name="btnDelete" Background="Transparent"
+                                Cursor="Hand"
+                        BorderThickness="0" Click="BtnDelete_Click">
+                            <Grid>
+                                <Image Source="./Images/fileDirectory5.png" Margin="6,6,6,6" Height="20" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory6.png" Margin="6,6,6,6" Height="20" Visibility="{Binding cos}"/>
+                            </Grid>
+                        </Button>
+                    </StackPanel>
+                </Grid>
+
+
+            </UniformGrid>
+        </DataTemplate>
+    </Window.Resources>
     <Window.BorderBrush>
         <RadialGradientBrush>
             <GradientStop Offset="0.997" Color="#001B1919"/>
@@ -145,7 +253,7 @@
                 </StackPanel>
             </Grid>
             <!--主内容-->
-                <Grid Grid.Row="1" x:Name="GridMain" Width="1276" >
+                <Grid Grid.Row="1" x:Name="GridMain" Width="1276" Visibility="Visible">
                     <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible">
                         <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780">
                             <Grid>
@@ -164,7 +272,7 @@
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
                              MouseMove="IMG1_MouseMove"
                              MouseWheel="IMG1_MouseWheel" >
-                                                <Image Name="imgCanvas" Width="635" Height="auto" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown" Visibility="Collapsed">
+                                                <Image Name="imgCanvas" Width="635" Height="auto" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown">
                                                 </Image>
                                             </ContentControl>
                                         </ScrollViewer>
@@ -172,7 +280,7 @@
                                 </Border>
                             </Grid>
                             <!--导入图片-->
-                            <Image x:Name="imgDocumentation" Visibility="Collapsed"/>
+                            <Image x:Name="imgDocumentation" Visibility="Visible"/>
                             <!--<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" />
                             <!--摄像头-->
@@ -271,17 +379,17 @@
                     <TextBlock x:Name="txbFilePath" Text="文件路径" FontSize="16" Width="80"  Foreground="#2D8CF0" Padding="2,26,10,0"/>
                     <!--输入框-->
                     <Border Background="#CDD6E0" Width="525" Height="43" CornerRadius="3">
-                        <Label x:Name="txbStoragePath" Content="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="523" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+                        <Label x:Name="txbStoragePath" Background="#FFFFFF" Content="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="523" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
                     </Border>
                     <!--浏览按钮-->
-                    <Button Cursor="Hand" x:Name="btnBrowse" Content="打开" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
+                    <Button Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="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>#CDD6E0</Border.Background>
+                                        <Border.Background>#EBEFF3</Border.Background>
                                     <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -317,6 +425,108 @@
                     </Button.Template>
                 </Button>
             </Grid>
+                <!--上传-->
+                <Grid Grid.Row="1" x:Name="gridUpload" Visibility="Collapsed">
+                    <Border Width="1276" Background="#EFF1F8">
+                        <Grid  Width="1236" Background="#FFFFFF" Margin="0,0,0,0">
+                        <!--分4行-->
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                                <RowDefinition Height="30"/>
+                            </Grid.RowDefinitions>
+                        <!--第二行 内容-->
+                        <Grid Grid.Row="0" Margin="0,0,0,0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="45"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <UniformGrid x:Name="uniStatisticsByTitle"
+                Grid.Row="0"
+                Margin="0,0,0,0"
+                Background="#E6F0FF"
+                Columns="5"
+                Rows="1">
+                                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Text="序号"  />
+                                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Text="视频名称"/>
+                                <!--<TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="视频时长" Foreground="White" />-->
+                                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Text="视频大小"/>
+                                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Text="日期"/>
+                                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Text="操作"/>
+                            </UniformGrid>
+                            <ListBox Grid.Row="1" Margin="0,0,0,0"
+                    x:Name="listView1"
+                    BorderThickness="0"
+                    FontSize="20"
+                    ItemContainerStyle="{StaticResource ListBoxItemContainerStyle}"
+                    ItemTemplate="{StaticResource TongjiItem}"
+                    ItemsSource="{Binding menuList}" 
+                           ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
+                        </Grid>
+                        <StackPanel Grid.Row="3" x:Name="stpUp" 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="btnLastPage"
+                    Width="60" Height="20"
+                    Click="BtnLastPage_Click">
+                                <Button.Content>
+                                    <StackPanel>
+                                        <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                                    </StackPanel>
+                                </Button.Content>
+                            </Button>
+                            <Grid Width="60"  Background="Transparent">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="311*"/>
+                                    <RowDefinition Height="483*"/>
+                                </Grid.RowDefinitions>
+                                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-12,0,0" Grid.Row="1"  Background="Transparent">
+                                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"  Background="Transparent">
+                                        <TextBlock x:Name="txbCurrpageTwo" TextAlignment="Center" FontSize="15"/>
+                                        <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
+                                        <TextBlock x:Name="txbPageNumTwo" TextAlignment="Center" FontSize="15"/>
+                                    </StackPanel>
+                                </StackPanel>
+                            </Grid>
+                            <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                    x:Name="btnNextPage"  Background="Transparent"
+                    Width="60" Height="20"
+                    Click="BtnNextPage_Click">
+                                <Button.Content>
+                                    <StackPanel>
+                                        <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
+                                    </StackPanel>
+                                </Button.Content>
+                            </Button>
+                        </StackPanel>
+
+                    </Grid>
+                    </Border>
+                </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,10,0,0"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -24,6 +24,7 @@ using System.Text;
 using System.Collections.Specialized;
 using XHWK.WKTool.Config;
 using System.Windows.Threading;
+using System.Diagnostics;
 
 namespace XHWK.WKTool
 {
@@ -79,6 +80,24 @@ namespace XHWK.WKTool
         /// 计时用
         /// </summary>
         private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
+        #region 上传
+        /// <summary>
+        /// 视频模型
+        /// </summary>
+        List<Model_Video> model_VideoList = null;
+        /// <summary>
+        /// 数据列表
+        /// </summary>
+        internal FileDirectoryData pageData = new FileDirectoryData();
+        /// <summary>
+        /// 下标
+        /// </summary>
+        private int Subscript = 0;
+        /// <summary>
+        /// 是否是修改状态
+        /// </summary>
+        private bool IsModify = false;
+        #endregion
         #endregion
 
         #region 初始化
@@ -446,17 +465,17 @@ namespace XHWK.WKTool
                 Login();
                 return;
             }
-            if (APP.fileDirectoryWindow == null)
+            if(gridUpload.Visibility == Visibility.Visible)
             {
-                APP.fileDirectoryWindow = new FileDirectoryWindow();
-                //APP.fileDirectoryWindow.Topmost = true;
-                APP.fileDirectoryWindow.Owner = this;
+                gridUpload.Visibility = Visibility.Collapsed;
+                GridMain.Visibility = Visibility.Visible;
             }
             else
             {
-                APP.fileDirectoryWindow.Initialize();
+                gridUpload.Visibility = Visibility.Visible;
+                GridMain.Visibility = Visibility.Collapsed;
+                InitializeUpload();
             }
-            APP.fileDirectoryWindow.ShowDialog();
         }
         /// <summary>
         /// 关闭事件
@@ -578,6 +597,12 @@ namespace XHWK.WKTool
             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());
+                System.Windows.MessageBox.Show("路径已变更，下次创建微课时自动生效！！！");
+            }
         }
         /// <summary>
         /// 设置事件
@@ -620,23 +645,23 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBrowse_Click(object sender, RoutedEventArgs e)
         {
-            System.Diagnostics.Process.Start(APP.WKData.WkPath);
-            //string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
-            //Ofd = new System.Windows.Forms.FolderBrowserDialog();
+            //System.Diagnostics.Process.Start(APP.WKData.WkPath);
+            string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
+            Ofd = new System.Windows.Forms.FolderBrowserDialog();
 
-            //Result = Ofd.ShowDialog();
-            //if (Result == System.Windows.Forms.DialogResult.OK)
-            //{
-            //    if (Ofd.SelectedPath != "")
-            //    {
+            Result = Ofd.ShowDialog();
+            if (Result == System.Windows.Forms.DialogResult.OK)
+            {
+                if (Ofd.SelectedPath != "")
+                {
 
 
-            //        //txbStoragePath.Text = Ofd.SelectedPath;
-            //        //string ApplicationData = ZConfig.dataPath + "fileStorageAddress.txt";
-            //        //string temp = ofd.SelectedPath;
-            //        //System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
-            //    }
-            //}
+                    txbStoragePath.Content = Ofd.SelectedPath;
+                    //string ApplicationData = ZConfig.dataPath + "fileStorageAddress.txt";
+                    //string temp = ofd.SelectedPath;
+                    //System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
+                }
+            }
         }
         /// <summary>
         /// 画笔颜色事件 白色
@@ -811,8 +836,10 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnScreenshot_Click(object sender, RoutedEventArgs e)
         {
+            APP.ImgPath = string.Empty;
             string time = GetTimeStamp();
             string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory) + time + ".jpg";
+            APP.ImgPath = desktopPath;
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), desktopPath,false,out BitmapImage bitmap);
             if (this.WindowState == WindowState.Normal)//截图隐藏窗口
             {
@@ -846,6 +873,7 @@ namespace XHWK.WKTool
             {
                 if (this.WindowState == WindowState.Minimized)//截图完恢复窗口
                 {
+                    this.Topmost = true;
                     this.WindowState = WindowState.Normal;
                 }
                 if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
@@ -878,6 +906,7 @@ namespace XHWK.WKTool
                         btnPrint.IsEnabled = true;
                     }
                 }
+                this.Topmost = false;
             }
         }
         /// <summary>
@@ -1035,11 +1064,11 @@ namespace XHWK.WKTool
                             }
                             if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
-                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                                 imgCanvas.Source = null;
                                 ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
                                 ImgScreenshotTwo.Visibility = Visibility.Visible;
                                 btnScreenshot.IsEnabled = false;
+                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                             }
                             else
                             {
@@ -2640,15 +2669,481 @@ namespace XHWK.WKTool
             imgCanvas.Source = null;
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
+        #region 上传
+        /// <summary>
+        /// 初始化上传
+        /// </summary>
+        public void InitializeUpload()
         {
-            //System.Windows.SplashScreen(LoadDialog);
-            //Common.system.SplashScreen.Show(typeof(LoadDialog));
-            //Thread.Sleep(5000);
-            //Common.system.SplashScreen.Close();
             APP.myloading.Show();
-            Thread.Sleep(1000);
+            MouseNumber = 0;
+            IsModify = false;
+            //加载视频列表
+            LoadingVideoList();
+            int i = 1;
+            bool isColour = true;
+            pageData.menuList.Clear();
+            //显示视频
+            foreach (Model_Video videoinfo in model_VideoList)
+            {
+                //是否已上传
+                //videoinfo.IsUpload;
+                //录制时间
+                //videoinfo.RSTime;
+                //文件大小
+                //videoinfo.VideoSize;
+                //文件缩略图路径
+                //videoinfo.ThumbnailPath;
+                //文件唯一标示 上传事件筛选需要上传的视频
+                //videoinfo.FileGuid;
+                //文件存储路径
+                //videoinfo.VidePath;
+
+                string colour = "#FFFFFF";
+                if (isColour == true)
+                {
+                    colour = "#FFFFFF";
+                    isColour = false;
+                }
+                else
+                {
+                    colour = "#E6F1FF";
+                    isColour = true;
+                }
+                string vis = "Visible";
+                string cos = "Collapsed";
+                if (!videoinfo.IsUpload)
+                {
+                    vis = "Collapsed";
+                    cos = "Visible";
+                }
+                if (i <= 16)
+                {
+                    pageData.menuList.Add(new FileDirectoryModel()
+                    {
+                        SerialNumber = i,
+                        VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
+                        Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
+                        FilePath = videoinfo.VideoPath.Replace(FileToolsCommon.GetIOFileName(videoinfo.VideoPath), "").Trim(),
+                        VideoDuration = 0,
+                        VideoSize = videoinfo.VideoSize,
+                        VideoTime = videoinfo.RSTime,
+                        IsEnabled = false,
+                        Path = videoinfo.VideoPath,
+                        Colour = colour,
+                        Visi = vis,
+                        Coll = cos,
+                        FileGuid = videoinfo.FileGuid,
+                        VideoType = videoinfo.VideoType.ToString()
+                    }); ;
+                }
+                i++;
+            }
+            Currpage = 0;
+            PageNum = 0;
+            if (pageData.menuList.Count>0)
+            {
+                Currpage = 1;
+                txbCurrpageTwo.Text = Currpage.ToString();
+                stpUp.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                stpUp.Visibility = Visibility.Hidden;
+            }
+            PageNum = model_VideoList.Count;
+            if (PageNum > 0)
+            {
+                int t = 1;
+                while (PageNum > 16 * t)
+                {
+                    t++;
+                }
+                PageNum = t;
+            }
+            else
+            {
+                PageNum = 0;
+            }
+            txbPageNumTwo.Text = PageNum.ToString();
             APP.myloading.Hide();
+            DataContext = pageData;
+        }
+        /// <summary>
+        /// 当前页
+        /// </summary>
+        int Currpage = 0;
+        /// <summary>
+        /// 总页码
+        /// </summary>
+        int PageNum = 0;
+        /// <summary>
+        /// 加载视频列表
+        /// </summary>
+        public void LoadingVideoList()
+        {
+            try
+            {
+                model_VideoList = new List<Model_Video>();
+                foreach (Model_WKData Vdata in APP.WKDataList)
+                {
+                    if (Vdata.VideoList == null)
+                        continue;
+                    foreach (Model_Video videoinfo in Vdata.VideoList)
+                    {
+                        try
+                        {
+                            if (string.IsNullOrWhiteSpace(videoinfo.VideoPath))
+                            {
+                                continue;
+                            }
+                            if (string.IsNullOrWhiteSpace(videoinfo.VideoSize) || videoinfo.VideoSize == "0 MB")
+                            {
+                                videoinfo.VideoSize = FileToolsCommon.GetFileSizeByMB(videoinfo.VideoPath).ToString() + " MB";
+                            }
+                            model_VideoList.Add(videoinfo);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteErrLog("【加载视频列表】（LoadingVideoList）" + ex.Message, ex);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【加载视频列表】（LoadingVideoList）" + ex.Message, ex);
+            }
+        }
+        /// <summary>
+        /// 上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnUploads_Click(object sender, RoutedEventArgs e) 
+        {
+            pageData.menuList[Subscript].IsEnabled = false;
+            List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnUpload");
+            for (int i = 0; i < buttons.Count; i++)
+            {
+                if (buttons[i] == sender)
+                {
+                    DAL_Upload dAL_Upload = new DAL_Upload();
+
+                    if (dAL_Upload.UploadVideo(pageData.menuList[i].FileGuid, out string ErrMessage))
+                    {
+                        pageData.menuList[i].Visi = "Visible";
+                        pageData.menuList[i].Coll = "Collapsed";
+
+                        DataContext = pageData;
+
+                        System.Windows.MessageBox.Show("视频上传成功！");
+                    }
+                    else
+                    {
+                        System.Windows.MessageBox.Show(ErrMessage);
+                    }
+
+
+                }
+            }
+        }
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnDelete_Click(object sender, RoutedEventArgs e)
+        {
+
+            pageData.menuList[Subscript].IsEnabled = false;
+            List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnDelete");
+            for (int i = 0; i < buttons.Count; i++)
+            {
+                if (buttons[i] == sender)
+                {
+
+                    //if (APP.W_PromptWindow == null)
+                    //{
+                    //    APP.W_PromptWindow = new PromptWindow();
+                    //    APP.W_PromptWindow.Owner = this;
+                    //}
+                    //APP.W_PromptWindow.Initialize(pageData.menuList[i].VideoName);
+                    //APP.W_PromptWindow.ShowDialog();
+
+                    foreach (Model_WKData wKData in APP.WKDataList)
+                    {
+                        if (wKData.VideoList == null)
+                            continue;
+                        if (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[i].FileGuid))
+                        {
+                            try
+                            {
+                                FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid).VideoPath);
+                                FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid).ThumbnailPath);
+                                wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid));
+                                InitializeUpload();
+                                return;
+                            }
+                            catch (Exception ex)
+                            {
+                                System.Windows.MessageBox.Show("无法删除视频！" + ex.Message);
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// 播放
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnPlay_Click(object sender, RoutedEventArgs e)
+        {
+            pageData.menuList[Subscript].IsEnabled = false;
+            List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnPlay");
+            for (int i = 0; i < buttons.Count; i++)
+            {
+                if (buttons[i] == sender)
+                {
+                    try
+                    {
+                        ProcessStartInfo psi = new ProcessStartInfo(pageData.menuList[i].Path);
+                        Process pro = new Process
+                        {
+                            StartInfo = psi
+                        };
+                        pro.Start();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteErrLog("FileDirectoryWindow【BtnPlay_Click】" + ex.Message, ex);
+                        System.Windows.MessageBox.Show(ex.Message);
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// 搜索集合匹配的索引
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="parent"></param>
+        /// <param name="childName"></param>
+        /// <returns></returns>
+        public static List<T> FindChilds<T>(DependencyObject parent, string childName)
+  where T : DependencyObject
+        {
+            List<T> list = new List<T>();
+            if (parent == null)
+            {
+                return list;
+            }
+
+            int childrenCount = VisualTreeHelper.GetChildrenCount(parent);
+            for (int i = 0; i < childrenCount; i++)
+            {
+                DependencyObject child = VisualTreeHelper.GetChild(parent, i);
+                // 如果子控件不是需查找的控件类型
+                T childType = child as T;
+                if (childType == null)
+                {
+                    // 在下一级控件中递归查找
+                    List<T> findChildList = FindChilds<T>(child, childName);
+                    for (int j = 0; j < findChildList.Count; j++)
+                    {
+                    }
+                    list.AddRange(FindChilds<T>(child, childName));
+                }
+                else if (!string.IsNullOrEmpty(childName))
+                {
+                    FrameworkElement frameworkElement = child as FrameworkElement;
+                    // 如果控件名称符合参数条件
+                    if (frameworkElement != null && frameworkElement.Name == childName)
+                    {
+                        list.Add((T)child);
+                    }
+                }
+                else
+                {
+                    // 查找到了控件
+                    list.Add((T)child);
+                }
+            }
+
+            return list;
         }
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnModify_Click(object sender, RoutedEventArgs e)
+        {
+            if (IsModify)
+            {
+                pageData.menuList[Subscript].IsEnabled = false;
+            }
+            List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnModify");
+            for (int i = 0; i < buttons.Count; i++)
+            {
+                if (buttons[i] == sender)
+                {
+                    pageData.menuList[i].IsEnabled = true;
+                    Subscript = i;
+                    IsModify = true;
+                }
+            }
+        }
+        int MouseNumber = 0;
+        /// <summary>
+        /// 上传 上页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnLastPage_Click(object sender, RoutedEventArgs e)
+        {
+            if (Currpage >1)
+            {
+                Currpage -= 1;
+                txbCurrpageTwo.Text = Currpage.ToString();
+                int i = 1;
+                bool isColour = true;
+                pageData.menuList.Clear();
+                //显示视频
+                foreach (Model_Video videoinfo in model_VideoList)
+                {
+                    //是否已上传
+                    //videoinfo.IsUpload;
+                    //录制时间
+                    //videoinfo.RSTime;
+                    //文件大小
+                    //videoinfo.VideoSize;
+                    //文件缩略图路径
+                    //videoinfo.ThumbnailPath;
+                    //文件唯一标示 上传事件筛选需要上传的视频
+                    //videoinfo.FileGuid;
+                    //文件存储路径
+                    //videoinfo.VidePath;
+
+                    string colour = "#FFFFFF";
+                    if (isColour == true)
+                    {
+                        colour = "#FFFFFF";
+                        isColour = false;
+                    }
+                    else
+                    {
+                        colour = "#E6F1FF";
+                        isColour = true;
+                    }
+                    string vis = "Visible";
+                    string cos = "Collapsed";
+                    if (!videoinfo.IsUpload)
+                    {
+                        vis = "Collapsed";
+                        cos = "Visible";
+                    }
+                    if (i <= Currpage * 16 && i >= (Currpage - 1) * 16)
+                    {
+                        pageData.menuList.Add(new FileDirectoryModel()
+                        {
+                            SerialNumber = i,
+                            VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
+                            Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
+                            FilePath = videoinfo.VideoPath.Replace(FileToolsCommon.GetIOFileName(videoinfo.VideoPath), "").Trim(),
+                            VideoDuration = 0,
+                            VideoSize = videoinfo.VideoSize,
+                            VideoTime = videoinfo.RSTime,
+                            IsEnabled = false,
+                            Path = videoinfo.VideoPath,
+                            Colour = colour,
+                            Visi = vis,
+                            Coll = cos,
+                            FileGuid = videoinfo.FileGuid,
+                            VideoType = videoinfo.VideoType.ToString()
+                        }); ;
+                    }
+                    i++;
+                }
+                APP.myloading.Hide();
+            }
+        }
+        /// <summary>
+        /// 上传 下页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnNextPage_Click(object sender, RoutedEventArgs e)
+        {
+            if(Currpage< PageNum)
+            {
+                Currpage += 1;
+                txbCurrpageTwo.Text = Currpage.ToString();
+                int i = 1;
+                bool isColour = true;
+                pageData.menuList.Clear();
+                //显示视频
+                foreach (Model_Video videoinfo in model_VideoList)
+                {
+                    //是否已上传
+                    //videoinfo.IsUpload;
+                    //录制时间
+                    //videoinfo.RSTime;
+                    //文件大小
+                    //videoinfo.VideoSize;
+                    //文件缩略图路径
+                    //videoinfo.ThumbnailPath;
+                    //文件唯一标示 上传事件筛选需要上传的视频
+                    //videoinfo.FileGuid;
+                    //文件存储路径
+                    //videoinfo.VidePath;
+
+                    string colour = "#FFFFFF";
+                    if (isColour == true)
+                    {
+                        colour = "#FFFFFF";
+                        isColour = false;
+                    }
+                    else
+                    {
+                        colour = "#E6F1FF";
+                        isColour = true;
+                    }
+                    string vis = "Visible";
+                    string cos = "Collapsed";
+                    if (!videoinfo.IsUpload)
+                    {
+                        vis = "Collapsed";
+                        cos = "Visible";
+                    }
+                    if (i <= Currpage*16&&i>(Currpage-1)*16)
+                    {
+                        pageData.menuList.Add(new FileDirectoryModel()
+                        {
+                            SerialNumber = i,
+                            VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
+                            Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
+                            FilePath = videoinfo.VideoPath.Replace(FileToolsCommon.GetIOFileName(videoinfo.VideoPath), "").Trim(),
+                            VideoDuration = 0,
+                            VideoSize = videoinfo.VideoSize,
+                            VideoTime = videoinfo.RSTime,
+                            IsEnabled = false,
+                            Path = videoinfo.VideoPath,
+                            Colour = colour,
+                            Visi = vis,
+                            Coll = cos,
+                            FileGuid = videoinfo.FileGuid,
+                            VideoType = videoinfo.VideoType.ToString()
+                        }); ;
+                    }
+                    i++;
+                }
+                APP.myloading.Hide();
+            }    
+        }
+        #endregion
     }
 }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -1547,5 +1547,13 @@
     <Resource Include="Images\countdown3_9.png" />
     <Resource Include="Images\microLessonSystem_999.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\31.png" />
+    <Resource Include="Images\32.png" />
+    <Resource Include="Images\Toobar27.png" />
+    <Resource Include="Images\Toobar28.png" />
+    <Resource Include="Images\Toobar29.png" />
+    <Resource Include="Images\Toobar30.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>