Skip to content

V
VIZ.Package
Commit 6c6d13f5 by wangonghui
Options

媒体资源库文件列表添加

parent bef2c9fd
Showing with 192 additions and 31 deletions
VIZ.Package.Domain/Model/Resource/MH/MHResourceFileModel.cs
......@@ -83,6 +83,30 @@ namespace VIZ.Package.Domain
set { path = value; this.RaisePropertyChanged(nameof(Path)); }
}
/// <summary>
/// 日期
/// </summary>
private string date;
public string Date
{
get { return date; }
set { date = value; this.RaisePropertyChanged(nameof(Date)); }
}
/// <summary>
/// 文件大小
/// </summary>
public string fileSize;
public string FileSize
{
get { return fileSize; }
set { fileSize = value;this.RaisePropertyChanged(nameof(FileSize)); }
}
#endregion
#region ResourcePath -- 资源路径
......@@ -117,9 +141,9 @@ namespace VIZ.Package.Domain
#region----源图
private Bitmap originThumbnailBitmap;
private Image originThumbnailBitmap;
public Bitmap OriginThumbnailBitmap
public Image OriginThumbnailBitmap
{
get { return originThumbnailBitmap; }
set { originThumbnailBitmap = value; this.RaisePropertyChanged(nameof(OriginThumbnailBitmap)); }
......
VIZ.Package.Module/Resource/MediaResource/Controller/MediaResourceFileController.cs
......@@ -69,6 +69,7 @@ namespace VIZ.Package.Module
List<MHResourceFileModel> list = new List<MHResourceFileModel>();
// folder.Files = new System.Collections.ObjectModel.ObservableCollection<GHResourceFileModel>();
if (FileResult.masterData == null) return;
int i = 0;
foreach (var file in FileResult.masterData)
{
try
......@@ -86,13 +87,15 @@ namespace VIZ.Package.Module
log.Info("后去图片结束");
GHFile.FileType = ResourceFileType.IMAGE;
Image img = Bitmap.FromStream(fileResult);
GHFile.Date = Convert.ToDateTime(file.fileUpdateTime).ToString("yyyy/MM/dd HH:mm");
GHFile.FileSize = file.fileSize;
Image img = Image.FromStream(fileResult);
// img = ThumbnailHelper.GetThumbnail(img, img.Width / 2, img.Height / 2);
Bitmap originBmp = new Bitmap(img);
//Bitmap originBmp = new Bitmap(img);
GHFile.OriginThumbnailBitmap = originBmp;
GHFile.OriginThumbnailBitmap = img;
//缩略图
img = ThumbnailHelper.GetThumbnail(img, img.Width / 2, img.Height / 2);
......@@ -116,6 +119,7 @@ namespace VIZ.Package.Module
GHFile.FileType = ResourceFileType.Video;
list.Add(GHFile);
}
i++;
}
catch (Exception ex)
{
......
VIZ.Package.Module/Resource/MediaResource/Controller/Model/ms.cs
......@@ -35,6 +35,23 @@ namespace VIZ.Package.Module
get;
set;
}
public string fileUpdateTime
{
get;
set;
}
public string fileCreatTime
{
get;
set;
}
public string fileSize
{
get;
set;
}
public List<ms> m = new List<ms>();
}
}
VIZ.Package.Module/Resource/MediaResource/View/MediaResourcePanel.xaml
......@@ -32,13 +32,14 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MinWidth="240" MaxWidth="400"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<!--<RowDefinition Height="30"></RowDefinition>-->
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<!-- 资源文件夹 -->
<dxg:TreeViewControl ItemsSource="{Binding Path=FolderModels}" Margin="0,0,6,0" Grid.Row="1"
<dxg:TreeViewControl ItemsSource="{Binding Path=FolderModels}" Margin="0,0,6,0" Grid.Row="0"
SelectedItem="{Binding Path=SelectedFolderModel,Mode=TwoWay}"
SelectionMode="Row" ShowNodeImages="True" ShowSearchPanel="False"
ContextMenu="{Binding Path=FolderContextMenu,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:MediaResourcePanel}}}"
......@@ -63,7 +64,7 @@
<!-- 文件夹等待 -->
<dx:WaitIndicator DeferedVisibility="{Binding IsFolderLoading}" Content="Loading..." Grid.Row="1" Margin="0,0,6,0" />
<GridSplitter HorizontalAlignment="Right" Width="4" Grid.Row="1"></GridSplitter>
<GridSplitter HorizontalAlignment="Right" Width="4" Grid.Row="0"></GridSplitter>
<!-- 资源文件 -->
<!--<StackPanel Grid.Column="1" Orientation="Horizontal">
......@@ -90,21 +91,20 @@
</dxmvvm:Interaction.Behaviors>
</RadioButton>
</StackPanel>-->
<dxg:GridControl x:Name="fileGrid" Grid.Column="1" ShowBorder="False" Grid.Row="1"
<dxg:GridControl x:Name="fileGrid" Grid.Column="1" ShowBorder="False" Grid.Row="0" Visibility="{Binding VisibilityImage,Mode=TwoWay}"
CustomRowFilterCommand="{Binding Path=FileRowFilterCommand}"
ItemsSource="{Binding Path=FileModels}"
SelectedItem="{Binding Path=SelectedFileModel,Mode=TwoWay}"
ContextMenu="{Binding Path=FileContextMenu,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:MediaResourcePanel}}}">
<dxmvvm:Interaction.Behaviors>
<dxmvvm:EventToCommand EventName="MouseDoubleClick" Command="{Binding Path=FileDoubleClickCommand}"></dxmvvm:EventToCommand>
</dxmvvm:Interaction.Behaviors>
<dxg:GridControl.Resources>
<!-- 定义Card模板 -->
<DataTemplate x:Key="CardTemplate">
<!--<common:ResourceDragBorder Background="Transparent">-->
<Grid Width="160" ClipToBounds="False" UseLayoutRounding="True">
<Grid Width="160" ClipToBounds="False" UseLayoutRounding="True" >
<Grid.RowDefinitions>
<RowDefinition Height="90" />
<RowDefinition Height="30" />
......@@ -116,22 +116,7 @@
<!--</common:ResourceDragBorder>-->
</DataTemplate>
</dxg:GridControl.Resources>
<!--<dxg:GridControl.ContextMenu>
<ContextMenu>
<dxmvvm:Interaction.Behaviors>
<dxmvvm:EventToCommand EventName="Opened" Command="{Binding Path=FileContextMenuOpendCommand}"></dxmvvm:EventToCommand>
</dxmvvm:Interaction.Behaviors>
<MenuItem Header="刷新" Command="{Binding Path=PlacementTarget.DataContext.RefreshFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="添加文件" Command="{Binding Path=PlacementTarget.DataContext.CreateFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="删除文件" Command="{Binding Path=PlacementTarget.DataContext.DeleteFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="移动文件" Command="{Binding Path=PlacementTarget.DataContext.MoveFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<Separator/>
-->
<!--<MenuItem Header="添加至场景模板" Command="{Binding Path=PlacementTarget.DataContext.AddProgramTemplateCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>-->
<!--<MenuItem Header="复制路径" Command="{Binding Path=PlacementTarget.DataContext.CopyFilePathCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>-->
<!--
</ContextMenu>
</dxg:GridControl.ContextMenu>-->
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="Name" AllowColumnFiltering="False" AllowEditing="False" ReadOnly="True"></dxg:GridColumn>
</dxg:GridControl.Columns>
......@@ -155,5 +140,26 @@
<!-- 文件等待 -->
<dx:WaitIndicator DeferedVisibility="{Binding IsFileLoading}" Content="Loading..." Grid.Column="1" Grid.Row="1" />
<dxg:GridControl x:Name="FileList" ShowBorder="False" ItemsSource="{Binding Path= FileModels,Mode=TwoWay}" Visibility="{Binding VisibilityList, Mode=TwoWay}" Grid.Column="1"
ContextMenu="{Binding Path=FileListContextMenu,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:MediaResourcePanel}}}" >
<dxg:GridColumn FieldName="Name" Header="文件名" Width="100" />
<dxg:GridColumn FieldName="FileType" Header="类型" Width="100"/>
<dxg:GridColumn FieldName="Date" Header="日期" Width="130"/>
<dxg:GridColumn FieldName="FileSize" Header="大小" Width="130"/>
<!--#endregion-->
<dxg:GridControl.View>
<dxg:TableView AutoWidth="True" ShowGroupPanel="False" ShowVerticalLines="False" ShowHorizontalLines="False"
BorderThickness="0"
ShowFilterPanelMode="Never"
AllowColumnFiltering="False"
AllowSorting="False"
AllowEditing="False" >
</dxg:TableView>
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</UserControl>
VIZ.Package.Module/Resource/MediaResource/View/MediaResourcePanel.xaml.cs
......@@ -67,5 +67,27 @@ namespace VIZ.Package.Module
#endregion
#region FileListContex---文件列表右键菜单
/// <summary>
/// 文件列表右键菜单
/// </summary>
public ContextMenu FileListContextMenu
{
get { return (ContextMenu)GetValue(FileListContextMenuProperty); }
set { SetValue(FileListContextMenuProperty, value); }
}
/// <summary>
/// Using a DependencyProperty as the backing store for FileContextMenu. This enables animation, styling, binding, etc...
/// </summary>
public static readonly DependencyProperty FileListContextMenuProperty =
DependencyProperty.Register("FileListContextMenu", typeof(ContextMenu), typeof(MediaResourcePanel), new PropertyMetadata(null));
#endregion
}
}
VIZ.Package.Module/Resource/MediaResource/View/MediaResourceView.xaml
......@@ -26,9 +26,19 @@
<MenuItem Header="删除文件" Command="{Binding Path=PlacementTarget.DataContext.DeleteFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="移动文件" Command="{Binding Path=PlacementTarget.DataContext.MoveFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="导出素材" Command="{Binding Path=PlacementTarget.DataContext.ExportFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<!--<Separator/>-->
<Separator/>
<MenuItem Header="文件列表" Command="{Binding Path=PlacementTarget.DataContext.FilesListCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
</ContextMenu>
</local:MediaResourcePanel.FileContextMenu>
<local:MediaResourcePanel.FileListContextMenu>
<ContextMenu>
<MenuItem Header="名称排序" Command="{Binding Path=PlacementTarget.DataContext.SortFileNameCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="日期排序" Command="{Binding Path=PlacementTarget.DataContext.SortDateCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<Separator/>
<MenuItem Header="图片列表" Command="{Binding Path=PlacementTarget.DataContext.ShowImageListCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
</ContextMenu>
</local:MediaResourcePanel.FileListContextMenu>
</local:MediaResourcePanel>
......
VIZ.Package.Module/Resource/MediaResource/ViewModel/MediaResourcePanelViewModel.cs
......@@ -52,10 +52,14 @@ namespace VIZ.Package.Module
this.DeleteFileCommand = new VCommand(this.DeleteFile);
this.MoveFileCommand = new VCommand(this.MoveFile);
this.MoveFloderCommand = new VCommand(this.MoveFileFloder);
this.ExportFileCommand = new VCommand(this.ExprotFile);
this.ExportFolderFilesCommand = new VCommand(this.ExportFolderFiles);
this.FilesListCommand = new VCommand(this.FilesList);
this.ShowImageListCommand = new VCommand(this.ShowImageList);
this.SortFileNameCommand = new VCommand(this.SortFileName);
this.SortDateCommand = new VCommand(this.SortDate);
this.FolderExpandCommand = new VCommand<DevExpress.Xpf.Grid.TreeList.NodeDoubleClickEventArgs>(this.FolderExpand);
this.FileFilterCommand = new VCommand<ResourceFileType>(this.FileFilter);
......@@ -326,6 +330,29 @@ namespace VIZ.Package.Module
#endregion
#region ImageList可见性
private Visibility visibilityImage=Visibility.Visible;
public Visibility VisibilityImage
{
get { return visibilityImage; }
set { visibilityImage = value; this.RaisePropertyChanged(nameof(VisibilityImage)); }
}
#endregion
#region 文件列表
private Visibility visibilityList=Visibility.Hidden;
public Visibility VisibilityList
{
get { return visibilityList; }
set { visibilityList = value; this.RaisePropertyChanged(nameof(VisibilityList)); }
}
#endregion
#region 创建文件夹
public VCommand CreateFloderCommand { get; set; }
......@@ -576,6 +603,55 @@ namespace VIZ.Package.Module
}
#region 查看文件列表
public VCommand FilesListCommand { get; set; }
private void FilesList()
{
VisibilityImage = Visibility.Hidden;
VisibilityList = Visibility.Visible;
}
#endregion
#region 查看图片列表
public VCommand ShowImageListCommand { get; set; }
private void ShowImageList()
{
VisibilityImage = Visibility.Visible;
VisibilityList = Visibility.Hidden;
}
#endregion
#region 文件列表按照文件名排序
public VCommand SortFileNameCommand { get; set; }
private void SortFileName()
{
this.FileModels = this.FileModels.OrderBy(a=>a.Name).ToObservableCollection();
}
#endregion
#region 文件列表按照日期排序
public VCommand SortDateCommand { get; set; }
private void SortDate()
{
this.FileModels = this.FileModels.OrderBy(a=>Convert.ToDateTime(a.Date)).ToObservableCollection();
}
#endregion
/// <summary>
/// 导出文件夹的素材
......@@ -715,6 +791,8 @@ namespace VIZ.Package.Module
#endregion
#region FolderExpandCommand -- 文件夹展开命令
/// <summary>
......
VIZ.Package.Module/VIZ.Package.Module.csproj
......@@ -114,6 +114,7 @@
<DependentUpon>MainStatusView.xaml</DependentUpon>
</Compile>
<Compile Include="Plugin\Service\IPluginService.cs" />
<Compile Include="Resource\MediaResource\Controller\Model\ms.cs" />
<Compile Include="Resource\MediaResource\Core\MHResourceFileDoubleClickEventArgs.cs" />
<Compile Include="Resource\MediaResource\Core\MHResourceSelectedFileChangedEventArgs.cs" />
<Compile Include="Setting\Conn\View\ConnSettingView.xaml.cs">
......@@ -219,7 +220,6 @@
<Compile Include="Resource\MediaResource\Controller\MediaResourceFileService.cs" />
<Compile Include="Resource\MediaResource\Controller\Model\fileListResult.cs" />
<Compile Include="Resource\MediaResource\Controller\Model\fileUploadResult.cs" />
<Compile Include="Resource\MediaResource\Controller\Model\ms.cs" />
<Compile Include="Resource\MediaResource\Controller\ThumbnailHelper.cs" />
<Compile Include="Resource\MediaResource\MediaResourcePluginLifeCycle.cs" />
<Compile Include="Resource\MediaResource\ViewModel\CreateFolderViewModel.cs" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment