Skip to content

C
check
Commit 934573a6 by Masaru Abe
Options

#26109 オブジェクト360対応

parent d855560a
Showing with 74 additions and 36 deletions
abvw/js/contentview.js
...@@ -2166,11 +2166,26 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){ ...@@ -2166,11 +2166,26 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video){
CONTENTVIEW.handleForContentTypeVideo(resourceUrl); CONTENTVIEW.handleForContentTypeVideo(resourceUrl);
} }
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html){
var linkUrlTmp = resourceUrl;
//HTMLカスタムログオプション有り
if(ClientData.serviceOpt_html_custom_log() == 'Y'){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
linkUrlTmp = linkUrlTmp + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl + "&cid=" + CONTENTVIEW_GENERAL.contentID;
}
CONTENTVIEW.handleForContentTypeHTML(linkUrlTmp);
}
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Exam){
CONTENTVIEW.handleForContentTypeExam(resourceUrl);
}
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Enquete){
CONTENTVIEW.handleForContentTypeEnquete(resourceUrl);
}
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
var url = ClientData.conf_apiUrl(); var url = ClientData.conf_apiUrl();
var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath()); var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
var apiUrl = linkUrlTmp + "/createSession/"; var apiUrl = linkUrlTmp + "/createSession/";
CONTENTVIEW.panoOldContent(); CONTENTVIEW.panoOldContent();
linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/panorama/play/" + CONTENTVIEW_GENERAL.contentID + "/"; linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/panorama/play/" + CONTENTVIEW_GENERAL.contentID + "/";
...@@ -2179,14 +2194,13 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){ ...@@ -2179,14 +2194,13 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
CONTENTVIEW.handleForContentTypePanoMovie(linkUrlTmp); CONTENTVIEW.handleForContentTypePanoMovie(linkUrlTmp);
}, linkUrlTmp); }, linkUrlTmp);
}else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){ }
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
var url = ClientData.conf_apiUrl(); var url = ClientData.conf_apiUrl();
var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath()); var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
var apiUrl = linkUrlTmp + "/createSession/"; var apiUrl = linkUrlTmp + "/createSession/";
var oldPageNo = CONTENTVIEW.panoOldContent(); var oldPageNo = CONTENTVIEW.panoOldContent();
if(oldPageNo != null){ if(oldPageNo != null){
linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/vtour/play/" + CONTENTVIEW_GENERAL.contentID + "/" + "?startscene=scene" + oldPageNo+"&a=1"; linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/vtour/play/" + CONTENTVIEW_GENERAL.contentID + "/" + "?startscene=scene" + oldPageNo+"&a=1";
}else{ }else{
...@@ -2197,21 +2211,20 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){ ...@@ -2197,21 +2211,20 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
CONTENTVIEW.handleForContentTypePanoImage(linkUrlTmp); CONTENTVIEW.handleForContentTypePanoImage(linkUrlTmp);
},linkUrlTmp); },linkUrlTmp);
} }
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
var url = ClientData.conf_apiUrl();
var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
var apiUrl = linkUrlTmp + "/createSession/";
CONTENTVIEW.panoOldContent();
linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/objectvr/play/" + CONTENTVIEW_GENERAL.contentID + "/";
CONTENTVIEW.createSessionForPanoramaContent(apiUrl,function(){
CONTENTVIEW.handleForContentTypeObjectVR(linkUrlTmp);
}, linkUrlTmp);
var linkUrlTmp = resourceUrl;
//HTMLカスタムログオプション有り
if(ClientData.serviceOpt_html_custom_log() == 'Y'){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
linkUrlTmp = linkUrlTmp + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl + "&cid=" + CONTENTVIEW_GENERAL.contentID;
}
CONTENTVIEW.handleForContentTypeHTML(linkUrlTmp);
}
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Exam){
CONTENTVIEW.handleForContentTypeExam(resourceUrl);
} else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Enquete){
CONTENTVIEW.handleForContentTypeEnquete(resourceUrl);
} }
if (COMMON.isTouchDevice() == true) { if (COMMON.isTouchDevice() == true) {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
CONTENTVIEW_GENERAL.standardRatio = document.documentElement.clientWidth / window.innerWidth; CONTENTVIEW_GENERAL.standardRatio = document.documentElement.clientWidth / window.innerWidth;
...@@ -2366,7 +2379,6 @@ CONTENTVIEW.handleForContentTypePanoMovie = function(resourceUrl){ ...@@ -2366,7 +2379,6 @@ CONTENTVIEW.handleForContentTypePanoMovie = function(resourceUrl){
$container.css('width','100%'); $container.css('width','100%');
$container.css('background-color','white'); $container.css('background-color','white');
//START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){ if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){
$container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%;"></iframe>'); $container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%;"></iframe>');
...@@ -2377,12 +2389,11 @@ CONTENTVIEW.handleForContentTypePanoMovie = function(resourceUrl){ ...@@ -2377,12 +2389,11 @@ CONTENTVIEW.handleForContentTypePanoMovie = function(resourceUrl){
$container.html('<iframe src="'+ resourceUrl +'" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true" style="position: absolute; width: 100%; height: 100%; "> </iframe>'); $container.html('<iframe src="'+ resourceUrl +'" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true" style="position: absolute; width: 100%; height: 100%; "> </iframe>');
$container.css('overflow', 'hidden'); $container.css('overflow', 'hidden');
} }
//END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
$container.show(); $container.show();
return; return;
}; };
//handle for content type = panoMovie //handle for content type = panoImage
CONTENTVIEW.handleForContentTypePanoImage = function(resourceUrl){ CONTENTVIEW.handleForContentTypePanoImage = function(resourceUrl){
//Create Dialog overlay //Create Dialog overlay
var $container = $('#dialog'); var $container = $('#dialog');
...@@ -2392,7 +2403,6 @@ CONTENTVIEW.handleForContentTypePanoImage = function(resourceUrl){ ...@@ -2392,7 +2403,6 @@ CONTENTVIEW.handleForContentTypePanoImage = function(resourceUrl){
$container.css('width','100%'); $container.css('width','100%');
$container.css('background-color','white'); $container.css('background-color','white');
//START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){ if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){
$container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%;"></iframe>'); $container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%;"></iframe>');
...@@ -2403,7 +2413,30 @@ CONTENTVIEW.handleForContentTypePanoImage = function(resourceUrl){ ...@@ -2403,7 +2413,30 @@ CONTENTVIEW.handleForContentTypePanoImage = function(resourceUrl){
$container.html('<iframe src="'+ resourceUrl +'" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true" style="position: absolute; width: 100%; height: 100%; "> </iframe>'); $container.html('<iframe src="'+ resourceUrl +'" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true" style="position: absolute; width: 100%; height: 100%; "> </iframe>');
$container.css('overflow', 'hidden'); $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 = objectvr
CONTENTVIEW.handleForContentTypeObjectVR = function(resourceUrl){
//Create Dialog overlay
var $container = $('#dialog');
$container.html('');
$container.css('left','0%');
$container.css('width','100%');
$container.css('background-color','white');
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');
}
$container.show(); $container.show();
return; return;
}; };
...@@ -2534,7 +2567,9 @@ CONTENTVIEW.handleForContentTypeEnquete = function(resourceUrl){ ...@@ -2534,7 +2567,9 @@ 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 == 'panoImage'){ 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_ObjectVR){
return true; return true;
} }
else{ else{
...@@ -2549,7 +2584,8 @@ CONTENTVIEW.enableSpecifyControl = function(){ ...@@ -2549,7 +2584,8 @@ 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 == 'panoImage'){ 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_ObjectVR){
CONTENTVIEW.enableControlForMediaAndHtmlType(); CONTENTVIEW.enableControlForMediaAndHtmlType();
} }
...@@ -2675,16 +2711,9 @@ CONTENTVIEW.originalScreenForNotPdfType = function(){ ...@@ -2675,16 +2711,9 @@ CONTENTVIEW.originalScreenForNotPdfType = function(){
$container.css('background-color', 'white'); $container.css('background-color', 'white');
$container.css('overflow', 'scroll'); $container.css('overflow', 'scroll');
$container.css('-webkit-overflow-scrolling', 'touch'); $container.css('-webkit-overflow-scrolling', 'touch');
}else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){ }else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
$container.css('left','0%'); CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage ||
$container.css('position','absolute'); CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
//$container.css('height','100%');
$container.css('width','100%');
$container.css('background-color', 'white');
$container.css('overflow', 'scroll');
$container.css('-webkit-overflow-scrolling', 'touch');
}
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
$container.css('left','0%'); $container.css('left','0%');
$container.css('position','absolute'); $container.css('position','absolute');
//$container.css('height','100%'); //$container.css('height','100%');
...@@ -6168,7 +6197,7 @@ CONTENTVIEW.panoLog = function(log, scheme){ ...@@ -6168,7 +6197,7 @@ CONTENTVIEW.panoLog = function(log, scheme){
var objectLog = new ObjectLogEntity(); var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID; objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
objectLog.actionDate = new Date(); objectLog.actionDate = new Date();
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
objectLog.pageNo = "1"; objectLog.pageNo = "1";
}else{ }else{
objectLog.pageNo = panoObjectLog.pageNo; objectLog.pageNo = panoObjectLog.pageNo;
......
abvw/js/header.js
...@@ -1102,6 +1102,11 @@ HEADER.getIconTypeContent = function(contentType) { ...@@ -1102,6 +1102,11 @@ HEADER.getIconTypeContent = function(contentType) {
src = 'img/bookshelf/icon_12.png'; src = 'img/bookshelf/icon_12.png';
break; break;
} }
case COMMON.ContentTypeKeys.Type_ObjectVR:
{
src = 'img/bookshelf/icon_13.png';
break;
}
default: break; default: break;
} }
return src; return src;
......
abvw/js/login.js
...@@ -751,7 +751,9 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) { ...@@ -751,7 +751,9 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
} else { } else {
// Go to Conten view page // Go to Conten view page
if(ClientData.isGetitsMode()){ if(ClientData.isGetitsMode()){
if(contentType == COMMON.ContentTypeKeys.Type_Html || contentType == COMMON.ContentTypeKeys.Type_Link || contentType == COMMON.ContentTypeKeys.Type_PanoImage || contentType == COMMON.ContentTypeKeys.Type_PanoMovie){ if(contentType == COMMON.ContentTypeKeys.Type_Html || contentType == COMMON.ContentTypeKeys.Type_Link ||
contentType == COMMON.ContentTypeKeys.Type_PanoImage || contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath()); var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
var htmlUrl = LOGIN.htmlLinkById(strContentId, contentType); var htmlUrl = LOGIN.htmlLinkById(strContentId, contentType);
if(htmlUrl){ if(htmlUrl){
...@@ -822,6 +824,8 @@ LOGIN.htmlLinkById = function(contentId,contentType) { ...@@ -822,6 +824,8 @@ LOGIN.htmlLinkById = function(contentId,contentType) {
resourceUrl = ClientData.siteUrl() + ClientData.userInfo_accountPath() + "/open/vtour/play/" + contentId; resourceUrl = ClientData.siteUrl() + ClientData.userInfo_accountPath() + "/open/vtour/play/" + contentId;
}else if(contentType == COMMON.ContentTypeKeys.Type_PanoMovie){ }else if(contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
resourceUrl = ClientData.siteUrl() + ClientData.userInfo_accountPath() + "/open/panorama/play/" + contentId; resourceUrl = ClientData.siteUrl() + ClientData.userInfo_accountPath() + "/open/panorama/play/" + contentId;
}else if(contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
resourceUrl = ClientData.siteUrl() + ClientData.userInfo_accountPath() + "/open/objectvr/play/" + contentId;
}else{ }else{
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params, AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
function(data) { function(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