Skip to content

C
check
Commit 721c5295 by vietdo
Options

#15800 試験（ActionType=14）のJSON解析とビューア画面への表示

parent 86419b42
Showing with 201 additions and 102 deletions
abvw/common/js/common.js
......@@ -221,6 +221,8 @@ COMMON.Keys = {
serviceOpt_apns: 'apns',
// Session :事業者オプション(serviceOpt)_任意のプッシュメッセージ:Char(Y：可能, N：不可)
serviceOpt_usable_push_message: 'usable_push_message',
// Session :事業者オプション(serviceOpt)_任意のプッシュメッセージ:Char(Y：可能, N：不可)
serviceOpt_encryption: 'encryption',
// Session :共通(common)_コンテンツID:Integer
common_contentId: 'common_contentId',
// Local :共通(common)_コンテンツID:Integer
......@@ -1271,6 +1273,15 @@ var ClientData = {
}
},
// Session :事業者オプション(serviceOpt)_任意のプッシュメッセージ:Char(Y：可能, N：不可)
serviceOpt_encryption: function (data) {
if (arguments.length > 0) {
SessionStorageUtils.set(COMMON.Keys.serviceOpt_encryption, data);
} else {
return SessionStorageUtils.get(COMMON.Keys.serviceOpt_encryption);
}
},
// Session :事業者オプション(serviceOpt)_カタログエディション:Char(Y：可能, N：不可)
serviceOpt_catalog_edition: function (data) {
if (arguments.length > 0) {
......
abvw/inc_contentview.html
<!-- ビューアエリア FROM -->
<div id="wrapper" style="">
<!--Viewer component is added here -->
<div id="overlay" class="web_dialog_overlay"> </div>
<div id="dialog" class="web_dialog"> </div>
......@@ -42,7 +42,7 @@
<span class="gloupe">
<a id="imgmemo" class="memoDisplay" title="メモ表示" lang="txtTooltipShowMemo"> </a>
<a id="imgaddmemo" class="memoAdd" title="メモ追加" lang="txtTooltipAddMemo"> </a>
</span>
</span>
<span class="lgloupe">
<a id="imgmarking" class="marking" title="マーキング" lang="txtTooltipShowMarking"> </a>
<a id="imgmarkingtoolbar" class="markingToolbar" title="マーキングツールバー表示" lang="txtTooltipShowMarkingTool"> </a>
......@@ -87,7 +87,7 @@
<!-- ================================================================================== -->
<!-- Marking group [start]
<!-- ================================================================================== -->
<!-- Marking [start] -->
<aside class="markingBox" id="dlgMarking">
<h1 class="markingBoxHd">
......@@ -106,7 +106,7 @@
</ul>
<a id="dlgMarking_dspPgClear" class="clearbtn lang" lang="dspPgClear">このページクリア</a>
<a id="dlgMarking_dspSave" class="savebtn lang" lang="dspSave" >保存</a>
<a id="dlgMarking_dspCancel" class="cancelbtn lang" lang="dspCancel">キャンセル</a>
<a id="dlgMarking_dspCancel" class="cancelbtn lang" lang="dspCancel">キャンセル</a>
</div>
</aside>
<!-- Marking [ end ] -->
......@@ -138,7 +138,7 @@
</li>
<li>
<a id="text_dlgGomu_rdo1">
<input type="radio" id="dlgGomu_rdo1" name="rdoSize" value="1" checked="checked"/>
<input type="radio" id="dlgGomu_rdo1" name="rdoSize" value="1" checked="checked"/>
<span><label for="dlgGomu_rdo1" class="lang" lang="txtMkgS">小</label></span>
<img class="sizeS" src="img/viewer/en_s.png" alt="">
</a>
......@@ -154,14 +154,14 @@
</div>
</div>
<!-- Eraser [ end ] -->
<!-- Maker [ start ] -->
<div id="dlgMaker" class="rayermenu1">
<ul class="popcolumnL">
<li>
<a id="marker-oversize-text">
<input type="radio" id="maker-size-oversize" name="maker-size" />
<span><label for="maker-size-oversize" class="lang" lang="txtMkgSB">XL</label></span>
<span><label for="maker-size-oversize" class="lang" lang="txtMkgSB">XL</label></span>
<img class="sizeXL" src="img/viewer/en_xl.png" alt="">
</a>
</li>
......@@ -217,14 +217,14 @@
</div>
</div>
<!-- Maker [ end ] -->
<!-- Pen [ start ] -->
<div id="dlgPen" class="rayermenu1">
<ul class="popcolumnL">
<li>
<a id="pen-oversize-text">
<input type="radio" id="pen-size-oversize" name="maker-size"/>
<span><label for="pen-size-oversize" class="lang" lang="txtMkgSB">XL</label></span>
<span><label for="pen-size-oversize" class="lang" lang="txtMkgSB">XL</label></span>
<img class="sizeXL" src="img/viewer/en_xl.png" alt="">
</a>
</li>
......@@ -280,17 +280,17 @@
</div>
</div>
<!-- Pen [ end ] -->
<div id="dlgOverlay"> </div>
<div id="dlgOverlay"> </div>
<!-- ================================================================================== -->
<!-- Marking group [end]
<!-- ================================================================================== -->
<!-- ================================================================================== -->
<!-- Footer [start]
<!-- ================================================================================== -->
<footer id="footer_toolbar_1" class="footer">
<div class="ftinner">
<div class="ftinner">
<!-- slider transition sizing -->
<div class="ftLcolumn">
<!-- slider [start] -->
......@@ -301,7 +301,7 @@
<a id="control_process" class="sld02"><div id="slider_page" > </div></a>
</div>
<!-- slider [end] -->
<!-- transition [start] -->
<!-- temporary tool tip - must be change "lang" -->
<div id="control_movepage" class="transition fix">
......@@ -311,7 +311,7 @@
<a id="lastpage" class="last"> </a>
</div>
<!-- transition [end] -->
<!-- sizing [start] -->
<!-- temporary tool tip - must be change "lang" -->
<div id="control_zoom" class="sizing">
......@@ -321,7 +321,7 @@
</div>
<!-- sizing [end] -->
</div>
<!-- toolbar -->
<div class="ftRcolumn">
<a id="control_screen" class="toolbar"> </a>
......@@ -334,32 +334,32 @@
<a id="control_screen_2" class="toolbar_close" style=""> </a>
<!-- ================================================================================== -->
<!-- Footer [end]
<!-- ================================================================================== -->
<!-- ================================================================================== -->
<section id="bgmConfirm" class="sectionDeleteConfirm" style="display:none;">
<h1 class="lang" lang=""> </h1>
<p class="message lang" lang="msgBGMPlayConfirm" id="txtAudio">このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？</p>
<p class="message lang" lang="msgBGMPlayConfirm" id="txtAudio">このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？</p>
<p class="deletebtn" ><a id="bgmConfirm_dspOK" lang="dspOK" class="ok_audio lang">ＯＫ</a></p>
</section>
<section id="bgmConfirm_page" class="sectionDeleteConfirm" style="display:none;">
<h1 class="lang" lang=""> </h1>
<p class="message lang" lang="msgBGMPlayConfirm" id="txtAudio_page">このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？</p>
<p class="message lang" lang="msgBGMPlayConfirm" id="txtAudio_page">このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？</p>
<p class="deletebtn" ><a id="bgmConfirm_dspOK_page" lang="dspOK" class="ok_audio lang">ＯＫ</a></p>
</section>
<section id="contentVideoConfirm" class="sectionDeleteConfirm" style="display:none;">
<h1 class="lang" lang=""> </h1>
<p class="message lang" lang="txtMediaAutoPlayWarning" id="txtContentVideo">Confirm Play Video</p>
<p class="message lang" lang="txtMediaAutoPlayWarning" id="txtContentVideo">Confirm Play Video</p>
<p class="deletebtn" ><a id="contentVideoConfirm_OK" lang="dspOK" class="ok_audio lang">ＯＫ</a></p>
</section>
<section id="contentAudioConfirm" class="sectionDeleteConfirm" style="display:none;">
<h1 class="lang" lang=""> </h1>
<p class="message lang" lang="txtMediaAutoPlayWarning" id="txtContentAudio">Confirm Play Audio</p>
<p class="message lang" lang="txtMediaAutoPlayWarning" id="txtContentAudio">Confirm Play Audio</p>
<p class="deletebtn" ><a id="contentAudioConfirm_OK" lang="dspOK" class="ok_audio lang">ＯＫ</a></p>
</section>
</div>
<!-- ビューアエリア TO -->
......@@ -382,6 +382,7 @@
<script type="text/javascript" src="./js/contentview_PopupText.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Paint.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Anket.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Exam.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_3d.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_ContentTypeNone.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_ImagePreview.js?__UPDATEID__"></script>
......
abvw/js/contentview.js
This source diff could not be displayed because it is too large. You can view the blob instead.
abvw/js/contentview_CreateObjects.js
......@@ -980,6 +980,91 @@ CONTENTVIEW_CREATEOBJECT.anket = function (mediaType, actionType, id, imageUrl,
};
CONTENTVIEW_CREATEOBJECT.anket.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
CONTENTVIEW_CREATEOBJECT.exam = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, showResult, sendResult, replyLimit, fullscreen, saveAs, resourceId, enquete, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
objectLog.pageNo = CONTENTVIEW_GETDATA.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;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
/*stop audio on page */
CONTENTVIEW.stopAllAudio();
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "/?abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId();
if(ClientData.isStreamingMode()){
//ストリーミング
url = url + "&isStreaming=true";
}
var isFullScreen = false;
if(parseInt(fullscreen) == 1){
isFullScreen = true;
}
CONTENTVIEW_EXAM.showExam(url, isFullScreen, objectId);
CONTENTVIEW_GENERAL.showDialog(true);
};
};
CONTENTVIEW_CREATEOBJECT.exam.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
CONTENTVIEW_CREATEOBJECT.quiz = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, replyLimit, fullscreen, saveAs, resourceId, enquete, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
objectLog.pageNo = CONTENTVIEW_GETDATA.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;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
/*stop audio on page */
CONTENTVIEW.stopAllAudio();
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "/?abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId();
if(ClientData.isStreamingMode()){
//ストリーミング
url = url + "&isStreaming=true";
}
var isFullScreen = false;
if(parseInt(fullscreen) == 1){
isFullScreen = true;
}
CONTENTVIEW_EXAM.showExam(url, isFullScreen, objectId);
CONTENTVIEW_GENERAL.showDialog(true);
};
};
CONTENTVIEW_CREATEOBJECT.quiz.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
/* mediaType=3 Audio object : extends PageObject */
......@@ -2383,7 +2468,6 @@ CONTENTVIEW_CREATEOBJECT.createTextConfirmAudio = function() {
CONTENTVIEW_CREATEOBJECT.createPage = function(pageNumber, pageImage, pageObjects, onCompleteFunc) {
//abe 次のページを作成している
console.log("CreateObj_createPage:" + pageNumber);
var page = new CONTENTVIEW.ContentPage(pageNumber, pageImage);
/* add page Object */
//Start Function: No.12
......
abvw/js/contentview_General.js
......@@ -3,11 +3,11 @@
var CONTENTVIEW_GENERAL = {};
CONTENTVIEW_GENERAL.getNextContent = function(){
return CONTENTVIEW_GENERAL.nextContent;
return CONTENTVIEW_GENERAL.nextContent;
};
CONTENTVIEW_GENERAL.getPrevContent = function(){
return CONTENTVIEW_GENERAL.prevContent;
return CONTENTVIEW_GENERAL.prevContent;
};
//End Function : No.9
......@@ -202,16 +202,16 @@ CONTENTVIEW_GENERAL.enableAllControl = function() {
//Start Function: No.12
if (CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile) {
$("#slider_page").slider("option", "disabled", false);
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
COMMON.enable('#txtSearch', '#txtSlider');
}
COMMON.enable('#txtSearch', '#txtSlider');
}
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
COMMON.enable('#txtSlider');
}
}
}
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() == false && CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid() == false) {
$('#button_next_canvas').css('display', 'block');
$('#button_pre_canvas').css('display', 'block');
......@@ -330,7 +330,7 @@ CONTENTVIEW_GENERAL.enableAllControl = function() {
}
}
}
if( ClientData.isGetitsMode() == true ){
$('#imgHome').unbind('click');
$('#imgHome').removeClass();
......@@ -341,7 +341,7 @@ CONTENTVIEW_GENERAL.enableAllControl = function() {
$('#imgBack').removeClass();
$('#imgBack').addClass('back_off');
}
CONTENTVIEW.checkExistNextPrePage();
};
......@@ -353,14 +353,14 @@ CONTENTVIEW_GENERAL.clearCanvas = function(targetCanvas) {
};
CONTENTVIEW_GENERAL.showDialog = function(modal) {
if(ClientData.isStreamingMode() || CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile()){
$("#dialog").css('z-index', 998);
$("#dialog").fadeIn(300);
} else {
$("#overlay").show();
$("#dialog").fadeIn(300);
if (modal) {
$("#overlay").unbind("click");
}
......@@ -370,7 +370,7 @@ CONTENTVIEW_GENERAL.showDialog = function(modal) {
});
}
}
};
CONTENTVIEW_GENERAL.hideDialog = function() {
......@@ -384,7 +384,7 @@ $(function () {
});
CONTENTVIEW_GENERAL.ready = function(){
/* init variable */
CONTENTVIEW_GENERAL.pageImages = '';
CONTENTVIEW_GENERAL.totalPage = 0;
......@@ -503,7 +503,7 @@ CONTENTVIEW_GENERAL.ready = function(){
CONTENTVIEW_GENERAL.animateType = undefined;
CONTENTVIEW_GENERAL.animatePeriod = undefined;
//Start Function : No.20
//CONTENTVIEW_GENERAL._moveFlag = false;
CONTENTVIEW_GENERAL._moveNum = false;
......@@ -516,11 +516,11 @@ CONTENTVIEW_GENERAL.ready = function(){
CONTENTVIEW_GENERAL.touchStartedTime = null;
CONTENTVIEW_GENERAL._touchMoveTimePeriod = 0; // 0 s
CONTENTVIEW_GENERAL._touchMoveTimePeriodInvalid = 5000; // 5 s
//CONTENTVIEW_GENERAL._bHasNext = false;
//CONTENTVIEW_GENERAL._bHasPrev = false;
//CONTENTVIEW_GENERAL._bHasNext = false;
//CONTENTVIEW_GENERAL._bHasPrev = false;
CONTENTVIEW_GENERAL._startPoints = [];
CONTENTVIEW_GENERAL._bufferPoints = [];
//CONTENTVIEW_GENERAL._bImageMainReload = true; // to not run onload again on the next time on set src value
//CONTENTVIEW_GENERAL._bImageMainReload = true; // to not run onload again on the next time on set src value
//CONTENTVIEW_GENERAL._bImageMainPreReload = true; // to not run onload again on the next time on set src value
//CONTENTVIEW_GENERAL._bImageMainNextReload = true; // to not run onload again on the next time on set src value
CONTENTVIEW_GENERAL._lastDist = 0;
......@@ -529,10 +529,10 @@ CONTENTVIEW_GENERAL.ready = function(){
CONTENTVIEW_GENERAL._bWin8TouchEnabled = false;
CONTENTVIEW_GENERAL._bTransitionEnable = true;
CONTENTVIEW_GENERAL._bTouchDeviceEnabled = false;
//Start Function : No.9
//Start Function : No.9
CONTENTVIEW_GENERAL._object3DImageArr = [];
};
abvw/js/header.js
......@@ -920,7 +920,6 @@ HEADER.getPushMessageList = function() {
"post",
params,
function (data) {
console.log(data);
// reset number message
ClientData.pushInfo_newMsgNumber(0);
// hide number new message
......
abvw/js/settings.js
......@@ -23,7 +23,12 @@ $(document).ready(function () {
$("#dspSave").click(SETTINGS.dspSave_Click);
$("#dspPwdUpd").click(SETTINGS.dspPwdUpd_Click);
if(ClientData.serviceOpt_encryption() == 'Y') {
$("#dspPwdUpd").hide();
} else {
$("#dspPwdUpd").click(SETTINGS.dspPwdUpd_Click);
}
$("#dspOptReset").click(SETTINGS.dspOptReset_Click);
......
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