#19267 vtour対応

abvw/common/js/common.js

@@ -2395,7 +2395,7 @@ COMMON.SetStartLog = function(strContentId) {
         log.longitude = ClientData.longitude();
 
         // 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'){
         	var pageLog = new PageLogEntity();
             pageLog.contentid = strContentId;

abvw/js/contentview.js

@@ -6154,7 +6154,6 @@ CONTENTVIEW.resvCustomLog = function(param1,param2,param3,param4,param5){
 };
 
 CONTENTVIEW.panoLog = function(log, scheme){
-	console.log("scheme:"+scheme);
 	
 	if(scheme == "abookdetaillog"){
 		
@@ -6162,8 +6161,12 @@ CONTENTVIEW.panoLog = function(log, scheme){
 		//Panomovieの詳細ログ作成
 	    var objectLog = new ObjectLogEntity();
 	    objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
-	    objectLog.actionDate = new Date();
-	    objectLog.pageNo = "1"; 
+	    objectLog.actionDate = new Date();	    
+	    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
+	    	objectLog.pageNo = "1";
+	    }else{
+		    objectLog.pageNo = panoObjectLog.pageNo;
+	    }	    
 	    objectLog.objectId = panoObjectLog.objectId;
 	    objectLog.resourceId = panoObjectLog.resourceId;
 	    objectLog.mediaType = panoObjectLog.mediaType;
@@ -6175,7 +6178,7 @@ CONTENTVIEW.panoLog = function(log, scheme){
 	    objectLog.locationHeight = panoObjectLog.locationHeight;
 	    objectLog.locationWidth = panoObjectLog.locationWidth;
 	    objectLog.eventType = panoObjectLog.eventType;
-
+	    
 	    COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
 	}else if(scheme == "abookmovepage"){
 		
@@ -6193,7 +6196,8 @@ function receivePanoLog(e) {
 
 	var log = JSON.parse(e.data);
 	console.log("log.scheme"+log.scheme);
-	if(log.scheme != undefined){
+	
+	if(log.hasOwnProperty('scheme')){
 		
 		CONTENTVIEW.panoLog(log, log.scheme);
 	}else{
@@ -6219,7 +6223,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
              //既存ログを送信する
              COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
              COMMON.RegisterLog();
-
+             console.log("data.contentData.alertMessageLevel:"+data.contentData.alertMessageLevel);
              if(data.contentData.alertMessageLevel){
 
                  if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
@@ -6269,8 +6273,8 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
              }
              //Type 0
              else{
-                    ClientData.common_preContentId(contentId);
-                    ClientData.common_prePageNo(pageNo);
+                    ClientData.common_preContentId(targetContentId);
+                    ClientData.common_prePageNo(page);
 
                     /* store old page */
                     var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo };
@@ -6278,7 +6282,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
                     dataJump.push(oldContent);
                     ClientData.JumpQueue(dataJump);
 
-                	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
+                	if (ClientData.isGetitsMode()) {
                 		AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
                 	} else {
                 		CONTENTVIEW.screenMove();