Skip to content

C
check
Commit d1a5398f by Masaru Abe
Options

日比谷対応

parent 98db55b3
Showing with 200 additions and 90 deletions
abvw/common/json/sys/conf.json
{ {
"apiUrl" : "http://web3.agentec.jp/acms/{0}/abvapi", "apiUrl" : "http://web3.agentec.jp/acms/{0}/abvapi",
"apiLoginUrl" : "http://web3.agentec.jp/acms/nuabvapi", "apiLoginUrl" : "http://web3.agentec.jp/acms/nuabvapi",
"apiResourceDlUrl" : "http://web3.agentec.jp/acms/{0}/dl", "apiResourceDlUrl" : "http://web3.agentec.jp/acms/{0}/dl",
"bookShelfCount": 15, "bookShelfCount" : 15,
"bookListCount" : 15, "bookListCount" : 15,
"screenlockTimeDefault" : 30, "screenlockTimeDefault" : 30,
"pushPageCount" : 5, "pushPageCount" : 5,
"pushTimePeriod" : 60, "pushTimePeriod" : 60,
"debug" : true, "debug" : true,
"loginPage" : "index.html", "loginPage" : "index.html",
"anonymousLoginFlg" : false, "anonymousLoginFlg" : true,
"anonymousLoginPath" : "abetest", "anonymousLoginPath" : "abetest3",
"anonymousLoginId" : "nologin", "anonymousLoginId" : "webuser",
"appName" : "ABookWebCL", "appName" : "ABookWebCL",
"appVersion" : "0.0.1" "appVersion" : "0.0.1"
}
}
abvw/js/contentview.js
...@@ -1022,8 +1022,8 @@ function showErrorScreen() { ...@@ -1022,8 +1022,8 @@ function showErrorScreen() {
/* move to page ?? */ /* move to page ?? */
function changePage(page_index) { function changePage(page_index) {
//abe スライダーのページ移動 //abe スライダーのページ移動
alert("changePage:" + page_index); //alert("changePage:" + page_index);
// Make sure page_index is number // Make sure page_index is number
page_index = Number(page_index); page_index = Number(page_index);
...@@ -1045,6 +1045,10 @@ function changePage(page_index) { ...@@ -1045,6 +1045,10 @@ function changePage(page_index) {
} }
//End Function : No.4 - Editor : Long - Date : 08/19/2013 //End Function : No.4 - Editor : Long - Date : 08/19/2013
else{ else{
//ページ閲覧ログセット
SetPageLog( contentID, page_index);
// Clear canvas offscreen // Clear canvas offscreen
clearCanvas(document.getElementById("offscreen")); clearCanvas(document.getElementById("offscreen"));
...@@ -1924,8 +1928,10 @@ var isPendingContentBGM = false; ...@@ -1924,8 +1928,10 @@ var isPendingContentBGM = false;
function changePageWithoutSlide(pageMove) { function changePageWithoutSlide(pageMove) {
//abe 確認できない //abe コンテンツリンクで移動時
alert("changePageWithoutSlide:" + pageMove); alert("changePageWithoutSlide:" + pageMove);
//ページ閲覧ログセット
SetPageLog( contentID, pageMove);
disableAllControl(); disableAllControl();
var isExistBGMPageContent = false; var isExistBGMPageContent = false;
...@@ -2739,6 +2745,7 @@ ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -2739,6 +2745,7 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.visible, obj.visible,
obj.mediaFile, obj.mediaFile,
obj.media, obj.media,
obj.mediaResourceId,
obj.objectId obj.objectId
); );
} else if (obj.actionType == 2) { } else if (obj.actionType == 2) {
...@@ -2753,6 +2760,8 @@ ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -2753,6 +2760,8 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.height, obj.height,
obj.visible, obj.visible,
obj.audioFile, obj.audioFile,
obj.audio,
obj.audioResourceId,
obj.objectId obj.objectId
); );
} else if (obj.actionType == 3) { /*open new url */ } else if (obj.actionType == 3) { /*open new url */
...@@ -2783,6 +2792,7 @@ ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -2783,6 +2792,7 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.height, obj.height,
obj.visible, obj.visible,
obj.imagePreview, obj.imagePreview,
obj.imagePreviewResourceIds,
obj.objectId obj.objectId
); );
} else if (obj.actionType == 5) { /*jump page */ } else if (obj.actionType == 5) { /*jump page */
...@@ -2874,6 +2884,8 @@ ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -2874,6 +2884,8 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.replyLimit, obj.replyLimit,
obj.fullScreen, obj.fullScreen,
obj.saveAs, obj.saveAs,
obj.resourceId,
obj.enquete,
obj.objectId obj.objectId
); );
} }
...@@ -2908,6 +2920,7 @@ ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -2908,6 +2920,7 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.height, obj.height,
obj.visible, obj.visible,
obj.audioFile, obj.audioFile,
obj.audioResourceId,
obj.playType, obj.playType,
obj.objectId obj.objectId
); );
...@@ -3042,6 +3055,8 @@ ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -3042,6 +3055,8 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.replyLimit, obj.replyLimit,
obj.fullScreen, obj.fullScreen,
obj.saveAs, obj.saveAs,
obj.resourceId,
obj.enquete,
obj.objectId obj.objectId
); );
} }
......
abvw/js/contentview_Events.js
...@@ -303,9 +303,9 @@ function nextPage_click() { ...@@ -303,9 +303,9 @@ function nextPage_click() {
if (getContent().hasNextPage()) { if (getContent().hasNextPage()) {
//abe //abe
alert("nextPage_click:" + contentID ); //alert("nextPage_click:" + contentID );
SetPageLog( contentID, getPageIndex() + 1); SetPageLog( contentID, getPageIndex() + 1);
playBGMOfContent(); playBGMOfContent();
playBGMOfPage(getPageIndex() + 1); playBGMOfPage(getPageIndex() + 1);
...@@ -329,9 +329,9 @@ function prevPage_click() { ...@@ -329,9 +329,9 @@ function prevPage_click() {
if (getContent().hasPreviousPage()) { if (getContent().hasPreviousPage()) {
//abe //abe
alert("prevPage_click:" + contentID); //alert("prevPage_click:" + contentID);
SetPageLog( contentID, getPageIndex() - 1); SetPageLog( contentID, getPageIndex() - 1);
playBGMOfContent(); playBGMOfContent();
playBGMOfPage(getPageIndex() - 1); playBGMOfPage(getPageIndex() - 1);
...@@ -358,9 +358,9 @@ function firstPage_click() { ...@@ -358,9 +358,9 @@ function firstPage_click() {
} }
else{ else{
//abe //abe
alert("firstPage_click:" + contentID ); //alert("firstPage_click:" + contentID );
SetPageLog( contentID, 0 ); SetPageLog( contentID, 0 );
playBGMOfContent(); playBGMOfContent();
playBGMOfPage(0); playBGMOfPage(0);
...@@ -429,9 +429,9 @@ function lastPage_click() { ...@@ -429,9 +429,9 @@ function lastPage_click() {
} }
else{ else{
//abe //abe
alert("lastPage_click:" + contentID ); //alert("lastPage_click:" + contentID );
SetPageLog( contentID, totalPage - 1 ); SetPageLog( contentID, totalPage - 1 );
playBGMOfContent(); playBGMOfContent();
playBGMOfPage(totalPage - 1); playBGMOfPage(totalPage - 1);
......
abvw/js/contentview_GetData.js
...@@ -165,13 +165,14 @@ function getMediaType1(iValueObj) { ...@@ -165,13 +165,14 @@ function getMediaType1(iValueObj) {
} }
/*get video file */ /*get video file */
if (iValueObj.action.video) { if (iValueObj.action.video) {
pageObject['mediaFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.video); pageObject['mediaFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.video);
pageObject['media'] = iValueObj.action.video; pageObject['media'] = iValueObj.action.video;
pageObject['mediaResourceId'] = iValueObj.action.resourceId;
} else { } else {
pageObject['mediaFile'] = ''; pageObject['mediaFile'] = '';
pageObject['media'] = ''; pageObject['media'] = '';
pageObject['mediaResourceId'] = '';
} }
} else if (iValueObj.action.actionType == 2) { } else if (iValueObj.action.actionType == 2) {
...@@ -190,8 +191,12 @@ function getMediaType1(iValueObj) { ...@@ -190,8 +191,12 @@ function getMediaType1(iValueObj) {
} else { } else {
pageObject['audioFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.music); pageObject['audioFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.music);
} }
pageObject['audio'] = iValueObj.action.music;
pageObject['audioResourceId'] = iValueObj.action.resourceId;
} else { } else {
pageObject['audioFile'] = ''; pageObject['audioFile'] = '';
pageObject['audio'] = "";
pageObject['audioResourceId'] = "";
} }
} else if (iValueObj.action.actionType == 3) { } else if (iValueObj.action.actionType == 3) {
...@@ -239,14 +244,15 @@ function getMediaType1(iValueObj) { ...@@ -239,14 +244,15 @@ function getMediaType1(iValueObj) {
/*get Image Preview */ /*get Image Preview */
var dataResourceImage = iValueObj.action.preview; var dataResourceImage = iValueObj.action.preview;
var dataImageFromResource = []; var dataImageFromResource = [];
pageObject['imagePreviewResourceIds'] = [];
//START TRB00077 - Editor : Long - Date: 09/24/2013- Summary : Display image preview no image //START TRB00077 - Editor : Long - Date: 09/24/2013- Summary : Display image preview no image
if(dataResourceImage){ if(dataResourceImage){
for (var nIndex = 0; nIndex < dataResourceImage.length; nIndex++) { for (var nIndex = 0; nIndex < dataResourceImage.length; nIndex++) {
dataImageFromResource.push(getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(dataResourceImage[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 //END TRB00077 - Editor : Long - Date: 09/24/2013- Summary : Display image preview no image
pageObject['imagePreview'] = dataImageFromResource; pageObject['imagePreview'] = dataImageFromResource;
} else if (iValueObj.action.actionType == 5) { } else if (iValueObj.action.actionType == 5) {
...@@ -349,6 +355,8 @@ function getMediaType1(iValueObj) { ...@@ -349,6 +355,8 @@ function getMediaType1(iValueObj) {
pageObject["replyLimit"] = iValueObj.action.replyLimit; pageObject["replyLimit"] = iValueObj.action.replyLimit;
pageObject["fullScreen"] = iValueObj.action.fullScreen; pageObject["fullScreen"] = iValueObj.action.fullScreen;
pageObject["saveAs"] = iValueObj.action.saveAs; pageObject["saveAs"] = iValueObj.action.saveAs;
pageObject["resourceId"] = iValueObj.action.resourceId;
pageObject["enquete"] = iValueObj.action.enquete;
//pageObject["objectId"] = iValueObj.action.objectId; //pageObject["objectId"] = iValueObj.action.objectId;
} }
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary : //End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
...@@ -372,7 +380,7 @@ function getMediaType2(iValueObj) { ...@@ -372,7 +380,7 @@ function getMediaType2(iValueObj) {
/*get mediaInfo */ /*get mediaInfo */
if (iValueObj.mediaInfo.resourceId) { if (iValueObj.mediaInfo.resourceId) {
pageObject['mediaFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + 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 { } else {
pageObject['mediaFile'] = ''; pageObject['mediaFile'] = '';
pageObject['media'] = ''; pageObject['media'] = '';
...@@ -421,8 +429,10 @@ function getMediaType3(iValueObj) { ...@@ -421,8 +429,10 @@ function getMediaType3(iValueObj) {
} else { } else {
pageObject['audioFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId; pageObject['audioFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId;
} }
pageObject['audioResourceId'] = iValueObj.mediaInfo.resourceId;
} else { } else {
pageObject['audioFile'] = ''; pageObject['audioFile'] = '';
pageObject['audioResourceId'] = '';
} }
/*get playtype */ /*get playtype */
...@@ -722,7 +732,7 @@ function getMediaType11(iValueObj) { ...@@ -722,7 +732,7 @@ function getMediaType11(iValueObj) {
//Get object Info //Get object Info
pageObject['mediaType'] = iValueObj.mediaType; pageObject['mediaType'] = iValueObj.mediaType;
pageObject['id'] = "MediaType9_" + iValueObj.mediaInfo.resourceId; pageObject['id'] = "MediaType11_" + iValueObj.mediaInfo.resourceId;
pageObject['actionType'] = iValueObj.action.actionType; pageObject['actionType'] = iValueObj.action.actionType;
//Get object Location //Get object Location
...@@ -744,7 +754,9 @@ function getMediaType11(iValueObj) { ...@@ -744,7 +754,9 @@ function getMediaType11(iValueObj) {
pageObject["replyLimit"] = iValueObj.action.replyLimit; pageObject["replyLimit"] = iValueObj.action.replyLimit;
pageObject["fullScreen"] = iValueObj.action.fullScreen; pageObject["fullScreen"] = iValueObj.action.fullScreen;
pageObject["saveAs"] = iValueObj.action.saveAs; 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; return pageObject;
......
abvw/js/header.js
...@@ -810,7 +810,9 @@ function initPushMessage() ...@@ -810,7 +810,9 @@ function initPushMessage()
); );
// check new push message // check new push message
if (isAnonymousLogin() == false ) {
getPushMessageNew(); getPushMessageNew();
}
}; };
// get time wait check new push message // get time wait check new push message
......
abvw/js/home.js
...@@ -195,6 +195,9 @@ $(document).ready(function () { ...@@ -195,6 +195,9 @@ $(document).ready(function () {
//カタログエディション対応判定 //カタログエディション対応判定
if( ClientData.serviceOpt_catalog_edition() == 'Y'){ if( ClientData.serviceOpt_catalog_edition() == 'Y'){
$('.tabUnit').hide(); $('.tabUnit').hide();
//センタリングするようサイズ調整
$('#main').width(660);
} else { } else {
$('.switchingTab .colright').hide(); $('.switchingTab .colright').hide();
} }
......
abvw/js/login.js
...@@ -603,6 +603,10 @@ function initLoginAnonymousUser() { ...@@ -603,6 +603,10 @@ function initLoginAnonymousUser() {
ClientData.serviceOpt_catalog_edition(option.value); ClientData.serviceOpt_catalog_edition(option.value);
} else if( option.serviceName == 'hibiyakadan_catalog' ) { } else if( option.serviceName == 'hibiyakadan_catalog' ) {
ClientData.serviceOpt_hibiyakadan_catalog(option.value); 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 // 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