|
@@ -553,7 +553,10 @@ var switchSoundBtn = function(video, belong){
|
|
|
//从头开始放:
|
|
|
video.currentTime = 0
|
|
|
video.muted = false;
|
|
|
- if(g_tourAudio)g_tourAudio.pause()
|
|
|
+ if(g_tourAudio){
|
|
|
+ g_tourAudio.pause()
|
|
|
+ g_tourAudio.shouldPlay = false
|
|
|
+ }
|
|
|
SoundOnVideo = video
|
|
|
video.pauseByHot = video.pauseByTour = false
|
|
|
|
|
@@ -5408,7 +5411,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
//if(g_tourAudio && g_tourAudio.paused && g_bgAudio && g_bgAudio.paused){
|
|
|
if(g_bgAudio && g_bgAudio.paused && g_bgAudio.pauseByTour){
|
|
|
g_playAudio = g_bgAudio;
|
|
|
- g_tourAudio && g_tourAudio.pause();
|
|
|
+ g_tourAudio && (g_tourAudio.pause(), g_tourAudio.shouldPlay = false)
|
|
|
//window.tourAudio && window.tourAudio.pause();
|
|
|
//manage.switchBgmState(true);
|
|
|
playMusic(player.currentPano)
|
|
@@ -16406,7 +16409,10 @@ window.Modernizr = function(n, e, t) {
|
|
|
SoundOnVideo.pauseByHot = true
|
|
|
switchSoundBtn(SoundOnVideo)
|
|
|
}
|
|
|
- if(g_tourAudio)g_tourAudio.pause()
|
|
|
+ if(g_tourAudio){
|
|
|
+ g_tourAudio.pause()
|
|
|
+ g_tourAudio.shouldPlay = false
|
|
|
+ }
|
|
|
|
|
|
|
|
|
}
|
|
@@ -28416,10 +28422,10 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
}
|
|
|
,
|
|
|
- l.prototype.clearUploadQueue = function(e, t, i) {
|
|
|
+ l.prototype.clearUploadQueue = function(e, t, i) {
|
|
|
void 0 !== t && null !== t || (t = 0);
|
|
|
for (var n = 0; n < e.length; ) {
|
|
|
- var r = e[n];
|
|
|
+ var r = e[n]; //切换场景导览的时候卡住了,一直报错 r.tile undefined???
|
|
|
(!i || i && i === r.tile.panoId) && r.level >= t ? (r.uploadQueued = !1,
|
|
|
e.splice(n, 1)) : n++
|
|
|
}
|