Skip to content

C
check
Commit b8bf61f6 by vietdo
Options

#19267 vtour対応

parent e1ed5f0e
Showing with 91 additions and 4 deletions
abvw/common/js/common.js
...@@ -76,7 +76,8 @@ COMMON.ContentTypeKeys = { ...@@ -76,7 +76,8 @@ COMMON.ContentTypeKeys = {
Type_Enquete : 'enquete', Type_Enquete : 'enquete',
Type_Exam : 'exam', Type_Exam : 'exam',
Type_Link : 'url', Type_Link : 'url',
Type_PanoMovie : 'panoMovie' Type_PanoMovie : 'panoMovie',
Type_PanoImage : 'panoImage'
}; };
/* /*
......
abvw/js/contentview.js
...@@ -2106,7 +2106,6 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){ ...@@ -2106,7 +2106,6 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
if( resourceUrl == null ){ if( resourceUrl == null ){
resourceUrl = CONTENTVIEW.downloadResourceById(contentId); resourceUrl = CONTENTVIEW.downloadResourceById(contentId);
} }
//CONTENTVIEW_GENERAL.contentType = COMMON.ContentTypeKeys.Type_Html; //CONTENTVIEW_GENERAL.contentType = COMMON.ContentTypeKeys.Type_Html;
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music){
CONTENTVIEW.handleForContentTypeMusic(resourceUrl); CONTENTVIEW.handleForContentTypeMusic(resourceUrl);
...@@ -2150,6 +2149,41 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){ ...@@ -2150,6 +2149,41 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
} }
}); });
} }
}else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_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() + "/";
CONTENTVIEW.handleForContentTypePanoMovie(linkUrlGetits);
}else{
var apiUrl = linkUrlTmp + "/createSession/";
linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/vtour/play/" + ClientData.contentInfo_contentId() + "/";
var params = {
sid: ClientData.userInfo_sid()
};
var sysSettings = AVWEB.avwSysSetting();
// ajax によるAPIの実行（json）
$.ajax( {
async: false,
type: 'GET',
url: apiUrl,
dataType: 'text',
data: params,
crossDomain: true,
beforeSend: function(xhr) {
xhr.setRequestHeader('X-AGT-AppId', sysSettings.appName);
xhr.setRequestHeader('X-AGT-AppVersion', sysSettings.appVersion);
},
success: function(data) {
var linkUrlTmp2 = linkUrlTmp + ";jsessionid=" + data;
CONTENTVIEW.handleForContentTypePanoImage(linkUrlTmp2);
},
error: function(xmlHttpRequest, txtStatus, errorThrown) {
/* call custom error process */
console.log("error" + errorThrown);
}
});
}
} }
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html){
...@@ -2336,6 +2370,32 @@ CONTENTVIEW.handleForContentTypePanoMovie = function(resourceUrl){ ...@@ -2336,6 +2370,32 @@ CONTENTVIEW.handleForContentTypePanoMovie = function(resourceUrl){
return; return;
}; };
//handle for content type = panoMovie
CONTENTVIEW.handleForContentTypePanoImage = function(resourceUrl){
//Create Dialog overlay
var $container = $('#dialog');
$container.html('');
$container.css('left','0%');
$container.css('width','100%');
$container.css('background-color','white');
//START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){
$container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%;"></iframe>');
$container.css('overflow', 'scroll');
$container.css('-webkit-overflow-scrolling', 'touch');
}
else{
$container.html('<iframe src="'+ resourceUrl +'" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true" style="position: absolute; width: 100%; height: 100%; "> </iframe>');
$container.css('overflow', 'hidden');
}
//END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
$container.show();
return;
};
//handle for content type = music //handle for content type = music
CONTENTVIEW.handleForContentTypeMusic = function(resourceUrl){ CONTENTVIEW.handleForContentTypeMusic = function(resourceUrl){
...@@ -2462,7 +2522,7 @@ CONTENTVIEW.handleForContentTypeEnquete = function(resourceUrl){ ...@@ -2462,7 +2522,7 @@ CONTENTVIEW.handleForContentTypeEnquete = function(resourceUrl){
//Check type of content //Check type of content
CONTENTVIEW.isMediaAndHTMLContent = function(){ CONTENTVIEW.isMediaAndHTMLContent = function(){
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video || 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_Html || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
return true; return true;
} }
else{ else{
...@@ -2477,7 +2537,7 @@ CONTENTVIEW.enableSpecifyControl = function(){ ...@@ -2477,7 +2537,7 @@ CONTENTVIEW.enableSpecifyControl = function(){
CONTENTVIEW_GENERAL.disableAllControl(); CONTENTVIEW_GENERAL.disableAllControl();
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music || 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_Video || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
CONTENTVIEW.enableControlForMediaAndHtmlType(); CONTENTVIEW.enableControlForMediaAndHtmlType();
} }
...@@ -6056,6 +6116,27 @@ CONTENTVIEW.resvCustomLog = function(param1,param2,param3,param4,param5){ ...@@ -6056,6 +6116,27 @@ CONTENTVIEW.resvCustomLog = function(param1,param2,param3,param4,param5){
}; };
CONTENTVIEW.panoMovieObjectLog = function(log){
var pageLog = JSON.parse(log);
//Panomovieの詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
objectLog.actionDate = new Date();
objectLog.pageNo = "1";
objectLog.objectId = pageLog.objectId;
objectLog.resourceId = pageLog.resourceId;
objectLog.mediaType = pageLog.mediaType;
objectLog.actionType = pageLog.actionType;
objectLog.actionTime = "0";
objectLog.actionValue = pageLog.actionValue;
objectLog.locationX = pageLog.locationX;
objectLog.locationY = pageLog.locationY;
objectLog.locationHeight = pageLog.locationHeight;
objectLog.locationWidth = pageLog.locationWidth;
objectLog.eventType = pageLog.eventType;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
};
window.addEventListener("message", receiveSize, false); window.addEventListener("message", receiveSize, false);
function receiveSize(e) { function receiveSize(e) {
......
abvw/js/header.js
...@@ -1097,6 +1097,11 @@ HEADER.getIconTypeContent = function(contentType) { ...@@ -1097,6 +1097,11 @@ HEADER.getIconTypeContent = function(contentType) {
src = 'img/bookshelf/icon_11.png'; src = 'img/bookshelf/icon_11.png';
break; break;
} }
case COMMON.ContentTypeKeys.Type_PanoImage:
{
src = 'img/bookshelf/icon_12.png';
break;
}
default: break default: break
} }
return src; return src;
......
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