Skip to content

C
check
Commit 20e4b873 by vietdo
Options

#19267 vtour対応

parent c58e8881
Showing with 14 additions and 10 deletions
abvw/common/js/common.js
...@@ -2395,7 +2395,7 @@ COMMON.SetStartLog = function(strContentId) { ...@@ -2395,7 +2395,7 @@ COMMON.SetStartLog = function(strContentId) {
log.longitude = ClientData.longitude(); log.longitude = ClientData.longitude();
// PageLog 1ページ目セット（１レコードは必須） // PageLog 1ページ目セット（１レコードは必須）
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF ||
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile || CONTENTVIEW_GENERAL.contentType == 'panoImage'){ 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;
......
abvw/js/contentview.js
...@@ -6154,7 +6154,6 @@ CONTENTVIEW.resvCustomLog = function(param1,param2,param3,param4,param5){ ...@@ -6154,7 +6154,6 @@ CONTENTVIEW.resvCustomLog = function(param1,param2,param3,param4,param5){
}; };
CONTENTVIEW.panoLog = function(log, scheme){ CONTENTVIEW.panoLog = function(log, scheme){
console.log("scheme:"+scheme);
if(scheme == "abookdetaillog"){ if(scheme == "abookdetaillog"){
...@@ -6162,8 +6161,12 @@ CONTENTVIEW.panoLog = function(log, scheme){ ...@@ -6162,8 +6161,12 @@ CONTENTVIEW.panoLog = function(log, scheme){
//Panomovieの詳細ログ作成 //Panomovieの詳細ログ作成
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();
objectLog.pageNo = "1"; if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
objectLog.pageNo = "1";
}else{
objectLog.pageNo = panoObjectLog.pageNo;
}
objectLog.objectId = panoObjectLog.objectId; objectLog.objectId = panoObjectLog.objectId;
objectLog.resourceId = panoObjectLog.resourceId; objectLog.resourceId = panoObjectLog.resourceId;
objectLog.mediaType = panoObjectLog.mediaType; objectLog.mediaType = panoObjectLog.mediaType;
...@@ -6175,7 +6178,7 @@ CONTENTVIEW.panoLog = function(log, scheme){ ...@@ -6175,7 +6178,7 @@ CONTENTVIEW.panoLog = function(log, scheme){
objectLog.locationHeight = panoObjectLog.locationHeight; objectLog.locationHeight = panoObjectLog.locationHeight;
objectLog.locationWidth = panoObjectLog.locationWidth; objectLog.locationWidth = panoObjectLog.locationWidth;
objectLog.eventType = panoObjectLog.eventType; objectLog.eventType = panoObjectLog.eventType;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog); COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
}else if(scheme == "abookmovepage"){ }else if(scheme == "abookmovepage"){
...@@ -6193,7 +6196,8 @@ function receivePanoLog(e) { ...@@ -6193,7 +6196,8 @@ function receivePanoLog(e) {
var log = JSON.parse(e.data); var log = JSON.parse(e.data);
console.log("log.scheme"+log.scheme); console.log("log.scheme"+log.scheme);
if(log.scheme != undefined){
if(log.hasOwnProperty('scheme')){
CONTENTVIEW.panoLog(log, log.scheme); CONTENTVIEW.panoLog(log, log.scheme);
}else{ }else{
...@@ -6219,7 +6223,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6219,7 +6223,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
//既存ログを送信する //既存ログを送信する
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog(); COMMON.RegisterLog();
console.log("data.contentData.alertMessageLevel:"+data.contentData.alertMessageLevel);
if(data.contentData.alertMessageLevel){ if(data.contentData.alertMessageLevel){
if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){ if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
...@@ -6269,8 +6273,8 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6269,8 +6273,8 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
} }
//Type 0 //Type 0
else{ else{
ClientData.common_preContentId(contentId); ClientData.common_preContentId(targetContentId);
ClientData.common_prePageNo(pageNo); ClientData.common_prePageNo(page);
/* store old page */ /* store old page */
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo }; var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo };
...@@ -6278,7 +6282,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6278,7 +6282,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
dataJump.push(oldContent); dataJump.push(oldContent);
ClientData.JumpQueue(dataJump); ClientData.JumpQueue(dataJump);
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) { if (ClientData.isGetitsMode()) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else { } else {
CONTENTVIEW.screenMove(); CONTENTVIEW.screenMove();
......
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