xzw il y a 4 ans
Parent
commit
7db602aacf

+ 3 - 0
web/public/static/css/main.css

@@ -7082,6 +7082,9 @@ a.hasHover.tag-link:hover {
 }    
 
 
+#menudiv{
+    
+}
 
 #menudiv>div>div{  
     width:1000px; 

Fichier diff supprimé car celui-ci est trop grand
+ 62 - 25
web/public/static/js/main_2020_show.js


+ 18 - 7
web/public/static/js/overlay.js

@@ -60,7 +60,7 @@ var initOverlay = function(THREE) {
         if (info.media) {
             if (info.media.includes('video')) { 
                 //var id = "video"+ this.sid    id="${ id }"
-                var video = $(`<video  controls="controls" loop autoplay x5-playsinline="" webkit-playsinline="true" playsinline="true" controlslist="nodownload"></video>`)[0]
+                var video = $(`<video  controls="controls" loop  x5-playsinline="" webkit-playsinline="true" playsinline="true" controlslist="nodownload"></video>`)[0]
                  
                 video.setAttribute("crossOrigin", 'Anonymous')
                 //要在src设置好前解决跨域
@@ -76,9 +76,16 @@ var initOverlay = function(THREE) {
                 /* video.addEventListener('loadeddata', ()=>{
                     console.log(this.sid + " loaded!!!")
                 }) */
-                video.volume = 0
-                video.muted = true
+                
+                
+                /* video.volume = 0
+                video.muted = true */
                 plane.material.opacity = 1;
+                
+                
+                video.currentTime = 0
+                
+                
             } else if (info.media.includes('photo')) {
                 /* var img = new Image();
                  
@@ -233,8 +240,13 @@ var initOverlay = function(THREE) {
     
     Overlay.prototype.updateVisibles = function(panos) {
         this.visible = !!panos.find(pano=>this.visiblePanos.includes(pano))
-        if (!this.visible && this.overlayType == 'video')
-            this.videoControl('stop')
+        
+        if(this.overlayType == 'video'){
+            this.visible ? this.videoControl("play") : this.videoControl('stop')
+        }
+        
+         
+            
     }
     
     
@@ -251,8 +263,7 @@ var initOverlay = function(THREE) {
         if(!state || state == 'stop'){
             this.plane.material.map.image.paused || this.plane.material.map.image.pause()
             if(state == 'stop'){
-                this.plane.material.map.image.currentTime = 0;
-               
+                this.plane.material.map.image.currentTime = 0; 
             }
             //console.log("pause")
         }else if(state){