Skip to content

V
VIZ.Package
Commit cf62a529 by liulongfei
Options

Merge branch 'master' of http://49.233.21.66/liulongfei/VIZ.Package

parents dbb39925 978118c3
Showing with 54 additions and 24 deletions
VIZ.Package.Module/Resource/MediaResource/Controller/MediaResourceFileController.cs
...@@ -60,13 +60,12 @@ namespace VIZ.Package.Module ...@@ -60,13 +60,12 @@ namespace VIZ.Package.Module
WPFHelper.BeginInvoke(async () => WPFHelper.BeginInvoke(async () =>
{ {
try
{
string header = string.Format("{0}GetListFile?filePath={1}", ApplicationDomainEx.MediaConfig.Url, folder.Path); string header = string.Format("{0}GetListFile?filePath={1}", ApplicationDomainEx.MediaConfig.Url, folder.Path);
var FileResult = await MediaResourceFileService.PostObjectAsync<fileListResult, string>(header, ""); var FileResult = await MediaResourceFileService.PostObjectAsync<fileListResult, string>(header, "");
List<MHResourceFileModel> list = new List<MHResourceFileModel>(); List<MHResourceFileModel> list = new List<MHResourceFileModel>();
// folder.Files = new System.Collections.ObjectModel.ObservableCollection<GHResourceFileModel>(); // folder.Files = new System.Collections.ObjectModel.ObservableCollection<GHResourceFileModel>();
foreach (var file in FileResult.masterData) foreach (var file in FileResult.masterData)
{ {
try try
...@@ -82,7 +81,7 @@ namespace VIZ.Package.Module ...@@ -82,7 +81,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, img.Width/2, img.Height / 2); 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);
...@@ -111,6 +110,11 @@ namespace VIZ.Package.Module ...@@ -111,6 +110,11 @@ namespace VIZ.Package.Module
folder.Files = list.ToObservableCollection(); folder.Files = list.ToObservableCollection();
this.Support.FileModels = folder.Files; this.Support.FileModels = folder.Files;
}
catch(Exception ex)
{
log.Error(ex.Message);
}
}); });
} }
......
VIZ.Package.Module/Resource/MediaResource/ViewModel/MediaResourcePanelViewModel.cs
...@@ -448,43 +448,69 @@ namespace VIZ.Package.Module ...@@ -448,43 +448,69 @@ namespace VIZ.Package.Module
{ {
string[] fileNames = ofd.FileNames; string[] fileNames = ofd.FileNames;
bool flag = false;
foreach(var tempFileName in fileNames) foreach(var tempFileName in fileNames)
{ {
string path = System.IO.Path.GetFullPath(tempFileName); string path = System.IO.Path.GetFullPath(tempFileName);
string fileName = ThumbnailHelper.GetFileFolderName(path); string fileName = ThumbnailHelper.GetFileFolderName(path);
var fileResult = await this.mediaResourceFileController.CreateFile(path, fileName);
if (fileResult != null && fileResult.errCode == "0")
{
try try
{ {
MHResourceFileModel fileModel = new MHResourceFileModel();
if (ThumbnailHelper.IsImageByName(fileName)) var fileResult = await this.mediaResourceFileController.CreateFile(path, fileName);
if (fileResult != null && fileResult.errCode == "0")
{ {
Image image = ThumbnailHelper.GetImage(path, 100, 200); flag = true;
Bitmap btm = new Bitmap(image);
fileModel.ThumbnailBitmap = btm;
fileModel.FileType = ResourceFileType.IMAGE;
fileModel.Name = fileName;
this.FileModels.Add(fileModel);
} }
else if (ThumbnailHelper.IsVideo(fileName)) else
{ {
string vedioImage = string.Format("{0}{1}", System.Environment.CurrentDirectory, "\\Resource\\VedioImage\\Vedio.jpeg"); flag = false;
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) catch (Exception ex)
{ {
log.Error(ex.Message); log.Error(ex.Message);
} }
//if (fileResult != null && fileResult.errCode == "0")
//{
//try
//{
// //MHResourceFileModel fileModel = new MHResourceFileModel();
//if (ThumbnailHelper.IsImageByName(fileName))
//{
// Image image = ThumbnailHelper.GetImage(path, 100, 200);
// 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);
//}
// }
//catch (Exception ex)
//{
// log.Error(ex.Message);
//}
// }
} }
if(flag)
{
if(this.SelectedFolderModel!=null)
{
this.mediaResourceFileController.UpdateFileModels(this.SelectedFolderModel);
}
} }
} }
......
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