提交修改咪咕Bug

VIZ.Package.Module/Control/Controller/ControlController.cs

@@ -49,7 +49,7 @@ namespace VIZ.Package.Module
             {
             {
            
            
                 //调整上包装顺序
                 //调整上包装顺序
-                if (obj != null&&view==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);
@@ -58,16 +58,25 @@ namespace VIZ.Package.Module
 
 
                 // 清楚板子上的信息
                 // 清楚板子上的信息
                 this.vizCommandService.SetCue(conn, ApplicationDomainEx.CurrentPage.ScenePath);
                 this.vizCommandService.SetCue(conn, ApplicationDomainEx.CurrentPage.ScenePath);
-                this.vizCommandService.Start(conn, ApplicationDomainEx.CurrentPage.Layer, ApplicationDomainEx.CurrentPage.ScenePath);
+
+                if (view == null)
+                {
+                    this.vizCommandService.Start(conn, ApplicationDomainEx.CurrentPage.Layer, ApplicationDomainEx.CurrentPage.ScenePath);
+                }
 
 
                 //开始动画
                 //开始动画
                 // 设置SetObject 东西
                 // 设置SetObject 东西
-                this.vizCommandService.SetObject(conn, ApplicationDomainEx.CurrentPage.ScenePath, ApplicationDomainEx.CurrentPage.Layer);
+                //if (view == null)
+                //{
+                    this.vizCommandService.SetObject(conn, ApplicationDomainEx.CurrentPage.ScenePath, ApplicationDomainEx.CurrentPage.Layer);
+               // }
 
 
                 //更新板子的值的值
                 //更新板子的值的值
                 if (view != null)
                 if (view != null)
                 {
                 {
+                    //this.vizCommandService.Start(conn, null, ApplicationDomainEx.CurrentPage.Layer);
                     view.TakIn(conn);
                     view.TakIn(conn);
+                    this.vizCommandService.Start(conn, ApplicationDomainEx.CurrentPage.Layer, ApplicationDomainEx.CurrentPage.ScenePath);
                 }
                 }
             }
             }
             catch (Exception ex)
             catch (Exception ex)

VIZ.Package.Service/DB/ControlObject/ControlObjectService.cs

@@ -49,7 +49,7 @@ namespace VIZ.Package.Service
                 list.Add(entity);
                 list.Add(entity);
             }
             }
 
 
-            ApplicationDomainEx.ProjectDbContext.ControlField.Insert(list);
+            ApplicationDomainEx.ProjectDbContext.ControlField.Upsert(list);
         }
         }
 
 
         /// <summary>
         /// <summary>

VIZ.Package.Service/Viz/VizCommandService.cs

@@ -26,11 +26,50 @@ namespace VIZ.Package.Service
 
 
             if (string.IsNullOrWhiteSpace(scene))
             if (string.IsNullOrWhiteSpace(scene))
                 throw new ArgumentNullException(nameof(scene));
                 throw new ArgumentNullException(nameof(scene));
-
+           
             conn.EndpointManager.Request($"RENDERER*{layer} SET_OBJECT SCENE*{scene}");
             conn.EndpointManager.Request($"RENDERER*{layer} SET_OBJECT SCENE*{scene}");
         }
         }
 
 
         /// <summary>
         /// <summary>
+        /// 设置重新加载
+        /// </summary>
+        /// <param name="conn"></param>
+        /// <param name="scene"></param>
+        /// <param name="layer"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public void SetReloadTeampleExist(ConnModel conn, string scene, VizLayer layer)
+        {
+            if (conn == null)
+                throw new ArgumentNullException(nameof(conn));
+
+            if (string.IsNullOrWhiteSpace(scene))
+                throw new ArgumentNullException(nameof(scene));
+
+            conn.EndpointManager.Request($"SCENE*{scene} EXIST");
+        }
+
+
+        /// <summary>
+        /// 设置模板的重新加载
+        /// </summary>
+        /// <param name="conn"></param>
+        /// <param name="scene"></param>
+        /// <param name="layer"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public void SetReloadTeample(ConnModel conn, string scene, VizLayer layer)
+        {
+            if (conn == null)
+                throw new ArgumentNullException(nameof(conn));
+
+            if (string.IsNullOrWhiteSpace(scene))
+                throw new ArgumentNullException(nameof(scene));
+
+            conn.EndpointManager.Request($"SCENE*{scene} RELOAD");
+        }
+
+        
+
+        /// <summary>
         /// /清楚板子信息 根据trio CUE来的 
         /// /清楚板子信息 根据trio CUE来的 
         /// </summary>
         /// </summary>
         /// <param name="conn"></param>
         /// <param name="conn"></param>

VIZ.Package.Service/Viz/VizControlObjectDownloadService.cs

@@ -78,9 +78,12 @@ namespace VIZ.Package.Service
         {
         {
             if (pageBase == null)
             if (pageBase == null)
                 return;
                 return;
-
+            //判断是否存在
+            this.vizCommandService.SetReloadTeampleExist(ApplicationDomainEx.PreviewConn, pageBase.ScenePath, pageBase.Layer);
             // 切换场景
             // 切换场景
             this.vizCommandService.SetObject(ApplicationDomainEx.PreviewConn, pageBase.ScenePath, pageBase.Layer);
             this.vizCommandService.SetObject(ApplicationDomainEx.PreviewConn, pageBase.ScenePath, pageBase.Layer);
+            //更新模板
+            this.vizCommandService.SetReloadTeample(ApplicationDomainEx.PreviewConn, pageBase.ScenePath, pageBase.Layer);
 
 
             // 获取场景缩略图
             // 获取场景缩略图
             pageBase.ThumbnailBitmap = this.vizCommandService.GetSceneImage(ApplicationDomainEx.PreviewConn, pageBase.ScenePath);
             pageBase.ThumbnailBitmap = this.vizCommandService.GetSceneImage(ApplicationDomainEx.PreviewConn, pageBase.ScenePath);