对viz4支持

VIZ.TVP.Domain/ApplicationDomainEx.cs

@@ -41,6 +41,11 @@ namespace VIZ.TVP.Domain
         public static SelectionManager SelectionManager { get; private set; } = new SelectionManager();
         public static SelectionManager SelectionManager { get; private set; } = new SelectionManager();
 
 
         /// <summary>
         /// <summary>
+        /// 本地VIZ渲染器管理器
+        /// </summary>
+        public static LocalVizManager LocalVizManager { get; private set; } = new LocalVizManager();
+
+        /// <summary>
         /// 当前项目领域
         /// 当前项目领域
         /// </summary>
         /// </summary>
         public static ProjectDomain CurrentProjectDomain { get; set; }
         public static ProjectDomain CurrentProjectDomain { get; set; }

VIZ.TVP.Domain/Manager/LocalVizManager.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VIZ.TVP.Domain
+{
+    /// <summary>
+    /// 本地VIZ管理器
+    /// </summary>
+    public class LocalVizManager
+    {
+        /// <summary>
+        /// VIZ渲染器名字
+        /// </summary>
+        public string VizRendererName { get; set; }
+    }
+}

VIZ.TVP.Domain/VIZ.TVP.Domain.csproj

@@ -75,6 +75,7 @@
     <Compile Include="Enum\PluginIDs.cs" />
     <Compile Include="Enum\PluginIDs.cs" />
     <Compile Include="Enum\ServiceKeys.cs" />
     <Compile Include="Enum\ServiceKeys.cs" />
     <Compile Include="Manager\DataBaseManager.cs" />
     <Compile Include="Manager\DataBaseManager.cs" />
+    <Compile Include="Manager\LocalVizManager.cs" />
     <Compile Include="Manager\PluginManager.cs" />
     <Compile Include="Manager\PluginManager.cs" />
     <Compile Include="Manager\SelectionManager.cs" />
     <Compile Include="Manager\SelectionManager.cs" />
     <Compile Include="Manager\TVPConnectionManager.cs" />
     <Compile Include="Manager\TVPConnectionManager.cs" />

VIZ.TVP.Module/VizRender/Controller/VizController/VizController.cs

 using DevExpress.Mvvm.Native;
 using DevExpress.Mvvm.Native;
+using DevExpress.Printing.StreamingPagination;
 using log4net;
 using log4net;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
@@ -51,8 +52,6 @@ namespace VIZ.TVP.Module
         /// <param name="connectionModel">连接模型</param>
         /// <param name="connectionModel">连接模型</param>
         public void StartVizEngine(VizRenderView view, string path, TVPConnectionModel connectionModel)
         public void StartVizEngine(VizRenderView view, string path, TVPConnectionModel connectionModel)
         {
         {
-            LocalInfoEntity info = ApplicationDomainEx.DataBaseManager.LocalInfo;
-
             this.Support.IsEngineReady = false;
             this.Support.IsEngineReady = false;
 
 
             var dpi = WPFHelper.GetDpiByGraphics();
             var dpi = WPFHelper.GetDpiByGraphics();
@@ -66,6 +65,8 @@ namespace VIZ.TVP.Module
 
 
             ThreadHelper.SafeRun(() =>
             ThreadHelper.SafeRun(() =>
             {
             {
+                LocalInfoEntity info = ApplicationDomainEx.DataBaseManager.LocalInfo;
+
                 // Step 1. 启动进程
                 // Step 1. 启动进程
                 this.VizProcess = new Process();
                 this.VizProcess = new Process();
                 this.VizProcess.StartInfo.WorkingDirectory = System.IO.Path.GetDirectoryName(path);
                 this.VizProcess.StartInfo.WorkingDirectory = System.IO.Path.GetDirectoryName(path);
@@ -99,8 +100,18 @@ namespace VIZ.TVP.Module
                 {
                 {
                     System.Threading.Thread.Sleep(1000);
                     System.Threading.Thread.Sleep(1000);
 
 
-                    string cmd = $"RENDERER WINDOW_OPEN_ON_PARENT 0x{hWnd.ToString("X6")} {width} {height} ONAIR";
-                    connectionModel.EndpointManager.Send(cmd);
+                    if (info.LocalEngineType == LocalEngineType.Eng3)
+                    {
+                        string cmd = $"RENDERER WINDOW_OPEN_ON_PARENT 0x{hWnd.ToString("X6")} {width} {height} ONAIR";
+                        connectionModel.EndpointManager.Send(cmd);
+                    }
+                    else if (info.LocalEngineType == LocalEngineType.Eng4)
+                    {
+                        // 创建 EDITOR
+                        ApplicationDomainEx.LocalVizManager.VizRendererName = connectionModel.EndpointManager.Request("EDITOR CREATE RENDERER");
+                        string cmd = $"{ApplicationDomainEx.LocalVizManager.VizRendererName} WINDOW_OPEN_ON_PARENT 0x{hWnd.ToString("X6")} {width} {height} ONAIR";
+                        connectionModel.EndpointManager.Send(cmd);
+                    }
 
 
                     WPFHelper.Invoke(() =>
                     WPFHelper.Invoke(() =>
                     {
                     {

VIZ.TVP.Module/VizRender/ViewModel/VizRenderViewModel.cs

@@ -157,6 +157,7 @@ namespace VIZ.TVP.Module
         /// </summary>
         /// </summary>
         private void WindowHostSizeChanged(System.Windows.SizeChangedEventArgs e)
         private void WindowHostSizeChanged(System.Windows.SizeChangedEventArgs e)
         {
         {
+            LocalInfoEntity info = ApplicationDomainEx.DataBaseManager.LocalInfo;
             TVPConnectionModel local = ApplicationDomainEx.TVPConnectionManager.LocalConnection;
             TVPConnectionModel local = ApplicationDomainEx.TVPConnectionManager.LocalConnection;
 
 
             if (local == null || !local.IsConnected)
             if (local == null || !local.IsConnected)
@@ -169,7 +170,14 @@ namespace VIZ.TVP.Module
 
 
             ImageHelper.AdjustSize(width, height, 1920, 1080, out width, out height);
             ImageHelper.AdjustSize(width, height, 1920, 1080, out width, out height);
 
 
-            local.EndpointManager.Send($"RENDERER WINDOW_RESIZE {width} {height}");
+            if (info.LocalEngineType == LocalEngineType.Eng3)
+            {
+                local.EndpointManager.Send($"RENDERER WINDOW_RESIZE {width} {height}");
+            }
+            else
+            {
+                local.EndpointManager.Send($"{ApplicationDomainEx.LocalVizManager.VizRendererName} WINDOW_RESIZE {width} {height}");
+            }
         }
         }
 
 
         #endregion
         #endregion