Skip to content

C
check
Commit c58e8881 by vietdo
Options

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

parent ca403663
Showing with 30 additions and 25 deletions
abvw/common/js/common.js
...@@ -76,8 +76,8 @@ COMMON.ContentTypeKeys = { ...@@ -76,8 +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_PanoImage : 'panoImage',
Type_PanoImage : 'panoImage' Type_PanoMovie : 'panoMovie'
}; };
/* /*
...@@ -2395,7 +2395,8 @@ COMMON.SetStartLog = function(strContentId) { ...@@ -2395,7 +2395,8 @@ COMMON.SetStartLog = function(strContentId) {
log.longitude = ClientData.longitude(); log.longitude = ClientData.longitude();
// PageLog 1ページ目セット（１レコードは必須） // PageLog 1ページ目セット（１レコードは必須）
if(CONTENTVIEW_GENERAL.contentType != COMMON.ContentTypeKeys.Type_PanoImage || CONTENTVIEW_GENERAL.contentType != COMMON.ContentTypeKeys.Type_PanoMovie){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile || CONTENTVIEW_GENERAL.contentType == 'panoImage'){
var pageLog = new PageLogEntity(); var pageLog = new PageLogEntity();
pageLog.contentid = strContentId; pageLog.contentid = strContentId;
log.pageLogArray.push(pageLog); log.pageLogArray.push(pageLog);
...@@ -2459,7 +2460,7 @@ COMMON.SetPageLog = function(strContentId, strPageNo) { ...@@ -2459,7 +2460,7 @@ COMMON.SetPageLog = function(strContentId, strPageNo) {
// PageLog追加 // PageLog追加
var pageLog = new PageLogEntity(); var pageLog = new PageLogEntity();
pageLog.contentid = strContentId; pageLog.contentid = strContentId;
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){ if(CONTENTVIEW_GENERAL.contentType == 'panoImage'){
pageLog.pageNo = strPageNo; pageLog.pageNo = strPageNo;
}else{ }else{
pageLog.pageNo = strPageNo + 1; // 0始まりのページ番号 pageLog.pageNo = strPageNo + 1; // 0始まりのページ番号
...@@ -2564,13 +2565,13 @@ COMMON.RegisterLog = function(is) { ...@@ -2564,13 +2565,13 @@ COMMON.RegisterLog = function(is) {
var pageLogArray = arrContentLogs[nIndex].pageLogArray; var pageLogArray = arrContentLogs[nIndex].pageLogArray;
// 詳細ログオプションが有効ならページ閲覧ログデータ作成 // 詳細ログオプションが有効ならページ閲覧ログデータ作成
if (pageLogArray != null && pageLogArray.length > 0) { if (pageLogArray != null && pageLogArray.length > 0) {
console.log("pageLogArray.length:"+pageLogArray.length)
var lines = []; var lines = [];
// 終了時間と閲覧時間の設定 // 終了時間と閲覧時間の設定
var pageLogStart; var pageLogStart;
var pageLogEnd; var pageLogEnd;
// ２レコード目からチェック // ２レコード目からチェック
for ( var nIndex2 = 1; nIndex2 < pageLogArray.length; nIndex2++) {console.log("pageLog:"+pageLogArray[nIndex2 - 1].pageNo); for ( var nIndex2 = 1; nIndex2 < pageLogArray.length; nIndex2++) {
// 一つ前のログの終了日時がnullなら次のレコードの開始日時をセット // 一つ前のログの終了日時がnullなら次のレコードの開始日時をセット
if (pageLogArray[nIndex2 - 1].readingEndDate == null) { if (pageLogArray[nIndex2 - 1].readingEndDate == null) {
pageLogArray[nIndex2 - 1].readingEndDate = pageLogArray[nIndex2].readingStartDate; pageLogArray[nIndex2 - 1].readingEndDate = pageLogArray[nIndex2].readingStartDate;
......
abvw/js/contentview.js
...@@ -1623,7 +1623,6 @@ CONTENTVIEW.handleFromBookMarkPage = function() { ...@@ -1623,7 +1623,6 @@ CONTENTVIEW.handleFromBookMarkPage = function() {
/* handle display page from actiontype=10 mediaType =1 :jump to content */ /* handle display page from actiontype=10 mediaType =1 :jump to content */
CONTENTVIEW.handleFromJumpContent = function() { CONTENTVIEW.handleFromJumpContent = function() {
//CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = true; //CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = true;
/* check exist pageno */ /* check exist pageno */
if (ClientData.common_prePageNo()) { if (ClientData.common_prePageNo()) {
...@@ -1637,18 +1636,19 @@ CONTENTVIEW.handleFromJumpContent = function() { ...@@ -1637,18 +1636,19 @@ CONTENTVIEW.handleFromJumpContent = function() {
CONTENTVIEW.oldContent_Back = function() { CONTENTVIEW.oldContent_Back = function() {
CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = true; CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = true;
var oldDataBack = ClientData.JumpQueue(); var oldDataBack = ClientData.JumpQueue();
var oldContent = oldDataBack[oldDataBack.length - 1]; var oldContent = oldDataBack[oldDataBack.length - 1];
/*move to page */ /*move to page */
//CONTENTVIEW.changePage(oldContent.oldPageIndex); //CONTENTVIEW.changePage(oldContent.oldPageIndex);
if(CONTENTVIEW_GENERAL.contentType != COMMON.ContentTypeKeys.Type_PanoMovie && CONTENTVIEW_GENERAL.contentType != COMMON.ContentTypeKeys.Type_PanoImage){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
CONTENTVIEW.changePageWithoutSlide(oldContent.oldPageIndex); CONTENTVIEW.changePageWithoutSlide(oldContent.oldPageIndex);
} }
/*remove*/ /*remove*/
oldDataBack.splice(oldDataBack.length - 1, 1); oldDataBack.splice(oldDataBack.length - 1, 1);
if(oldDataBack.length == 0){ if(oldDataBack.length == 0){
ClientData.common_prePageNo(null); ClientData.common_prePageNo(null);
} }
...@@ -2104,6 +2104,7 @@ CONTENTVIEW.displayOverlayForHtmlAndMediaType = function(){ ...@@ -2104,6 +2104,7 @@ CONTENTVIEW.displayOverlayForHtmlAndMediaType = function(){
}; };
//END TRB00075 - Editor: Long - Date - 24/09/2013 - Summary : Fix for prevent moving page when display dialog //END TRB00075 - Editor: Long - Date - 24/09/2013 - Summary : Fix for prevent moving page when display dialog
//360vtourの場合戻るボタンを処理する
CONTENTVIEW.panoOldContent = function(){ CONTENTVIEW.panoOldContent = function(){
var oldPageNo = null; var oldPageNo = null;
...@@ -2117,7 +2118,6 @@ CONTENTVIEW.panoOldContent = function(){ ...@@ -2117,7 +2118,6 @@ CONTENTVIEW.panoOldContent = function(){
ClientData.JumpQueue(oldDataBack); ClientData.JumpQueue(oldDataBack);
if(oldDataBack.length == 0){ if(oldDataBack.length == 0){
ClientData.common_prePageNo(null);
ClientData.IsJumpBack(false); ClientData.IsJumpBack(false);
} }
} }
...@@ -2147,6 +2147,9 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){ ...@@ -2147,6 +2147,9 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
CONTENTVIEW.handleForContentTypePanoMovie(linkUrlGetits); CONTENTVIEW.handleForContentTypePanoMovie(linkUrlGetits);
}else{ }else{
var apiUrl = linkUrlTmp + "/createSession/"; var apiUrl = linkUrlTmp + "/createSession/";
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 + "/";
var params = { var params = {
...@@ -6183,6 +6186,7 @@ CONTENTVIEW.panoLog = function(log, scheme){ ...@@ -6183,6 +6186,7 @@ CONTENTVIEW.panoLog = function(log, scheme){
} }
}; };
//360コンテンツにhotspotをクリックする時にログを取得する
window.addEventListener("message", receivePanoLog, false); window.addEventListener("message", receivePanoLog, false);
function receivePanoLog(e) { function receivePanoLog(e) {
...@@ -6212,7 +6216,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6212,7 +6216,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
params, params,
function (data) { function (data) {
/* set end log */ //既存ログを送信する
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog(); COMMON.RegisterLog();
...@@ -6238,8 +6242,8 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6238,8 +6242,8 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
CONTENTVIEW_CREATEOBJECT.moveContentParam = {}; CONTENTVIEW_CREATEOBJECT.moveContentParam = {};
CONTENTVIEW_CREATEOBJECT.moveContentParam = { CONTENTVIEW_CREATEOBJECT.moveContentParam = {
'preContentId' : contentId, 'preContentId' : targetContentId,
'prePageNo' : pageNo, 'prePageNo' : page,
'oldContent' : oldContent 'oldContent' : oldContent
}; };
...@@ -6249,22 +6253,18 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6249,22 +6253,18 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
ClientData.common_preContentId(targetContentId); ClientData.common_preContentId(targetContentId);
ClientData.common_prePageNo(page); ClientData.common_prePageNo(page);
/* store old page */ //古いページを保存する
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo }; var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo };
var dataJump = ClientData.JumpQueue(); var dataJump = ClientData.JumpQueue();
dataJump.push(oldContent); dataJump.push(oldContent);
ClientData.JumpQueue(dataJump); ClientData.JumpQueue(dataJump);
if(ClientData.isStreamingMode()){ if (ClientData.isGetitsMode()) {
//ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode() ) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else { } else {
CONTENTVIEW.screenMove(); CONTENTVIEW.screenMove();
} }
}
} }
} }
//Type 0 //Type 0
...@@ -6278,16 +6278,12 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6278,16 +6278,12 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
dataJump.push(oldContent); dataJump.push(oldContent);
ClientData.JumpQueue(dataJump); ClientData.JumpQueue(dataJump);
if(ClientData.isStreamingMode()){
//ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else { } else {
CONTENTVIEW.screenMove(); CONTENTVIEW.screenMove();
} }
}
} }
}, },
......
abvw/js/contentview_InitObjects.js
...@@ -571,6 +571,9 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){ ...@@ -571,6 +571,9 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
COMMON.LockScreen(); COMMON.LockScreen();
} }
//PdfコンテンツでメディアとHTMLボタンなどをクリックするprePageNoを消す
ClientData.common_prePageNo(null);
//START TRB00094 - Editor : Long - Date : 09/26/2013 - Summary : Setting log //START TRB00094 - Editor : Long - Date : 09/26/2013 - Summary : Setting log
CONTENTVIEW.StartTimerUpdateLog(); CONTENTVIEW.StartTimerUpdateLog();
...@@ -581,6 +584,11 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){ ...@@ -581,6 +584,11 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
//enable SpecifyControl //enable SpecifyControl
CONTENTVIEW.enableSpecifyControl(); CONTENTVIEW.enableSpecifyControl();
//PdfコンテンツからメディアとHTMLコンテンツに遷移する時に既存pdfコンテンツを消す
if ($('#canvasWrapper').length) {
CONTENTVIEW_INITOBJECT.clearViewerComponent();
}
//Display overlay dialog for specify content type //Display overlay dialog for specify content type
CONTENTVIEW.displayOverlayForSpecifyContentType(); CONTENTVIEW.displayOverlayForSpecifyContentType();
......
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