Skip to content

C
check
Commit 934573a6 by Masaru Abe
Options

#26109 オブジェクト360対応

parent d855560a
Showing with 90 additions and 52 deletions
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){
...@@ -760,7 +762,7 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) { ...@@ -760,7 +762,7 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
location.href=htmlUrl + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl + "&cid=" + strContentId; location.href=htmlUrl + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl + "&cid=" + strContentId;
}else{ }else{
location.href = htmlUrl; location.href = htmlUrl;
} }
} }
return; return;
} }
...@@ -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