调整启动策略

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

@@ -51,6 +51,8 @@ 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();
@@ -68,9 +70,19 @@ namespace VIZ.TVP.Module
                 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);
                 this.VizProcess.StartInfo.FileName = System.IO.Path.GetFileName(path);
                 this.VizProcess.StartInfo.FileName = System.IO.Path.GetFileName(path);
-                // " -o -P -db Guest:@localhost/VizDbServer:19396"
+                //VIZ3:  " -o -P -db Guest:@localhost/VizDbServer:19396"
+                //VIZ4:  "-u1 -n -M -e Guest:@localhost/VizDbServer:19396"
                 LocalInfoEntity loginInfo = ApplicationDomainEx.DataBaseManager.LocalInfo;
                 LocalInfoEntity loginInfo = ApplicationDomainEx.DataBaseManager.LocalInfo;
-                this.VizProcess.StartInfo.Arguments = $" -o -P -db {loginInfo.VIZ_UserName}:@{loginInfo.VIZ_IP}/{loginInfo.GH_ServerName}:{loginInfo.GH_Port}";
+
+                if (info.LocalEngineType == LocalEngineType.Eng3)
+                {
+                    this.VizProcess.StartInfo.Arguments = $" -o -P -db {loginInfo.VIZ_UserName}:@{loginInfo.VIZ_IP}/{loginInfo.GH_ServerName}:{loginInfo.GH_Port}";
+                }
+                if (info.LocalEngineType == LocalEngineType.Eng4)
+                {
+                    this.VizProcess.StartInfo.Arguments = $" -u1 -n -M -e {loginInfo.VIZ_UserName}:@{loginInfo.VIZ_IP}/{loginInfo.GH_ServerName}:{loginInfo.GH_Port}";
+                }
+
                 this.VizProcess.StartInfo.UseShellExecute = true;
                 this.VizProcess.StartInfo.UseShellExecute = true;
                 this.VizProcess.StartInfo.WindowStyle = ProcessWindowStyle.Normal;
                 this.VizProcess.StartInfo.WindowStyle = ProcessWindowStyle.Normal;
                 this.VizProcess.Start();
                 this.VizProcess.Start();

VIZ.TVP.Service/Program/Implementation/ProgramService.cs

@@ -83,6 +83,7 @@ namespace VIZ.TVP.Service
             {
             {
                 ProgramListItemModel model = new ProgramListItemModel(entity);
                 ProgramListItemModel model = new ProgramListItemModel(entity);
                 model.PropertyFromEntity();
                 model.PropertyFromEntity();
+                model.PluginName = ApplicationDomainEx.PluginManager.TemplatePlugins.FirstOrDefault(p => p.ID == model.PluginID)?.DisplayName;
 
 
                 if (!dic.TryGetValue(model.ListID, out ProgramListModel owner))
                 if (!dic.TryGetValue(model.ListID, out ProgramListModel owner))
                     continue;
                     continue;

VIZ.TVP.Service/VIZ.TVP.Service.csproj

@@ -93,6 +93,10 @@
       <Project>{28661e82-c86a-4611-a028-c34f6ac85c97}</Project>
       <Project>{28661e82-c86a-4611-a028-c34f6ac85c97}</Project>
       <Name>VIZ.Framework.Domain</Name>
       <Name>VIZ.Framework.Domain</Name>
     </ProjectReference>
     </ProjectReference>
+    <ProjectReference Include="..\..\VIZ.Framework\Viz.Framework.Plugin\VIZ.Framework.Plugin.csproj">
+      <Project>{39a3cdbe-2132-4c71-bf2f-f99a9e966109}</Project>
+      <Name>VIZ.Framework.Plugin</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\VIZ.Framework\VIZ.Framework.Storage\VIZ.Framework.Storage.csproj">
     <ProjectReference Include="..\..\VIZ.Framework\VIZ.Framework.Storage\VIZ.Framework.Storage.csproj">
       <Project>{06b80c09-343d-4bb2-aeb1-61cfbfbf5cad}</Project>
       <Project>{06b80c09-343d-4bb2-aeb1-61cfbfbf5cad}</Project>
       <Name>VIZ.Framework.Storage</Name>
       <Name>VIZ.Framework.Storage</Name>
@@ -101,6 +105,10 @@
       <Project>{65425cb5-7465-4e36-86a7-416341c8793c}</Project>
       <Project>{65425cb5-7465-4e36-86a7-416341c8793c}</Project>
       <Name>VIZ.TVP.Domain</Name>
       <Name>VIZ.TVP.Domain</Name>
     </ProjectReference>
     </ProjectReference>
+    <ProjectReference Include="..\VIZ.TVP.Plugin\VIZ.TVP.Plugin.csproj">
+      <Project>{75b858df-c0ac-4b56-b109-5c21317af0ce}</Project>
+      <Name>VIZ.TVP.Plugin</Name>
+    </ProjectReference>
     <ProjectReference Include="..\VIZ.TVP.Storage\VIZ.TVP.Storage.csproj">
     <ProjectReference Include="..\VIZ.TVP.Storage\VIZ.TVP.Storage.csproj">
       <Project>{d9e0c48d-d7e7-4207-a999-2fded536d4da}</Project>
       <Project>{d9e0c48d-d7e7-4207-a999-2fded536d4da}</Project>
       <Name>VIZ.TVP.Storage</Name>
       <Name>VIZ.TVP.Storage</Name>