Skip to content

C
check
Commit c58e8881 by vietdo
Options

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

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