Skip to content

C
check
Commit d1a5398f by Masaru Abe
Options

日比谷対応

parent 98db55b3
Showing with 475 additions and 59 deletions
abvw/common/js/common.js
......@@ -180,13 +180,13 @@ var Keys = {
// Session :事業者オプション(serviceOpt)_スクリーンロック待ち時間:Interger
serviceOpt_web_screen_lock_wait: 'web_screen_lock_wait',
// Session :事業者オプション(serviceOpt)_GPS使用可:Char(Y：可能, N：不可)
serviceOpt_catalog_edition: 'usable_readinglog_gps',
serviceOpt_usable_readinglog_gps: 'usable_readinglog_gps',
// Session :事業者オプション(serviceOpt)_詳細ログ使用可:Char(Y：可能, N：不可)
serviceOpt_catalog_edition: 'usable_readinglog_object',
serviceOpt_usable_readinglog_object: 'usable_readinglog_object',
// Session :事業者オプション(serviceOpt)_カタログエディション:Char(Y：可能, N：不可)
serviceOpt_catalog_edition: 'catalog_edition',
// Session :事業者オプション(serviceOpt)_日比谷カスタム:Char(Y：可能, N：不可)
serviceOpt_catalog_edition: 'hibiyakadan_catalog',
serviceOpt_hibiyakadan_catalog: 'hibiyakadan_catalog',
// Session :共通(common)_コンテンツID:Integer
common_contentId: 'common_contentId',
......@@ -381,7 +381,22 @@ function PageLogEntity(){
this.readingEndDate = null;
this.readingTime = 0;
};
// Entity for ObjectLog
function ObjectLogEntity(){
this.contentid = "";
this.actionDate = new Date();
this.pageNo = 1;
this.objectId = "";
this.resourceId = "";
this.mediaType = "";
this.actionType = "";
this.actionValue = "";
this.actionTime = "0";
this.locationX = "";
this.locationY = "";
this.locationHeight = "";
this.locationWidth = "";
};
// No.17 Phase 2: do not use this function
// Build memo/marking/bookmark to base64string
......@@ -2311,9 +2326,7 @@ function SetStartLog(strContentId) {
// Set 1 second
curr1.setSeconds(curr.getSeconds() + 1);
log.readingEndDate = curr1;
// Reading time
log.readingTime = log.readingEndDate.subtractBySeconds(log.readingStartDate);
......@@ -2335,7 +2348,7 @@ function SetEndLog(strContentId) {
//abe pageLogもセット
//var log = new LogEntity(); 無駄?
//var log = new LogEntity(); //無駄なのでコメント
var arrContentLogs = ClientData.ContentLogData();
for(var nIndex = 0; nIndex < arrContentLogs.length; nIndex++) {
......@@ -2353,6 +2366,7 @@ function SetEndLog(strContentId) {
ClientData.ContentLogData(arrContentLogs);
};
// １ページ分のページ閲覧ログを作成
function SetPageLog( strContentId, strPageNo ){
var arrContentLogs = ClientData.ContentLogData();
......@@ -2372,6 +2386,24 @@ function SetPageLog( strContentId, strPageNo ){
}
// １アクションのオブジェクトログを作成
function SetObjectLog( strContentId, objectLog ){
var arrContentLogs = ClientData.ContentLogData();
for(var nIndex = 0; nIndex < arrContentLogs.length; nIndex++) {
if(arrContentLogs[nIndex].contentid == strContentId) {
//ObjectLog追加
arrContentLogs[nIndex].objectLogArray.push(objectLog);
}
}
ClientData.ContentLogData(arrContentLogs);
}
/*
Register reading log of content to server by calling api
*/
......@@ -2384,16 +2416,20 @@ function RegisterLog() {
var dateStart = new Date(arrContentLogs[nIndex].readingStartDate);
//ページログJSONデータの作成
var pageLogJson = "";
var objectLogJson = "";
if( ClientData.serviceOpt_usable_readinglog_object() == 'Y' ){
var pageLogArray = arrContentLogs[nIndex].pageLogArray;
var lines = [];
//詳細ログオプションが有効ならページ閲覧ログデータ作成
if( pageLogArray.length > 0 ){
var lines = [];
//終了時間と閲覧時間の設定
var pageLogStart;
var pageLogEnd;
//２レコード目からチェック
for (var nIndex2 = 1; nIndex2 < pageLogArray.length; nIndex2++) {
//一つ前のログの終了日時を次のレコードの開始日時でセット
//一つ前のログの終了日時がnullなら次のレコードの開始日時をセット
if( pageLogArray[nIndex2 -1].readingEndDate == null ){
pageLogArray[nIndex2 -1].readingEndDate = pageLogArray[nIndex2].readingStartDate;
}
......@@ -2429,15 +2465,53 @@ function RegisterLog() {
}
//alert("PageLog Lines:" + JSON.stringify( lines ) );
}
var pageLogJson = "";
if( lines.length > 0 ){
pageLogJson = "{ header:[\"pageNo\",\"readingStartDate\",\"readingEndDate\",\"readingTime\"],lines:";
pageLogJson = pageLogJson + JSON.stringify( lines );
pageLogJson = pageLogJson + "}";
//alert("JSON:" + pageLogJson);
}
}
var objectLogArray = arrContentLogs[nIndex].objectLogArray;
//詳細ログオプションが有効ならページ閲覧ログデータ作成
if( objectLogArray.length > 0 ){
var lines = [];
var actionDate;
//JSONデータ作成
for (var nIndex2 = 0; nIndex2 < objectLogArray.length; nIndex2++) {
actionDate = new Date(objectLogArray[nIndex2].actionDate);
var line = [];
line.push(actionDate.jpDateTimeString1());
line.push(objectLogArray[nIndex2].pageNo);
line.push(objectLogArray[nIndex2].objectId);
line.push(objectLogArray[nIndex2].resourceId);
line.push(objectLogArray[nIndex2].mediaType);
line.push(objectLogArray[nIndex2].actionType);
line.push(objectLogArray[nIndex2].actionValue);
line.push(objectLogArray[nIndex2].actionTime);
line.push(objectLogArray[nIndex2].locationX);
line.push(objectLogArray[nIndex2].locationY);
line.push(objectLogArray[nIndex2].locationHeight);
line.push(objectLogArray[nIndex2].locationWidth);
lines.push(line);
//alert("ObjectLog Line:" + JSON.stringify( line ) );
}
//alert("ObjectLog Lines:" + JSON.stringify( lines ) );
if( lines.length > 0 ){
objectLogJson = "{ header:[\"actionDate\",\"pageNo\",\"objectId\",\"resourceId\",\"mediaType\",\"actionType\",\"actionValue\",\"actionTime\",\"locationX\",\"locationY\",\"locationHeight\",\"locationWidth\"],";
objectLogJson = objectLogJson + "lines:";
objectLogJson = objectLogJson + JSON.stringify( lines );
objectLogJson = objectLogJson + "}";
//alert("JSON:" + objectLogJson);
}
}
}
var params = {
sid: ClientData.userInfo_sid(),
......@@ -2446,7 +2520,8 @@ function RegisterLog() {
readingEndDate: dateEnd.jpDateTimeString1(),
readingTime: arrContentLogs[nIndex].readingTime,
deviceTypeId: 4,
pageLog: pageLogJson
pageLog: pageLogJson,
objectLog: objectLogJson
};
avwCmsApiSync(ClientData.userInfo_accountPath(), "contentReadingLog", 'post', params,
null,
......
abvw/common/json/sys/conf.json
......@@ -2,17 +2,16 @@
"apiUrl" : "http://web3.agentec.jp/acms/{0}/abvapi",
"apiLoginUrl" : "http://web3.agentec.jp/acms/nuabvapi",
"apiResourceDlUrl" : "http://web3.agentec.jp/acms/{0}/dl",
"bookShelfCount": 15,
"bookShelfCount" : 15,
"bookListCount" : 15,
"screenlockTimeDefault" : 30,
"pushPageCount" : 5,
"pushTimePeriod" : 60,
"debug" : true,
"loginPage" : "index.html",
"anonymousLoginFlg" : false,
"anonymousLoginPath" : "abetest",
"anonymousLoginId" : "nologin",
"anonymousLoginFlg" : true,
"anonymousLoginPath" : "abetest3",
"anonymousLoginId" : "webuser",
"appName" : "ABookWebCL",
"appVersion" : "0.0.1"
}
abvw/js/contentview.js
......@@ -1023,7 +1023,7 @@ function showErrorScreen() {
function changePage(page_index) {
//abe スライダーのページ移動
alert("changePage:" + page_index);
//alert("changePage:" + page_index);
// Make sure page_index is number
page_index = Number(page_index);
......@@ -1045,6 +1045,10 @@ function changePage(page_index) {
}
//End Function : No.4 - Editor : Long - Date : 08/19/2013
else{
//ページ閲覧ログセット
SetPageLog( contentID, page_index);
// Clear canvas offscreen
clearCanvas(document.getElementById("offscreen"));
......@@ -1924,8 +1928,10 @@ var isPendingContentBGM = false;
function changePageWithoutSlide(pageMove) {
//abe 確認できない
//abe コンテンツリンクで移動時
alert("changePageWithoutSlide:" + pageMove);
//ページ閲覧ログセット
SetPageLog( contentID, pageMove);
disableAllControl();
var isExistBGMPageContent = false;
......@@ -2739,6 +2745,7 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.visible,
obj.mediaFile,
obj.media,
obj.mediaResourceId,
obj.objectId
);
} else if (obj.actionType == 2) {
......@@ -2753,6 +2760,8 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.height,
obj.visible,
obj.audioFile,
obj.audio,
obj.audioResourceId,
obj.objectId
);
} else if (obj.actionType == 3) { /*open new url */
......@@ -2783,6 +2792,7 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.height,
obj.visible,
obj.imagePreview,
obj.imagePreviewResourceIds,
obj.objectId
);
} else if (obj.actionType == 5) { /*jump page */
......@@ -2874,6 +2884,8 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.replyLimit,
obj.fullScreen,
obj.saveAs,
obj.resourceId,
obj.enquete,
obj.objectId
);
}
......@@ -2908,6 +2920,7 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.height,
obj.visible,
obj.audioFile,
obj.audioResourceId,
obj.playType,
obj.objectId
);
......@@ -3042,6 +3055,8 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.replyLimit,
obj.fullScreen,
obj.saveAs,
obj.resourceId,
obj.enquete,
obj.objectId
);
}
......
abvw/js/contentview_CreateObjects.js
......@@ -178,10 +178,9 @@ PageObject.prototype.setup = function (mediaType, actionType, id, imageUrl, x, y
this.visible = visible;
this.imageUrl = imageUrl;
this.image = new Image();
this.image.src = this.imageUrl;
this.objectId;
this.objectId = objectId;
};
......@@ -461,7 +460,7 @@ var object3d = function (mediaType, actionType, id, imageUrl, x, y, w, h, hCnt,
this.action = function (imagePt){
//abe
alert("object3d");
//alert("object3d");
if(_3dAction == _3dActionType.TouchStart_MouseDown){
OnMouseDown3D(id, imagePt, x, y);
......@@ -471,6 +470,24 @@ var object3d = function (mediaType, actionType, id, imageUrl, x, y, w, h, hCnt,
}
else if(_3dAction == _3dActionType.TouchEnd_MouseUp){
OnMouseEnd3D(id, hCnt, vCnt);
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = "";
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
}
};
};
......@@ -493,10 +510,28 @@ var listImage = function (mediaType, id, imageUrl, x, y, w, h, visible, imageObj
this.setup(mediaType, null, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
if (triggerType == '1') {
//abe
alert("listImage");
//alert("listImage triggerType=1");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
//objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = "";
objectLog.actionValue = "";
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
//SetObjectLog(contentID, objectLog);
//---
if (triggerType == '1') {
mediaType4_changeImage++;
/* check index bigger than length object */
......@@ -504,6 +539,10 @@ var listImage = function (mediaType, id, imageUrl, x, y, w, h, visible, imageObj
mediaType4_changeImage = 0;
}
//リソースIDセット
objectLog.resourceId = imageObjects[mediaType4_changeImage].resourceId;
SetObjectLog(contentID, objectLog);
/* draw image */
var imageObj = new Image();
imageObj.onload = function () {
......@@ -513,6 +552,7 @@ var listImage = function (mediaType, id, imageUrl, x, y, w, h, visible, imageObj
flip();
};
imageObj.src = imageObjects[mediaType4_changeImage].fileName;
}
};
};
......@@ -522,10 +562,8 @@ listImage.prototype = new PageObject();
var listVideo = function (mediaType, id, imageUrl, x, y, w, h, visible, videoObjects, objectId) {
this.setup(mediaType, null, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
alert("listVideo");
//alert("listVideo");
};
};
listVideo.prototype = new PageObject();
......@@ -537,7 +575,22 @@ var trigger = function (mediaType, actionType, id, imageUrl, x, y, w, h, index,
// draw object
//abe
alert("trigger:" + + getPageIndex() + " id:" + id);
//alert("trigger:" + + getPageIndex() + " id:" + id);
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = "";
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
for (var nIndex = 0; nIndex < objType4_5.length; nIndex++) {
for (var nIndex1 = 0; nIndex1 < objType4_5[nIndex].dataObjects.length; nIndex1++) {
......@@ -545,14 +598,27 @@ var trigger = function (mediaType, actionType, id, imageUrl, x, y, w, h, index,
&& objType4_5[nIndex].id == target) {
if (objType4_5[nIndex].mediaType == '4') { /*image*/
changeImageType4(objType4_5, nIndex, nIndex1);
//詳細ログ用 画像なので0セット
objectLog.actionTime = "0";
//リソースID
objectLog.resourceId = objType4_5[nIndex].dataObjects[nIndex1].resourceId;
} else { /* video */
stopAllAudio();
showVideoObject(objType4_5[nIndex].x, objType4_5[nIndex].y, objType4_5[nIndex].width, objType4_5[nIndex].height, objType4_5[nIndex].dataObjects[nIndex1].fileName, false);
//詳細ログ用 動画なのでダミーで１以上
objectLog.actionTime = "1";
//リソースID
objectLog.resourceId = objType4_5[nIndex].dataObjects[nIndex1].resourceId;
}
break;
}
}
}
//詳細ログ格納
SetObjectLog(contentID, objectLog);
//---
};
};
trigger.prototype = new PageObject();
......@@ -564,13 +630,29 @@ var htmlLinkButton = function (mediaType, actionType, id, imageUrl, x, y, w, h,
this.action = function () {
//abe
alert("htmlLinkButton");
//alert("htmlLinkButton");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = "";
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
/*stop audio on page */
stopAllAudio();
if (resourceUrl != "") {
showHtml(resourceUrl);
showDialog(true);
}
......@@ -580,7 +662,7 @@ htmlLinkButton.prototype = new PageObject();
function showHtml(url){
//abe
alert("showHtml");
//alert("showHtml");
var $container = $('#dialog');
......@@ -619,13 +701,30 @@ function showHtml(url){
});
}
var anket = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, questionNo, replyLimit, fullscreen, saveAs, objectId) {
var anket = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, questionNo, replyLimit, fullscreen, saveAs, resourceId, enquete, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
alert("anket");
//alert("anket");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = resourceId;
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = enquete; //objectNameのほうが良かった
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
/*stop audio on page */
stopAllAudio();
......@@ -647,26 +746,68 @@ anket.prototype = new PageObject();
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
/* mediaType=3 Audio object : extends PageObject */
var audioType3 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, audioFile, playType, objectId) {
var audioType3 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, audioFile, audioResourceId, playType, objectId) {
if (playType == "0") {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
//alert("audioType3_0");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = audioResourceId;
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = "";
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
createAudio(audioFile, playType);
};
}
else {
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
if(playType == '2' || playType == 2){
//
}
else{
//abe
//alert("audioType3_x");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = audioResourceId;
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = "";
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
createAudio(audioFile, playType);
}
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
this.setup(mediaType, actionType, id, null, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//
};
}
};
......@@ -678,7 +819,24 @@ var jumpPage = function (mediaType, actionType, id, imageUrl, x, y, w, h, visibl
this.action = function () {
//abe
alert("jumpPage");
//alert("jumpPage");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = jumpPage; //ページ飛び先
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
if ((Number(jumpPage) - 1) != getPageIndex()) {
createLockLayout(true);
......@@ -693,6 +851,24 @@ jumpPage.prototype = new PageObject();
var sendMail = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, emailSubject, emailAddress, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = emailAddress; //メールアドレス
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
MailTo(emailAddress, emailSubject);
};
};
......@@ -704,7 +880,24 @@ var openPopUp = function (mediaType, actionType, id, imageUrl, x, y, w, h, visib
this.action = function () {
//abe
alert("openPopUp:" + getPageIndex() + " id:" + id);
//alert("openPopUp:" + getPageIndex() + " id:" + objectId);
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = "";
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
isOpenPopUpText = true;
var pt1 = imageToScreen(x, y + h / 2);
......@@ -726,6 +919,24 @@ var moveContentParam = {};
var moveToContent = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, contentId, pageNo, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = contentId;
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
/* set end log */
SetEndLog(contentID);
RegisterLog();
......@@ -942,7 +1153,24 @@ var videoType2 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visi
this.action = function () {
//abe
alert("videoType2:" + getPageIndex());
//alert("videoType2:" + getPageIndex());
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = media; //mediaにリソースIDが入っている
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = "";
objectLog.actionTime = "1";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
/*stop audio on page */
stopAllAudio();
......@@ -978,14 +1206,31 @@ var imageNoAction = function (mediaType, actionType, id, imageUrl, x, y, w, h, v
imageNoAction.prototype = new PageObject();
/* mediaType=1 Video object : extends PageObject */
var videoType1 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, mediaFile, media, objectId) {
var videoType1 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, mediaFile, media, mediaResourceId, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
if (media != '') {
//abe
alert("videoType1:" + + getPageIndex());
//alert("videoType1:" + + getPageIndex());
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = mediaResourceId; //リソースID
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = media; //リソースファイル名
objectLog.actionTime = "1";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
if (media != '') {
/* stop all audio on page */
stopAllAudio();
......@@ -1005,12 +1250,28 @@ var videoType1 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visi
videoType1.prototype = new PageObject();
/* mediaType=1 and actionType = 2 Audio object : extends PageObject */
var audioType1 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, audioFile, objectId) {
var audioType1 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, audioFile, audio, audioResourceId, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
alert("audioType1");
//alert("audioType1");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = audioResourceId; //リソースID
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = audio;
objectLog.actionTime = "1";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
createAudio(audioFile, "0")
};
......@@ -1023,20 +1284,65 @@ var linkURL = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible
this.action = function () {
//abe
alert("linkURL");
window.open(linkUrl, "_blank", "new window");
//alert("linkURL");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionValue = linkUrl;
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
SetObjectLog(contentID, objectLog);
//---
window.open(linkUrl, "_blank", "new window, scrollbars=yes");
};
};
linkURL.prototype = new PageObject();
/* mediaType = 1 and actionType = 4 imagePreview object*/
var imagePreview = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, imagePreview, objectId) {
var imagePreview = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, imagePreview, imagePreviewResourceIds, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
alert("imagePreview");
//alert("imagePreview");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
objectLog.pageNo = getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
//objectLog.actionValue = "";
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
//プレビュー画像のリソースIDカンマ区切りでセット
var actionVal = "";
if(imagePreviewResourceIds){
for (var nIndex = 0; nIndex < imagePreviewResourceIds.length; nIndex++) {
if( nIndex > 0 ){
actionVal = actionVal + ",";
}
actionVal = actionVal + imagePreviewResourceIds[nIndex];
}
}
objectLog.actionValue = actionVal;
SetObjectLog(contentID, objectLog);
//---
createImagePreview();
......
abvw/js/contentview_Events.js
......@@ -304,7 +304,7 @@ function nextPage_click() {
if (getContent().hasNextPage()) {
//abe
alert("nextPage_click:" + contentID );
//alert("nextPage_click:" + contentID );
SetPageLog( contentID, getPageIndex() + 1);
playBGMOfContent();
......@@ -330,7 +330,7 @@ function prevPage_click() {
if (getContent().hasPreviousPage()) {
//abe
alert("prevPage_click:" + contentID);
//alert("prevPage_click:" + contentID);
SetPageLog( contentID, getPageIndex() - 1);
playBGMOfContent();
......@@ -359,7 +359,7 @@ function firstPage_click() {
else{
//abe
alert("firstPage_click:" + contentID );
//alert("firstPage_click:" + contentID );
SetPageLog( contentID, 0 );
playBGMOfContent();
......@@ -430,7 +430,7 @@ function lastPage_click() {
else{
//abe
alert("lastPage_click:" + contentID );
//alert("lastPage_click:" + contentID );
SetPageLog( contentID, totalPage - 1 );
playBGMOfContent();
......
abvw/js/contentview_GetData.js
......@@ -165,13 +165,14 @@ function getMediaType1(iValueObj) {
}
/*get video file */
if (iValueObj.action.video) {
pageObject['mediaFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.video);
pageObject['media'] = iValueObj.action.video;
pageObject['mediaResourceId'] = iValueObj.action.resourceId;
} else {
pageObject['mediaFile'] = '';
pageObject['media'] = '';
pageObject['mediaResourceId'] = '';
}
} else if (iValueObj.action.actionType == 2) {
......@@ -190,8 +191,12 @@ function getMediaType1(iValueObj) {
} else {
pageObject['audioFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.music);
}
pageObject['audio'] = iValueObj.action.music;
pageObject['audioResourceId'] = iValueObj.action.resourceId;
} else {
pageObject['audioFile'] = '';
pageObject['audio'] = "";
pageObject['audioResourceId'] = "";
}
} else if (iValueObj.action.actionType == 3) {
......@@ -239,14 +244,15 @@ function getMediaType1(iValueObj) {
/*get Image Preview */
var dataResourceImage = iValueObj.action.preview;
var dataImageFromResource = [];
pageObject['imagePreviewResourceIds'] = [];
//START TRB00077 - Editor : Long - Date: 09/24/2013- Summary : Display image preview no image
if(dataResourceImage){
for (var nIndex = 0; nIndex < dataResourceImage.length; nIndex++) {
dataImageFromResource.push(getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(dataResourceImage[nIndex]));
}
pageObject['imagePreviewResourceIds'] = iValueObj.action.resourceIds;
}
//END TRB00077 - Editor : Long - Date: 09/24/2013- Summary : Display image preview no image
pageObject['imagePreview'] = dataImageFromResource;
} else if (iValueObj.action.actionType == 5) {
......@@ -349,6 +355,8 @@ function getMediaType1(iValueObj) {
pageObject["replyLimit"] = iValueObj.action.replyLimit;
pageObject["fullScreen"] = iValueObj.action.fullScreen;
pageObject["saveAs"] = iValueObj.action.saveAs;
pageObject["resourceId"] = iValueObj.action.resourceId;
pageObject["enquete"] = iValueObj.action.enquete;
//pageObject["objectId"] = iValueObj.action.objectId;
}
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
......@@ -372,7 +380,7 @@ function getMediaType2(iValueObj) {
/*get mediaInfo */
if (iValueObj.mediaInfo.resourceId) {
pageObject['mediaFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId;
pageObject['media'] = iValueObj.mediaInfo.resourceId;
pageObject['media'] = iValueObj.mediaInfo.resourceId; //video1のほうはリソース名で取得している。IDのほうが良いのでは。
} else {
pageObject['mediaFile'] = '';
pageObject['media'] = '';
......@@ -421,8 +429,10 @@ function getMediaType3(iValueObj) {
} else {
pageObject['audioFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId;
}
pageObject['audioResourceId'] = iValueObj.mediaInfo.resourceId;
} else {
pageObject['audioFile'] = '';
pageObject['audioResourceId'] = '';
}
/*get playtype */
......@@ -722,7 +732,7 @@ function getMediaType11(iValueObj) {
//Get object Info
pageObject['mediaType'] = iValueObj.mediaType;
pageObject['id'] = "MediaType9_" + iValueObj.mediaInfo.resourceId;
pageObject['id'] = "MediaType11_" + iValueObj.mediaInfo.resourceId;
pageObject['actionType'] = iValueObj.action.actionType;
//Get object Location
......@@ -744,7 +754,9 @@ function getMediaType11(iValueObj) {
pageObject["replyLimit"] = iValueObj.action.replyLimit;
pageObject["fullScreen"] = iValueObj.action.fullScreen;
pageObject["saveAs"] = iValueObj.action.saveAs;
pageObject["objectId"] = iValueObj.action.objectId;
pageObject["resourceId"] = resourceId;
pageObject["enquete"] = iValueObj.action.enquete;
//pageObject["objectId"] = iValueObj.action.objectId;
}
return pageObject;
......
abvw/js/header.js
......@@ -810,7 +810,9 @@ function initPushMessage()
);
// check new push message
if (isAnonymousLogin() == false ) {
getPushMessageNew();
}
};
// get time wait check new push message
......
abvw/js/home.js
......@@ -195,6 +195,9 @@ $(document).ready(function () {
//カタログエディション対応判定
if( ClientData.serviceOpt_catalog_edition() == 'Y'){
$('.tabUnit').hide();
//センタリングするようサイズ調整
$('#main').width(660);
} else {
$('.switchingTab .colright').hide();
}
......
abvw/js/login.js
......@@ -603,6 +603,10 @@ function initLoginAnonymousUser() {
ClientData.serviceOpt_catalog_edition(option.value);
} else if( option.serviceName == 'hibiyakadan_catalog' ) {
ClientData.serviceOpt_hibiyakadan_catalog(option.value);
} else if( option.serviceName == 'usable_readinglog_gps' ) {
ClientData.serviceOpt_usable_readinglog_gps(option.value);
} else if( option.serviceName == 'usable_readinglog_object' ) {
ClientData.serviceOpt_usable_readinglog_object(option.value);
}
});
// hide splash screen then move to home page
......
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