Commit c6ebb0bc by vietdo

#10677 Web】Web版でHTMLとアンケートを選択すると、コンテンツBGMが停止する

parent 51de7ed6
...@@ -853,8 +853,11 @@ CONTENTVIEW_CREATEOBJECT.htmlLinkButton = function (mediaType, actionType, id, i ...@@ -853,8 +853,11 @@ CONTENTVIEW_CREATEOBJECT.htmlLinkButton = function (mediaType, actionType, id, i
//CONTENTVIEW_STREAMING.debugLog("htmlLinkButton:" + resourceUrl + ":" + objectId); //CONTENTVIEW_STREAMING.debugLog("htmlLinkButton:" + resourceUrl + ":" + objectId);
/*stop audio on page */ /*stop audio on page */
CONTENTVIEW.stopAllAudio(); if(!CONTENTVIEW_GENERAL.isStopBGM && !CONTENTVIEW.isPendingContentBGM) {
CONTENTVIEW.stopAllAudio();
}
//CONTENTVIEW_CREATEOBJECT.createPageBGM();
if (resourceUrl != "") { if (resourceUrl != "") {
//詳細ログ作成 //詳細ログ作成
...@@ -973,7 +976,9 @@ CONTENTVIEW_CREATEOBJECT.anket = function (mediaType, actionType, id, imageUrl, ...@@ -973,7 +976,9 @@ CONTENTVIEW_CREATEOBJECT.anket = function (mediaType, actionType, id, imageUrl,
//--- //---
/*stop audio on page */ /*stop audio on page */
CONTENTVIEW.stopAllAudio(); if(!CONTENTVIEW_GENERAL.isStopBGM && !CONTENTVIEW.isPendingContentBGM) {
CONTENTVIEW.stopAllAudio();
}
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId(); var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId();
...@@ -1011,7 +1016,9 @@ CONTENTVIEW_CREATEOBJECT.exam = function (mediaType, actionType, id, imageUrl, x ...@@ -1011,7 +1016,9 @@ CONTENTVIEW_CREATEOBJECT.exam = function (mediaType, actionType, id, imageUrl, x
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog); COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//--- //---
/*stop audio on page */ /*stop audio on page */
CONTENTVIEW.stopAllAudio(); if(!CONTENTVIEW_GENERAL.isStopBGM && !CONTENTVIEW.isPendingContentBGM) {
CONTENTVIEW.stopAllAudio();
}
var isShowResult, isSendResult; var isShowResult, isSendResult;
if(showResult == 1){ if(showResult == 1){
isShowResult = true; isShowResult = true;
...@@ -1058,7 +1065,9 @@ CONTENTVIEW_CREATEOBJECT.quiz = function (mediaType, actionType, id, imageUrl, x ...@@ -1058,7 +1065,9 @@ CONTENTVIEW_CREATEOBJECT.quiz = function (mediaType, actionType, id, imageUrl, x
//--- //---
/*stop audio on page */ /*stop audio on page */
CONTENTVIEW.stopAllAudio(); if(!CONTENTVIEW_GENERAL.isStopBGM && !CONTENTVIEW.isPendingContentBGM) {
CONTENTVIEW.stopAllAudio();
}
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId(); var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId();
var isFullScreen = false; var isFullScreen = false;
...@@ -2886,14 +2895,14 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) { ...@@ -2886,14 +2895,14 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
CONTENTVIEW_CREATEOBJECT.createPageBGM = function(){ CONTENTVIEW_CREATEOBJECT.createPageBGM = function(){
var currentPageObject = CONTENTVIEW_GETDATA.getContent().pageObjects; var currentPageObject = CONTENTVIEW_GETDATA.getContent().pageObjects;
var audioFile = ''; var audioFile = '';
var playType = ''; var playType = '';
$('#playaudiopage').html(''); $('#playaudiopage').html('');
for(var i = 0; i < currentPageObject.length; i++){ for(var i = 0; i < currentPageObject.length; i++){
var BGMObject = currentPageObject[i]; var BGMObject = currentPageObject[i];
if(BGMObject.mediaType == '3' && BGMObject.actionType=='2' && BGMObject.playType == '2'){ if(BGMObject.mediaType == '3' && BGMObject.actionType=='2' && BGMObject.playType == '2'){
CONTENTVIEW_GENERAL.isStopBGM = true;
audioFile = BGMObject.audioFile; audioFile = BGMObject.audioFile;
playType = BGMObject.playType; playType = BGMObject.playType;
......
...@@ -473,6 +473,7 @@ CONTENTVIEW_GENERAL.ready = function(initContentId){ ...@@ -473,6 +473,7 @@ CONTENTVIEW_GENERAL.ready = function(initContentId){
CONTENTVIEW_GENERAL.arrThumbnailsLoaded = []; CONTENTVIEW_GENERAL.arrThumbnailsLoaded = [];
CONTENTVIEW_GENERAL.isSendingData = true; CONTENTVIEW_GENERAL.isSendingData = true;
CONTENTVIEW_GENERAL.isPlayBGMUnlock = false; //未使用 CONTENTVIEW_GENERAL.isPlayBGMUnlock = false; //未使用
CONTENTVIEW_GENERAL.isStopBGM = false;
CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = false; CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = false;
CONTENTVIEW_GENERAL.standardRatio = 1; //未使用 CONTENTVIEW_GENERAL.standardRatio = 1; //未使用
CONTENTVIEW_GENERAL.currentRatio = 1; //未使用 CONTENTVIEW_GENERAL.currentRatio = 1; //未使用
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment