Commit 0101c2ae by wangonghui

修改咪咕bug

parent 770885ca
...@@ -268,12 +268,28 @@ namespace VIZ.Package.Module ...@@ -268,12 +268,28 @@ namespace VIZ.Package.Module
} }
} }
//调用关闭消息
// ProjectCloseMessage closemsg = new ProjectCloseMessage();
//ApplicationDomainEx.MessageManager.Send(closemsg);
//this.UpdateCommandStatus();
// 创建项目文件 // 创建项目文件
SaveProjectWindow window = new SaveProjectWindow(); SaveProjectWindow window = new SaveProjectWindow();
window.ShowDialog(); window.ShowDialog();
if (window.DialogResult != true) if (window.DialogResult != true)
return; return;
//调用关闭消息
ProjectCloseMessage closemsg = new ProjectCloseMessage();
ApplicationDomainEx.MessageManager.Send(closemsg);
this.UpdateCommandStatus();
SaveProjectWindowModel vm = window.DataContext as SaveProjectWindowModel; SaveProjectWindowModel vm = window.DataContext as SaveProjectWindowModel;
if (vm == null) if (vm == null)
return; return;
...@@ -651,14 +667,14 @@ namespace VIZ.Package.Module ...@@ -651,14 +667,14 @@ namespace VIZ.Package.Module
{ {
string path; string path;
if (string.IsNullOrWhiteSpace(ApplicationDomainEx.VizConfig.PluginGroup)) //if (string.IsNullOrWhiteSpace(ApplicationDomainEx.VizConfig.PluginGroup))
{ //{
path = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "layout"); path = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "layout");
} // }
else //else
{ //{
path = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "layout", ApplicationDomainEx.VizConfig.PluginGroup); // path = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "layout", ApplicationDomainEx.VizConfig.PluginGroup);
} //}
return path; return path;
} }
......
...@@ -301,9 +301,12 @@ namespace VIZ.Package.Service ...@@ -301,9 +301,12 @@ namespace VIZ.Package.Service
dest.Save(ms, System.Drawing.Imaging.ImageFormat.Jpeg); dest.Save(ms, System.Drawing.Imaging.ImageFormat.Jpeg);
ms.Position = 0; ms.Position = 0;
if (ApplicationDomainEx.ProjectDbContext.SceneThumbnailCache != null)
{
ApplicationDomainEx.ProjectDbContext.SceneThumbnailCache.Upload(id, $"{id}", ms); ApplicationDomainEx.ProjectDbContext.SceneThumbnailCache.Upload(id, $"{id}", ms);
} }
} }
}
} }
catch (Exception ex) catch (Exception ex)
......
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