Skip to content

C
check
Commit ca403663 by vietdo
Options

#19269 360°動画アクション拡充

parent a45bceeb
Showing with 30 additions and 12 deletions
abvw/js/contentview.js
......@@ -2143,11 +2143,11 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
var url = ClientData.conf_apiUrl();
var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
if(ClientData.isGetitsMode() == true){
var linkUrlGetits = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "open/panorama/play/" + ClientData.contentInfo_contentId() + "/";
var linkUrlGetits = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "open/panorama/play/" + CONTENTVIEW_GENERAL.contentID + "/";
CONTENTVIEW.handleForContentTypePanoMovie(linkUrlGetits);
}else{
var apiUrl = linkUrlTmp + "/createSession/";
linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/panorama/play/" + ClientData.contentInfo_contentId() + "/";
linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/panorama/play/" + CONTENTVIEW_GENERAL.contentID + "/";
var params = {
sid: ClientData.userInfo_sid()
......@@ -2175,11 +2175,11 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
}
});
}
}else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
}else if(CONTENTVIEW_GENERAL.contentType == 'panoImage'){
var url = ClientData.conf_apiUrl();
var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
if(ClientData.isGetitsMode() == true){
var linkUrlGetits = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "open/vtour/play/" + ClientData.contentInfo_contentId() + "/";
var linkUrlGetits = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "open/vtour/play/" + CONTENTVIEW_GENERAL.contentID + "/";
CONTENTVIEW.handleForContentTypePanoMovie(linkUrlGetits);
}else{
var apiUrl = linkUrlTmp + "/createSession/";
......@@ -2556,7 +2556,7 @@ CONTENTVIEW.handleForContentTypeEnquete = function(resourceUrl){
//Check type of content
CONTENTVIEW.isMediaAndHTMLContent = function(){
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video ||
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || CONTENTVIEW_GENERAL.contentType == 'panoImage'){
return true;
}
else{
......@@ -2571,7 +2571,7 @@ CONTENTVIEW.enableSpecifyControl = function(){
CONTENTVIEW_GENERAL.disableAllControl();
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music ||
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || CONTENTVIEW_GENERAL.contentType == 'panoImage'){
CONTENTVIEW.enableControlForMediaAndHtmlType();
}
......@@ -6152,10 +6152,10 @@ CONTENTVIEW.resvCustomLog = function(param1,param2,param3,param4,param5){
CONTENTVIEW.panoLog = function(log, scheme){
console.log("scheme:"+scheme);
var panoLog = JSON.parse(log);
if(scheme == "abookdetaillog"){
var panoObjectLog = panoLog;
var panoObjectLog = log;
//Panomovieの詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -6174,14 +6174,31 @@ CONTENTVIEW.panoLog = function(log, scheme){
objectLog.eventType = panoObjectLog.eventType;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
}else if(scheme == "abookmovepage"){
var panoPageLog = panoLog;
}else if(scheme == "abookmovepage"){
var panoPageLog = log;
CONTENTVIEW_GENERAL.panoPageNo = panoPageLog.pageNo;
COMMON.SetPageLog( CONTENTVIEW_GENERAL.contentID, panoPageLog.pageNo);
}
};
CONTENTVIEW.panoContentLink = function(targetContentId, page, contentName){
window.addEventListener("message", receivePanoLog, false);
function receivePanoLog(e) {
var log = JSON.parse(e.data);
console.log("log.scheme"+log.scheme);
if(log.scheme != undefined){
CONTENTVIEW.panoLog(log, log.scheme);
}else{
CONTENTVIEW.panoContentLink(log.contentId, log.page);
}
};
CONTENTVIEW.panoContentLink = function(targetContentId, page){
var params = {
contentId: targetContentId,
sid: CONTENTVIEW.getSessionId(),
......@@ -6290,6 +6307,7 @@ window.addEventListener("message", receiveSize, false);
function receiveSize(e) {
//if (e.origin === "http://hogehoge.com") // for security: set this to the domain of the iframe - use e.uri if you need more specificity
// document.getElementById("bar").style.height = e.data + "px";
console.log("receiveSize:" + e.data);
//console.log("receiveSize:" + e.data);
};
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