Commit eb4161eb by wangonghui

咪咕现场问题修改

parent 2bd1108b
...@@ -47,15 +47,19 @@ namespace VIZ.Package.Module ...@@ -47,15 +47,19 @@ namespace VIZ.Package.Module
this.vizCommandService.SetEnabledUpdate(conn, false); this.vizCommandService.SetEnabledUpdate(conn, false);
try try
{ {
// 清楚板子上的信息 //调整上包装顺序
this.vizCommandService.SetCue(conn, ApplicationDomainEx.CurrentPage.ScenePath);
this.vizCommandService.SetObject(conn, ApplicationDomainEx.CurrentPage.ScenePath, ApplicationDomainEx.CurrentPage.Layer);
if (obj != null) if (obj != null)
{ {
this.vizCommandControlObjectService.SetControlObject(conn, obj, newPageBase.GetVizScene()); this.vizCommandControlObjectService.SetControlObject(conn, obj, newPageBase.GetVizScene());
this.vizCommandControlObjectService.SetCustomControlFieldValue(conn, obj.AllFiledNodes); this.vizCommandControlObjectService.SetCustomControlFieldValue(conn, obj.AllFiledNodes);
} }
// 清楚板子上的信息
this.vizCommandService.SetCue(conn, ApplicationDomainEx.CurrentPage.ScenePath);
this.vizCommandService.SetObject(conn, ApplicationDomainEx.CurrentPage.ScenePath, ApplicationDomainEx.CurrentPage.Layer);
if (view != null) if (view != null)
{ {
view.TakIn(conn); view.TakIn(conn);
...@@ -65,8 +69,10 @@ namespace VIZ.Package.Module ...@@ -65,8 +69,10 @@ namespace VIZ.Package.Module
{ {
log.Error(ex); log.Error(ex);
} }
this.vizCommandService.SetEnabledUpdate(conn, true);
this.vizCommandService.Start(conn, ApplicationDomainEx.CurrentPage.Layer, ApplicationDomainEx.CurrentPage.ScenePath); this.vizCommandService.Start(conn, ApplicationDomainEx.CurrentPage.Layer, ApplicationDomainEx.CurrentPage.ScenePath);
this.vizCommandService.SetEnabledUpdate(conn, true);
} }
/// <summary> /// <summary>
......
...@@ -60,6 +60,12 @@ namespace VIZ.Package.Module ...@@ -60,6 +60,12 @@ namespace VIZ.Package.Module
/// </summary> /// </summary>
private VizCommandControlObjectService vizCommandControlObjectService = new VizCommandControlObjectService(); private VizCommandControlObjectService vizCommandControlObjectService = new VizCommandControlObjectService();
/// <summary>
/// Viz命令服务
/// </summary>
private VizCommandService vizCommandService = new VizCommandService();
/// <summary> /// <summary>
/// 控制对象服务 /// 控制对象服务
/// </summary> /// </summary>
...@@ -176,6 +182,9 @@ namespace VIZ.Package.Module ...@@ -176,6 +182,9 @@ namespace VIZ.Package.Module
// 将当前值上至预览 // 将当前值上至预览
this.vizCommandControlObjectService.SetControlObject(ApplicationDomainEx.PreviewConn, this.ControlObject, ApplicationDomainEx.CurrentPage.GetVizScene()); this.vizCommandControlObjectService.SetControlObject(ApplicationDomainEx.PreviewConn, this.ControlObject, ApplicationDomainEx.CurrentPage.GetVizScene());
// this.vizCommandService.SetObject(ApplicationDomainEx.PreviewConn, msg.Page.ScenePath, msg.Page.Layer);
// 插件处理 // 插件处理
PageModel pageModel = msg.Page as PageModel; PageModel pageModel = msg.Page as PageModel;
if (pageModel == null || string.IsNullOrWhiteSpace(pageModel.PluginID)) if (pageModel == null || string.IsNullOrWhiteSpace(pageModel.PluginID))
......
...@@ -592,7 +592,12 @@ namespace VIZ.Package.Module ...@@ -592,7 +592,12 @@ namespace VIZ.Package.Module
message.Page = msg.Page; message.Page = msg.Page;
ApplicationDomainEx.MessageManager.Send(message); ApplicationDomainEx.MessageManager.Send(message);
}); });
}); });
} }
......
...@@ -359,7 +359,11 @@ namespace VIZ.Package.Service ...@@ -359,7 +359,11 @@ namespace VIZ.Package.Service
public void SetControlObject(ConnModel conn, ControlObjectModel obj, VizScene scene) public void SetControlObject(ConnModel conn, ControlObjectModel obj, VizScene scene)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.Append($"{scene}*TREE*{obj.TreeNodePath}*FUNCTION*ControlObject*in SET ON "); // sb.Append($"{scene}*TREE*{obj.TreeNodePath}*FUNCTION*ControlObject*in SET ON ");
sb.Append($"SCENE*{ApplicationDomainEx.CurrentPage.ScenePath}*TREE*{obj.TreeNodePath}*FUNCTION*ControlObject*in SET ON ");
foreach (ControlFieldNodeModel field in obj.AllFiledNodes) foreach (ControlFieldNodeModel field in obj.AllFiledNodes)
{ {
// 自定义字段不通过该方法上板 // 自定义字段不通过该方法上板
......
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