7

web/public/static/js/main_2020_show.js

@@ -205,9 +205,15 @@ window.switchVideoSrc = function(src){
 var backToOriginVideo = function(ifPause){ 
     
     var video = leftScreen.material.map.image 
+    
+    if(video.src == leftScreen.originVideoSrc)return;
+    
+    
     video.src = leftScreen.originVideoSrc
     video.loop = true 
     video.currentTime = 0
+    setTimeout(()=>{video.paused && (video.currentTime = 0)},200)//防止停在上一个视频
+    
     
     rightScreen.material.map = rightScreen.originVideoMap
     rightScreen.originVideoMap.image.currentTime = 0 
@@ -18367,14 +18373,7 @@ window.Modernizr = function(n, e, t) {
                     } 
                     
                 })  
-                video.oncanplaythrough = function() {
-                    if(video.shouldPlay){
-                        video.play()
-                    }else{
-                        video.currentTime = 0 //防止停在上一个视频
-                        leftScreen.material.map.needsUpdate = !0
-                    }
-                }
+                
                 
                 //////////历史影像左右两侧    
                 c = player.overlayGroup.children.find(e=>e.sid == '1626743604266') 

web/public/static/js/overlay.js

@@ -72,8 +72,9 @@ var initOverlay = function(THREE) {
                 video.src = manage.dealURL(info.file);
                 
                 video.oncanplaythrough = function() {
+                    console.log(info.sid + "  oncanplaythrough " + video.readyState) 
                     plane.material.map.needsUpdate = !0
-                    if(video.shouldPlay){
+                    if(video.shouldPlay){ 
                         video.play()
                     }
                 }
@@ -310,7 +311,7 @@ var initOverlay = function(THREE) {
             }
                
             if(state == 'stop'){
-                video.currentTime = 0; 
+                video.currentTime = 0; //需要至少触发两次，保证停在第一帧画面，否则是黑屏
             }
             video.shouldPlay = false
             //console.log("pause")