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

Common/Common.csproj

@@ -134,7 +134,6 @@
     <Compile Include="system\LogHelper.cs" />
     <Compile Include="system\PrimaryScreen.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="system\QueueSync.cs" />
     <Compile Include="system\SplashScreen.cs" />
     <Compile Include="system\XmlUtilHelper.cs" />
   </ItemGroup>

XHWK.WKTool/FileDirectoryWindow.xaml

@@ -9,6 +9,76 @@
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
     WindowStyle="None">
+    <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="36"
+                Margin="0,0,0,0"
+                
+                Columns="9"
+                Rows="1">
+                <!--题号-->
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="{Binding SerialNumber}" />
+                <!--题型-->
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="{Binding VideoName}" />
+                <!--分值-->
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="{Binding VideoDuration}" />
+
+                <!--平均时长-->
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="{Binding VideoSize}" />
+                <!--最短时长-->
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="{Binding VideoTime}" />
+                <Grid>
+
+                    <Button Cursor="Hand" Content="详情" FontSize="15"
+                        Background="Transparent"
+                            Foreground="#2D8CF0"
+                        BorderThickness="0"
+                     >
+                    </Button>
+                </Grid>
+            </UniformGrid>
+        </DataTemplate>
+    </Window.Resources>
     <Viewbox>
         <Grid Height="729" Width="1030" >
             <!--分4行-->
@@ -25,8 +95,55 @@
                 </Grid>
             </Border>
            <!--第二行 内容-->
-            <Grid>
-                
+            <Grid Grid.Row="1" Margin="0,15,0,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="45"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <UniformGrid x:Name="uniStatisticsByTitle"
+                Grid.Row="0"
+                Margin="10,0,10,0"
+                Background="#2D8CF0"
+                Columns="6"
+                Rows="1">
+                    <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="序号" Foreground="White" />
+                    <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="视频名称" Foreground="White" />
+                    <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="视频时长" Foreground="White" />
+                    <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="视频大小" Foreground="White" />
+                    <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="日期" Foreground="White" />
+                    <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Text="操作" Foreground="White" />
+                </UniformGrid>
+                <ListBox Grid.Row="1"
+                    x:Name="listView1"
+                    BorderThickness="0"
+                    FontSize="20"
+                    ItemContainerStyle="{StaticResource ListBoxItemContainerStyle}"
+                    ItemTemplate="{StaticResource TongjiItem}"
+                    ItemsSource="{Binding menuList}" />
             </Grid>
             <!--第三行 删除 上传 按钮-->
             <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center">

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -1,5 +1,6 @@
 using Org.BouncyCastle.Asn1.Crmf;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Input;
 using XHWK.Model;
@@ -15,6 +16,7 @@ namespace XHWK.WKTool
         /// 视频模型
         /// </summary>
         List<Model_Video> model_VideoList =null;
+        internal FileDirectoryData pageData = new FileDirectoryData();
         /// <summary>
         /// 文件目录
         /// </summary>
@@ -30,6 +32,7 @@ namespace XHWK.WKTool
         {
             //加载视频列表
             LoadingVideoList();
+            int i = 1;
             //显示视频
             foreach (Model_Video videoinfo in model_VideoList)
             {
@@ -45,7 +48,19 @@ namespace XHWK.WKTool
                 //videoinfo.FileGuid;
                 //文件存储路径
                 //videoinfo.VidePath;
+
+                pageData.menuList.Add(new FileDirectoryModel()
+                {
+                    SerialNumber = i,
+                    VideoName = Common.system.FileToolsCommon.GetIOFileName( videoinfo.VidePath),
+                    VideoDuration = 0,
+                    VideoSize = videoinfo.VideoSize,
+                    VideoTime = videoinfo.RSTime,
+
+                });
+                i++;
             }
+            DataContext = pageData;
         }
         /// <summary>
         /// 加载视频列表
@@ -81,5 +96,97 @@ namespace XHWK.WKTool
         {
             DragMove();
         }
+     
+    }
+    public class FileDirectoryData : NotifyModel
+    {
+        public ObservableCollection<FileDirectoryModel> menuList { get; set; }
+
+        public FileDirectoryData()
+        {
+            menuList = new ObservableCollection<FileDirectoryModel>();
+        }
+    }
+
+    public class FileDirectoryModel : NotifyModel
+    {
+        private int _serialNumber;
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int SerialNumber 
+        {
+            get => _serialNumber;
+            set
+            {
+                _serialNumber = value;
+                OnPropertyChanged("SerialNumber");
+            }
+        }
+        private string _videoName;
+        /// <summary>
+        /// 视频名称
+        /// </summary>
+        public string VideoName
+        {
+            get => _videoName;
+            set
+            {
+                _videoName = value;
+                OnPropertyChanged("VideoName");
+            }
+        }
+        private int _videoDuration;
+        /// <summary>
+        /// 视频时长
+        /// </summary>
+        public int VideoDuration
+        {
+            get => _videoDuration;
+            set
+            {
+                _videoDuration = value;
+                OnPropertyChanged("VideoDuration");
+            }
+        }
+        private string _videoSize;
+        /// <summary>
+        /// 视频大小
+        /// </summary>
+        public string VideoSize
+        {
+            get => _videoSize;
+            set
+            {
+                _videoSize = value;
+                OnPropertyChanged("VideoSize");
+            }
+        }
+        private string _videoTime;
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public string VideoTime
+        {
+            get => _videoTime;
+            set
+            {
+                _videoTime = value;
+                OnPropertyChanged("VideoTime");
+            }
+        }
+        private string _colour; 
+        /// <summary>
+        /// 颜色
+        /// </summary>
+        public string Colour
+        {
+            get => _colour;
+            set
+            {
+                _colour = value;
+                OnPropertyChanged("Colour");
+            }
+        }
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -292,11 +292,11 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnUpload_Click(object sender, RoutedEventArgs e)
         {
-            if (APP.IsLoginType == false)
-            {
-                Login();
-                return;
-            }
+            //if (APP.IsLoginType == false)
+            //{
+            //    Login();
+            //    return;
+            //}
             APP.fileDirectoryWindow = new FileDirectoryWindow();
             APP.fileDirectoryWindow.Show();