····

web/public/static/js/main_2020_show.js

@@ -132,11 +132,20 @@ var updateMenuVisi = function(toPano, dur){
  
  
 window.switchVideoSrc = function(src){ 
-    player.overlayGroup.children.forEach(e=>{
-        if(e.sid == '1626674966708' || e.sid == '1626675083157'){
-            e.plane.material.map.image.src = src
-        }
-    }) 
+    
+    var a = player.overlayGroup.children.find(e=>e.sid == '1626674966708') 
+     
+    var b = player.overlayGroup.children.find(e=>e.sid == '1626675083157') 
+    
+    b.originVideoMap.image.pause()
+    b.material.map = a.material.map;
+    
+    a.material.map.src = src
+    
+    
+    var video = a.material.map.image
+    video.loop = false 
+     
 }
  
  
@@ -18022,17 +18031,54 @@ window.Modernizr = function(n, e, t) {
 
             n.prototype.loadOverlays = function(overlays){
                 var overlays = window.data2 && window.data2.overlays  
-                  
                 
-                overlays && overlays.forEach((info)=>{ 
                 
-                    /* if(info.sid == '1626674966708' || info.sid == '1626675083157'){
-                        info.file = '';//共同src
-                    } */
+                var c = overlays.find(e=>e.sid == '1626743604266') 
+                var d = overlays.find(e=>e.sid == '1626743691935')  
+
+                d.file = c.file;
+
+                
                 
-                    new Overlay(info)  
+                overlays && overlays.forEach((info)=>{ 
+                  
+                    var overlay = new Overlay(info) 
+  
+                    if(info.sid == '1626674966708' || info.sid == '1626675083157'){
+                        overlay.originVideoSrc = overlay.plane.material.map.image.src; 
+                        
+                    }  
+                    
                 })
                 
+                //三大会议
+                var a = player.overlayGroup.children.find(e=>e.sid == '1626674966708')  
+                var b = player.overlayGroup.children.find(e=>e.sid == '1626675083157') 
+                b.originVideoMap = b.plane.material.map;                
+                
+                var video = a.plane.material.map.image
+                video.addEventListener('ended', ()=>{
+                    console.log( " ended!!!")
+                    
+                    if(video.src != overlay.originVideoSrc){//播放完之后换为原来的视频
+                        video.src = overlay.originVideoSrc
+                        video.loop = true 
+                        b.plane.material.map = b.originVideoMap
+                        video.play();
+                        b.originVideoMap.image.currentTime = 0
+                        b.originVideoMap.image.play()
+                    } 
+                    
+                })  
+
+                
+                //////////历史影像左右两侧    
+                c = player.overlayGroup.children.find(e=>e.sid == '1626743604266') 
+                d = player.overlayGroup.children.find(e=>e.sid == '1626743691935') 
+                d.plane.material = c.plane.material;//同步视频
+                
+                
+                
                 
                 Overlay.load()
             }