fix: 1

public/lib/potree/potree.js

@@ -33631,7 +33631,7 @@
 	      if (e.clickElement || Potree.settings.unableNavigate || this.flying || !e.isTouch && e.button != MOUSE.LEFT || e.drag && e.drag.object //拖拽结束时不算
 	      /*  || Potree.settings.editType == 'pano' && viewer.modules.PanoEditor.entered */
 	      //||   Potree.settings.editType == 'merge' && !e.intersectPoint || viewer.inputHandler.hoveredElements[0] && viewer.inputHandler.hoveredElements[0].isModel && e.intersectPoint.distance > viewer.inputHandler.hoveredElements[0].distance
-	      || Potree.settings.editType == 'merge' && !Potree.settings.mergeType2 || Potree.settings.editType == 'merge' && (_e$intersect = e.intersect) !== null && _e$intersect !== void 0 && _e$intersect.object && !e.intersect.object.is4dkkModel
+	      || Potree.settings.editType == 'merge' && !Potree.settings.mergeType2 || Potree.settings.editType == 'merge' && (_e$intersect = e.intersect) !== null && _e$intersect !== void 0 && _e$intersect.object && !e.intersect.object.is4dkkModel //支持全景模式下点击非场景模型
 	      //|| Potree.settings.mergeType2 && Potree.settings.displayMode == 'showPointCloud' 
 	      ) return;
 	      if (Potree.settings.editType != 'pano' && Potree.settings.editType != 'merge') {
@@ -62413,7 +62413,8 @@
 	    this.cylinderNear = data.data.near || 0.03;
 	    this.cylinderFar = data.data.far || 3;
 	    model.add(this);
-	    this.video = videoPlayer.getVideo(this.getVideoSrc(), this);
+	    var videoUrl = this.getVideoSrc();
+	    this.video = videoPlayer.getVideo(videoUrl, this);
 	    if (data.video) {
 	      //console.error('createVideo', this.videoSrc,   this.sid)
 	      /* this.video.onloadedmetadata = () => {
@@ -62436,9 +62437,11 @@
 	      if (Hls.isSupported() && data.urlType == 1) {
 	        //似乎Hls不支持就无法播放
 	        var hls = new Hls();
-	        hls.loadSource(data.video);
+	        hls.loadSource(videoUrl);
 	        hls.attachMedia(this.video);
-	        hls.on(Hls.Events.ERROR, (event, data) => console.log('HLS加载失败', event, data));
+	        hls.on(Hls.Events.ERROR, (event, data) => {
+	          console.log('HLS加载失败', data.name, event, data);
+	        });
 	        this.hlsVideoPlayer = hls;
 	      }
 	      this.play(); // ios需要
@@ -62595,6 +62598,7 @@
 	    });
 	  }
 	  watch() {
+	    if (!this.videoActive) return viewer.dispatchEvent('monitorError');
 	    var camera = viewer.mainViewport.camera;
 	    this.updateAspect();
 	    this.isWatching = true;

src/sdk/cover/index.js

@@ -299,7 +299,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
     viewer.addEventListener('watchMonitor',()=>{
         sceneBus.emit('watchMonitor')
     })
-
+    viewer.addEventListener('monitorError',()=>{
+        sceneBus.emit('monitorError')
+    })
     /* mapBus.on('visible', v => {
         //console.log('mapBus visible', v)
         viewer.mapViewer.visible = v