Skip to content

V
VIZ.Package
Commit 0130d458 by wangonghui
Options

媒体资源库图片bug处理

parent 133fe592
Showing with 39 additions and 32 deletions
VIZ.Package.Module/Resource/MediaResource/Controller/MediaResourceFileController.cs
...@@ -82,7 +82,7 @@ namespace VIZ.Package.Module ...@@ -82,7 +82,7 @@ namespace VIZ.Package.Module
GHFile.FileType = ResourceFileType.IMAGE; GHFile.FileType = ResourceFileType.IMAGE;
Image img = Bitmap.FromStream(fileResult); Image img = Bitmap.FromStream(fileResult);
img = ThumbnailHelper.GetThumbnail(img, 100, 100); img = ThumbnailHelper.GetThumbnail(img, img.Width/2, img.Height / 2);
Bitmap bmp = new Bitmap(img); Bitmap bmp = new Bitmap(img);
GHFile.ThumbnailBitmap = bmp; GHFile.ThumbnailBitmap = bmp;
list.Add(GHFile); list.Add(GHFile);
...@@ -94,7 +94,7 @@ namespace VIZ.Package.Module ...@@ -94,7 +94,7 @@ namespace VIZ.Package.Module
GHFile.Path = file.smallIconUrl; GHFile.Path = file.smallIconUrl;
string strVedioPath = string.Format("{0}{1}", System.Environment.CurrentDirectory, "\\Resource\\VedioImage\\Vedio.jpeg"); string strVedioPath = string.Format("{0}{1}", System.Environment.CurrentDirectory, "\\Resource\\VedioImage\\Vedio.jpeg");
Image vedioImage = Image.FromFile(strVedioPath); Image vedioImage = Image.FromFile(strVedioPath);
vedioImage = ThumbnailHelper.GetThumbnail(vedioImage, 100, 100); vedioImage = ThumbnailHelper.GetThumbnail(vedioImage, vedioImage.Width / 2, vedioImage.Height / 2);
Bitmap vedioBtm = new Bitmap(vedioImage); Bitmap vedioBtm = new Bitmap(vedioImage);
GHFile.ThumbnailBitmap = vedioBtm; GHFile.ThumbnailBitmap = vedioBtm;
GHFile.FileType = ResourceFileType.Video; GHFile.FileType = ResourceFileType.Video;
......
VIZ.Package.Module/Resource/MediaResource/Controller/ThumbnailHelper.cs
...@@ -55,7 +55,7 @@ namespace VIZ.Package.Module ...@@ -55,7 +55,7 @@ namespace VIZ.Package.Module
FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
Image result = Image.FromStream(fs); Image result = Image.FromStream(fs);
fs.Close(); fs.Close();
result = GetThumbnail(result, width, height); result = GetThumbnail(result, result.Width/2, result.Height / 2);
return result; return result;
} }
catch (Exception e) catch (Exception e)
......
VIZ.Package.Module/Resource/MediaResource/ViewModel/MediaResourcePanelViewModel.cs
...@@ -443,44 +443,50 @@ namespace VIZ.Package.Module ...@@ -443,44 +443,50 @@ namespace VIZ.Package.Module
System.Windows.Forms.OpenFileDialog ofd = new System.Windows.Forms.OpenFileDialog(); System.Windows.Forms.OpenFileDialog ofd = new System.Windows.Forms.OpenFileDialog();
ofd.Filter = ApplicationDomainEx.MediaConfig.MediaFilter; ofd.Filter = ApplicationDomainEx.MediaConfig.MediaFilter;
ofd.Multiselect = false; ofd.Multiselect = true;
if (ofd.ShowDialog() == System.Windows.Forms.DialogResult.OK) if (ofd.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{ {
string path = System.IO.Path.GetFullPath(ofd.FileName); string[] fileNames = ofd.FileNames;
string fileName = ThumbnailHelper.GetFileFolderName(path);
var fileResult = await this.mediaResourceFileController.CreateFile(path, fileName); foreach(var tempFileName in fileNames)
if (fileResult != null && fileResult.errCode == "0")
{ {
try string path = System.IO.Path.GetFullPath(tempFileName);
string fileName = ThumbnailHelper.GetFileFolderName(path);
var fileResult = await this.mediaResourceFileController.CreateFile(path, fileName);
if (fileResult != null && fileResult.errCode == "0")
{ {
MHResourceFileModel fileModel = new MHResourceFileModel(); try
if (ThumbnailHelper.IsImageByName(fileName))
{ {
Image image = ThumbnailHelper.GetImage(path, 100, 200); MHResourceFileModel fileModel = new MHResourceFileModel();
Bitmap btm = new Bitmap(image);
fileModel.ThumbnailBitmap = btm; if (ThumbnailHelper.IsImageByName(fileName))
fileModel.FileType = ResourceFileType.IMAGE; {
fileModel.Name = fileName; Image image = ThumbnailHelper.GetImage(path, 100, 200);
this.FileModels.Add(fileModel); Bitmap btm = new Bitmap(image);
fileModel.ThumbnailBitmap = btm;
fileModel.FileType = ResourceFileType.IMAGE;
fileModel.Name = fileName;
this.FileModels.Add(fileModel);
}
else if (ThumbnailHelper.IsVideo(fileName))
{
string vedioImage = string.Format("{0}{1}", System.Environment.CurrentDirectory, "\\Resource\\VedioImage\\Vedio.jpeg");
Image image = ThumbnailHelper.GetImage(vedioImage, 100, 200);
Bitmap btm = new Bitmap(image);
fileModel.ThumbnailBitmap = btm;
fileModel.FileType = ResourceFileType.Video;
fileModel.Name = fileName;
this.FileModels.Add(fileModel);
}
} }
else if (ThumbnailHelper.IsVideo(fileName)) catch (Exception ex)
{ {
string vedioImage = string.Format("{0}{1}", System.Environment.CurrentDirectory, "\\Resource\\VedioImage\\Vedio.jpeg"); log.Error(ex.Message);
Image image = ThumbnailHelper.GetImage(vedioImage, 100, 200);
Bitmap btm = new Bitmap(image);
fileModel.ThumbnailBitmap = btm;
fileModel.FileType = ResourceFileType.Video;
fileModel.Name = fileName;
this.FileModels.Add(fileModel);
} }
}
catch (Exception ex)
{
log.Error(ex.Message);
} }
} }
} }
} }
#endregion 创建文件 #endregion 创建文件
...@@ -491,6 +497,7 @@ namespace VIZ.Package.Module ...@@ -491,6 +497,7 @@ namespace VIZ.Package.Module
private async void DeleteFile() private async void DeleteFile()
{ {
if (selectedFileModel == null) return;
if ((DialogResult)DXMessageBox.Show("是否删除此文件", "", MessageBoxButton.OKCancel) == DialogResult.OK) if ((DialogResult)DXMessageBox.Show("是否删除此文件", "", MessageBoxButton.OKCancel) == DialogResult.OK)
{ {
......
VIZ.Package.Storage/Entity/Config/MediaConfigEntity.cs
...@@ -26,6 +26,6 @@ namespace VIZ.Package.Storage ...@@ -26,6 +26,6 @@ namespace VIZ.Package.Storage
/// <summary> /// <summary>
/// 媒体筛选 /// 媒体筛选
/// </summary> /// </summary>
public string MediaFilter { get; set; } = "(*.jpg,*.png,*.jpeg,*.bmp,*.gif,*.avi,*.mp4)|*.jgp;*.png;*.jpeg;*.bmp;*.gif;*.avi;*.mp4"; public string MediaFilter { get; set; } = "(*.jpg,*.png,*.jpeg,*.bmp,*.gif,*.avi,*.mp4)|*.jpg;*.png;*.jpeg;*.bmp;*.gif;*.avi;*.mp4";
} }
} }
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