Skip to content

C
check
Commit 19c673ff by Masaru Abe
Options

getitsプレビュー対応

parent 5eeca1bb
Showing with 341 additions and 88 deletions
abvw/common/js/avweb.js
...@@ -49,6 +49,14 @@ var UserEnvironment = function() { ...@@ -49,6 +49,14 @@ var UserEnvironment = function() {
return false; return false;
} }
}; };
/* mobile check */
this.isMobile = function() {
if(this.os == "ipad" || this.os == "iphone" || this.os == "android"){
return true;
} else {
return false;
}
};
/** check operating system */ /** check operating system */
function checkOS(userAgent) { function checkOS(userAgent) {
......
abvw/common/js/common.js
...@@ -120,6 +120,7 @@ COMMON.ScreenIds = { ...@@ -120,6 +120,7 @@ COMMON.ScreenIds = {
ContentSearch : 'contentsearch.html?__UPDATEID__', ContentSearch : 'contentsearch.html?__UPDATEID__',
History: 'history.html?__UPDATEID__', History: 'history.html?__UPDATEID__',
ContentViewStreaming : 'contentview_streaming.html?__UPDATEID__', ContentViewStreaming : 'contentview_streaming.html?__UPDATEID__',
ContentViewGetits : 'contentview_getits.html?__UPDATEID__'
}; };
COMMON.Keys = { COMMON.Keys = {
...@@ -355,6 +356,7 @@ COMMON.Keys = { ...@@ -355,6 +356,7 @@ COMMON.Keys = {
conf_apiUrl: 'conf_apiUrl', conf_apiUrl: 'conf_apiUrl',
conf_apiLoginUrl: 'conf_apiLoginUrl', conf_apiLoginUrl: 'conf_apiLoginUrl',
conf_apiResourceDlUrl: 'conf_apiResourceDlUrl', conf_apiResourceDlUrl: 'conf_apiResourceDlUrl',
storeUrl: 'storeUrl',
latitude: 'latitude', latitude: 'latitude',
longitude: 'longitude' longitude: 'longitude'
...@@ -1669,6 +1671,14 @@ var ClientData = { ...@@ -1669,6 +1671,14 @@ var ClientData = {
} }
}, },
storeUrl: function(data) {
if (arguments.length > 0) {
SessionStorageUtils.set(COMMON.Keys.storeUrl, data);
} else {
return SessionStorageUtils.get(COMMON.Keys.storeUrl);
}
},
latitude: function(data) { latitude: function(data) {
if (arguments.length > 0) { if (arguments.length > 0) {
SessionStorageUtils.set(COMMON.Keys.latitude, data); SessionStorageUtils.set(COMMON.Keys.latitude, data);
......
abvw/contentview_getits.html 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<!-- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> -->
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<meta name="viewport" content="target-densitydpi=device-dpi,width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
<!--
<meta name="viewport" content="target-densitydpi=device-dpi,width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
<meta name="viewport" content="width=device-width,target-densitydpi=128" />
-->
<title></title>
<link rel="stylesheet" type="text/css" href="./common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.3.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.ui.touch-punch.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.cookie.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/htmlparser.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/textObject.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_CallApi.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_Events.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_GetData.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_InitObjects.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_CreateObjects.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_General.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview.js?20141201002__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Memo.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Gomu.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Maker.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Pen.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Marking.js?__UPDATEID__"></script>
<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_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>
<script type="text/javascript" src="./js/contentview_Getits.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/zoomDetector.js?__UPDATEID__" ></script>
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery.powertip.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/script.js?__UPDATEID__"></script>
<style>
html{
-ms-touch-action : none;
}
body {
-webkit-text-size-adjust: 100%;
}
#header_menu {
width: 100%;
height: 45px;
padding: 0;
margin: 0;
list-style-type: none;
background: #ff7400;
z-index:9999;
position:absolute;
top:0;
opacity: 0.6;
}
#header_menu li {
width: 40%;
float: right;
padding: 0;
margin: 0;
text-align: center;
}
#header_menu li a {
width: auto;
color: #fff;
font-size: 14px;
font-weight: bold;
margin: 0;
padding: 0px 0;
text-decoration: none;
display: block;
}
#header_menu li a:hover {
background: #ffa443;
}
#footer_menu {
width: 100%;
height: 45px;
padding: 0;
margin: 0;
list-style-type: none;
background: #ff7400;
z-index:9999;
position:absolute;
bottom:0;
opacity: 0.6;
}
#footer_menu li {
width: 14.2%;
float: left;
padding: 0;
margin: 0;
text-align: center;
}
#footer_menu li a {
width: auto;
color: #fff;
font-size: 14px;
font-weight: bold;
margin: 0;
padding: 6px 0;
text-decoration: none;
display: block;
}
#footer_menu li a:hover {
background: #ffa443;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
//CONTENTVIEW.ready();
//CONTENTVIEW_STREAMING.ready();
});
</script>
</head>
<body id="viewer" oncontextmenu="return false;">
<div id="wrapper">
<!--Viewer component is added here -->
<div id="overlay" class="web_dialog_overlay"> </div>
<div id="dialog" class="web_dialog"> </div>
<div id="button_pre_canvas" class="gBackbtn"></div>
<div id="button_next_canvas" class="gNextbtn"></div>
<div id="divDialogMemo"></div>
<div id="dialog-contenttype-music"></div>
<div id="dialogPopUp" class="popuptext_web_dialog"></div>
<div id="arrow" class="popuptext_arrow"></div>
<div id="pop_up_memo" class="pop-up-memo">
<a id="btn_show_memo" class="lang" lang = "txtMemoEdit" > </a> <br /><br />
<a id="btn_copy_memo" class="lang" lang = "txtMemoCopy"> </a>
</div>
<div id="divImageLoading">
<img src="img/view_loading.gif" width="64px" height="64px">
</div>
<section id="bgmConfirm" class="sectionDeleteConfirm">
<h1 class="lang" lang=""> </h1>
<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">
<h1 class="lang" lang=""> </h1>
<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">
<h1 class="lang" lang=""> </h1>
<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">
<h1 class="lang" lang=""> </h1>
<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>
<div id="debug"></div>
<div id="menu" style="display:none;">
<ul id="header_menu" >
<li><a id="moveStore" ><img src="img/menu/appstore.jpg" alt=""></a></li>
</ul>
<ul id="footer_menu" >
<li><a id="firstpage" ><img src="img/menu/icon-fast-forward.png" alt=""></a></li>
<li><a id="prevpage" ><img src="img/menu/icon-chevron-left.png" alt=""></a></li>
<li><a id="nextpage" ><img src="img/menu/icon-chevron-right.png" alt=""></a></li>
<li><a id="lastpage" ><img src="img/menu/icon-fast-backward.png" alt=""></a></li>
<li><a id="zoomin" ><img src="img/menu/icon-zoom-in.png" alt=""></a></li>
<li><a id="zoomfit" ><img src="img/menu/icon-resize-small.png" alt=""></a></li>
<li><a id="zoomout" ><img src="img/menu/icon-zoom-out.png" alt=""></a></li>
</ul>
</div>
<iframe style="height:0px;width:0px;visibility:hidden" src="about:blank">
this frame prevents back forward cache
</iframe>
</body>
</html>
abvw/js/contentview.js
...@@ -5257,6 +5257,20 @@ CONTENTVIEW.deleteMaxPageOverData = function() { ...@@ -5257,6 +5257,20 @@ CONTENTVIEW.deleteMaxPageOverData = function() {
}; };
CONTENTVIEW.handleDisplayMobileToolbar = function(){
if($('#menu').length){
if ($('#menu').is(':hidden')) {
// 非表示の場合の処理
$('#menu').show();
} else {
// 表示されている場合の処理
$('#menu').hide();
}
}
};
$("document").ready(function () { $("document").ready(function () {
//CONTENTVIEW.ready = function(){ //CONTENTVIEW.ready = function(){
...@@ -5303,7 +5317,7 @@ $("document").ready(function () { ...@@ -5303,7 +5317,7 @@ $("document").ready(function () {
/** /**
* constants * constants
*/ */
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode() || (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode())){
CONTENTVIEW.marginX = 13; CONTENTVIEW.marginX = 13;
CONTENTVIEW.marginY = 5; CONTENTVIEW.marginY = 5;
} else { } else {
...@@ -5343,7 +5357,7 @@ $("document").ready(function () { ...@@ -5343,7 +5357,7 @@ $("document").ready(function () {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode() || CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile()){
//ClientData.IsRefresh(true); //ClientData.IsRefresh(true);
} else { } else {
//ストリーミング対応以外では元の設定活かす //ストリーミング対応以外では元の設定活かす
...@@ -5400,7 +5414,7 @@ $("document").ready(function () { ...@@ -5400,7 +5414,7 @@ $("document").ready(function () {
ClientData.IsJumpBack(false); ClientData.IsJumpBack(false);
var moveScreen = null; var moveScreen = null;
if(!ClientData.isStreamingMode()){ if(!ClientData.isStreamingMode() && !ClientData.isGetitsMode()){
moveScreen = COMMON.ScreenIds.Home; moveScreen = COMMON.ScreenIds.Home;
} }
......
abvw/js/contentview_CreateObjects.js
...@@ -798,7 +798,7 @@ CONTENTVIEW_CREATEOBJECT.trigger = function (mediaType, actionType, id, imageUrl ...@@ -798,7 +798,7 @@ CONTENTVIEW_CREATEOBJECT.trigger = function (mediaType, actionType, id, imageUrl
CONTENTVIEW.stopAllAudio(); CONTENTVIEW.stopAllAudio();
CONTENTVIEW.showVideoObject(CONTENTVIEW.objType4_5[nIndex].x, CONTENTVIEW.objType4_5[nIndex].y, CONTENTVIEW.objType4_5[nIndex].width, CONTENTVIEW.objType4_5[nIndex].height, CONTENTVIEW.objType4_5[nIndex].dataObjects[nIndex1].fileName, false); CONTENTVIEW.showVideoObject(CONTENTVIEW.objType4_5[nIndex].x, CONTENTVIEW.objType4_5[nIndex].y, CONTENTVIEW.objType4_5[nIndex].width, CONTENTVIEW.objType4_5[nIndex].height, CONTENTVIEW.objType4_5[nIndex].dataObjects[nIndex1].fileName, false);
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode() || ClientData.isGetitsMode()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myVideo=document.getElementById("videoOnPage"); var myVideo=document.getElementById("videoOnPage");
if (myVideo.paused) if (myVideo.paused)
...@@ -1224,7 +1224,11 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1224,7 +1224,11 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
//ストリーミングのビューアへ移動 //ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else { } else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView); if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode() ) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
}
} }
} }
} }
...@@ -1243,7 +1247,11 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1243,7 +1247,11 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
//ストリーミングのビューアへ移動 //ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else { } else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView); if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
}
} }
} }
...@@ -1315,7 +1323,11 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){ ...@@ -1315,7 +1323,11 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){
//ストリーミングのビューアへ移動 //ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else { } else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView); if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
}
} }
}); });
...@@ -1386,7 +1398,11 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){ ...@@ -1386,7 +1398,11 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
//ストリーミングのビューアへ移動 //ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else { } else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView); if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
}
} }
} }
else { else {
...@@ -1437,7 +1453,7 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image ...@@ -1437,7 +1453,7 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image
if (embed == "1") { if (embed == "1") {
CONTENTVIEW.showVideoObject(x, y, w, h, mediaFile, false); CONTENTVIEW.showVideoObject(x, y, w, h, mediaFile, false);
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode() || CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myVideo=document.getElementById("videoOnPage"); var myVideo=document.getElementById("videoOnPage");
if (myVideo.paused) if (myVideo.paused)
...@@ -1496,7 +1512,7 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image ...@@ -1496,7 +1512,7 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image
CONTENTVIEW_GENERAL.showDialog(true); CONTENTVIEW_GENERAL.showDialog(true);
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode() || CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myVideo=document.getElementById("videoOnPopUp"); var myVideo=document.getElementById("videoOnPopUp");
if (myVideo.paused) if (myVideo.paused)
...@@ -1506,32 +1522,6 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image ...@@ -1506,32 +1522,6 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image
} }
} }
/*
if(ClientData.isStreamingMode()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
// Show confim message to play background music
$("#contentVideoConfirm").css('z-index', 9998);
$("#contentVideoConfirm_OK").unbind('touchstart');
document.getElementById('contentVideoConfirm_OK').addEventListener('touchstart', function(event){
event.preventDefault();
//alert("hoge");
var myVideo=document.getElementById("videoOnPopUp");
if (myVideo.paused)
{
myVideo.play();
}
$("#contentVideoConfirm").hide();
return false;
}, false);
$("#contentVideoConfirm").show();
$("#contentVideoConfirm").center();
}
}
*/
} }
} }
}; };
......
abvw/js/contentview_Events.js
...@@ -2175,8 +2175,9 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){ ...@@ -2175,8 +2175,9 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){
} }
//CONTENTVIEW_STREAMING.debugLog("CONTENTVIEW_EVENTS.onTouchEnd"); //CONTENTVIEW_STREAMING.debugLog("CONTENTVIEW_EVENTS.onTouchEnd");
CONTENTVIEW_STREAMING.handleDisplayToolbar(); if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile()) {
CONTENTVIEW.handleDisplayMobileToolbar();
}
} }
} }
} }
......
abvw/js/contentview_General.js
...@@ -531,7 +531,7 @@ CONTENTVIEW_GENERAL.clearCanvas = function(targetCanvas) { ...@@ -531,7 +531,7 @@ CONTENTVIEW_GENERAL.clearCanvas = function(targetCanvas) {
CONTENTVIEW_GENERAL.showDialog = function(modal) { CONTENTVIEW_GENERAL.showDialog = function(modal) {
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode() || CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile()){
$("#dialog").css('z-index', 998); $("#dialog").css('z-index', 998);
$("#dialog").fadeIn(300); $("#dialog").fadeIn(300);
} else { } else {
......
abvw/js/contentview_GetData.js
...@@ -94,13 +94,6 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) { ...@@ -94,13 +94,6 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) {
* Action Type = 10 : content * Action Type = 10 : content
* Action Type = 11 : html * Action Type = 11 : html
*/ */
//ストリーミングならemailは表示しない
//if(ClientData.isStreamingMode()){
// if (iValueObj.action.actionType == 6) {
// return null;
// }
//}
var pageObject = []; var pageObject = [];
......
abvw/js/contentview_Getits.js 0 → 100644
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_GETITS = {};
CONTENTVIEW_GETITS.isShowMenu = false;
CONTENTVIEW_GETITS.ready = function(){
//アイコン差し替えk
var avwUserEnvObj = new UserEnvironment();
if( avwUserEnvObj.isAndroid() ){
$("#moveStore").children("img").attr({'src':'img/menu/googleplay.png'});
}
//ストアリンク作成
$('#moveStore').click(CONTENTVIEW_GETITS.moveStore);
};
CONTENTVIEW_GETITS.moveStore = function(){
//alert("store:" + decodeURIComponent(ClientData.storeUrl()));
location.href=decodeURIComponent(ClientData.storeUrl());
};
CONTENTVIEW_GETITS.debugLog = function(msg){
//$("#debug").html(msg);
};
$("document").ready(function () {
CONTENTVIEW_GETITS.ready();
});
abvw/js/contentview_ImagePreview.js
...@@ -125,7 +125,7 @@ CONTENTVIEW_IMAGEPREVIEW.optimizeSizeImagePreview = function() { ...@@ -125,7 +125,7 @@ CONTENTVIEW_IMAGEPREVIEW.optimizeSizeImagePreview = function() {
var canvas = document.getElementById('main'); var canvas = document.getElementById('main');
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode() || CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile()){
if( canvas.width < maxW ){ if( canvas.width < maxW ){
maxW = canvas.width * 0.9; maxW = canvas.width * 0.9;
maxH = maxW / ratio; maxH = maxW / ratio;
......
abvw/js/login.js
...@@ -13,6 +13,7 @@ LOGIN.user_data_backup; ...@@ -13,6 +13,7 @@ LOGIN.user_data_backup;
LOGIN.marking; LOGIN.marking;
LOGIN.force_login_periodically; LOGIN.force_login_periodically;
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = "";
LOGIN.avwUserEnvObj = new UserEnvironment();
LOGIN.timeWaitSplashScreen = 2000;// wait splash screen 2 second LOGIN.timeWaitSplashScreen = 2000;// wait splash screen 2 second
...@@ -30,8 +31,6 @@ LOGIN.loadLoginInfo = function() { ...@@ -30,8 +31,6 @@ LOGIN.loadLoginInfo = function() {
//Initial Screen //Initial Screen
LOGIN.initialScreen = function() { LOGIN.initialScreen = function() {
//Check Last time display language
//ClientData.userInfo_language(localStorage.getItem(I18N.avwsys_storagekey));
if (ClientData.userInfo_rememberLogin()) { if (ClientData.userInfo_rememberLogin()) {
LOGIN.loadLoginInfo(); LOGIN.loadLoginInfo();
} }
...@@ -41,13 +40,6 @@ LOGIN.initialScreen = function() { ...@@ -41,13 +40,6 @@ LOGIN.initialScreen = function() {
LOGIN.saveLoginInfo = function() { LOGIN.saveLoginInfo = function() {
var lang = I18N.getCurrentLanguage(); var lang = I18N.getCurrentLanguage();
//clear session of old user
//SessionStorageUtils.clear();
//AVWEB.avwUserSessionObj = null;
// create new session for anonymous user
//AVWEB.avwCreateUserSession();
// load language // load language
I18N.changeLanguage(lang); I18N.changeLanguage(lang);
...@@ -67,7 +59,7 @@ LOGIN.saveLoginInfo = function() { ...@@ -67,7 +59,7 @@ LOGIN.saveLoginInfo = function() {
if(chkRemember == 'checked') if(chkRemember == 'checked')
{ {
ClientData.userInfo_rememberLogin(true); ClientData.userInfo_rememberLogin(true);
} }
else else
{ {
...@@ -173,14 +165,12 @@ LOGIN.processLogin = function() { ...@@ -173,14 +165,12 @@ LOGIN.processLogin = function() {
} }
// Get url to login // Get url to login
//var sysSettings = AVWEB.avwSysSetting();
var apiLoginUrl = ClientData.conf_apiLoginUrl(); //sysSettings.apiLoginUrl; var apiLoginUrl = ClientData.conf_apiLoginUrl(); //sysSettings.apiLoginUrl;
//引数パラメータがあれば取得 //引数パラメータがあれば取得
var paramContentID = COMMON.getUrlParam('cid', ''); var paramContentID = COMMON.getUrlParam('cid', '');
AVWEB.avwCmsApiWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params, function (data) { AVWEB.avwCmsApiWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params, function (data) {
//requirePasswordChange = data.requirePasswordChange;
LOGIN.userinfo_sid = data.sid; LOGIN.userinfo_sid = data.sid;
LOGIN.userInfo_userName = data.userName; LOGIN.userInfo_userName = data.userName;
LOGIN.optionList = data.serviceOptionList; LOGIN.optionList = data.serviceOptionList;
...@@ -222,7 +212,6 @@ LOGIN.processLogin = function() { ...@@ -222,7 +212,6 @@ LOGIN.processLogin = function() {
skipPwdDate = ClientData.userInfo_pwdSkipDt(); skipPwdDate = ClientData.userInfo_pwdSkipDt();
if (skipPwdDate == null || skipPwdDate == 'undefined') { if (skipPwdDate == null || skipPwdDate == 'undefined') {
LOGIN.OpenChangePasswordDialog(); LOGIN.OpenChangePasswordDialog();
$('#btnSkip').show(); $('#btnSkip').show();
$(".ui-dialog-titlebar").hide(); $(".ui-dialog-titlebar").hide();
...@@ -582,10 +571,6 @@ LOGIN.initLoginAnonymousUser = function() { ...@@ -582,10 +571,6 @@ LOGIN.initLoginAnonymousUser = function() {
//SessionStorageUtils.clear(); //SessionStorageUtils.clear();
//警告表示を組み込んだら I18N.i18nText()の値が未定義になるので言語リソース再読み込み //警告表示を組み込んだら I18N.i18nText()の値が未定義になるので言語リソース再読み込み
I18N.initi18n(); I18N.initi18n();
//AVWEB.avwUserSessionObj = null;
// create new session for anonymous user
//AVWEB.avwCreateUserSession();
// set info user anonymous login // set info user anonymous login
ClientData.userInfo_accountPath(urlPath); ClientData.userInfo_accountPath(urlPath);
...@@ -658,10 +643,10 @@ LOGIN.initLoginAnonymousUser = function() { ...@@ -658,10 +643,10 @@ LOGIN.initLoginAnonymousUser = function() {
// init login for getits user // init login for getits user
LOGIN.initLoginGetitsUser = function() { LOGIN.initLoginGetitsUser = function() {
console.log("LOGIN.initLoginGetitsUser");
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
//var sysSettings = AVWEB.avwSysSetting(); // get info in conf.json
var params = { var params = {
urlpath: ClientData.userInfo_accountPath() urlpath: ClientData.userInfo_accountPath()
}; };
...@@ -676,10 +661,6 @@ LOGIN.initLoginGetitsUser = function() { ...@@ -676,10 +661,6 @@ LOGIN.initLoginGetitsUser = function() {
//SessionStorageUtils.clear(); //SessionStorageUtils.clear();
//警告表示を組み込んだら I18N.i18nText()の値が未定義になるので言語リソース再読み込み //警告表示を組み込んだら I18N.i18nText()の値が未定義になるので言語リソース再読み込み
//I18N.initi18n(); //I18N.initi18n();
//AVWEB.avwUserSessionObj = null;
// create new session for getits user
//AVWEB.avwCreateUserSession();
ClientData.userInfo_userName(data.userName); ClientData.userInfo_userName(data.userName);
...@@ -785,7 +766,6 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) { ...@@ -785,7 +766,6 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
LOGIN.alertMessageCancelFunction_callback(); LOGIN.alertMessageCancelFunction_callback();
} }
); );
//AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentView);
} }
}, },
...@@ -803,7 +783,11 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) { ...@@ -803,7 +783,11 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
//警告表示時のOK処理 //警告表示時のOK処理
LOGIN.alertMessageOkFunction_callback = function(){ LOGIN.alertMessageOkFunction_callback = function(){
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentView); if (LOGIN.avwUserEnvObj.isMobile() && ClientData.isGetitsMode() ) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentViewGetits);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentView);
}
}; };
//警告表示時のキャンセル処理 //警告表示時のキャンセル処理
LOGIN.alertMessageCancelFunction_callback = function(){ LOGIN.alertMessageCancelFunction_callback = function(){
...@@ -829,7 +813,7 @@ LOGIN.getUrlPath = function(){ ...@@ -829,7 +813,7 @@ LOGIN.getUrlPath = function(){
//$(document).ready(function (e) { //$(document).ready(function (e) {
LOGIN.ready = function(){ LOGIN.ready = function(){
//セッションストレージクリア //セッションストレージクリア
SessionStorageUtils.clear(); SessionStorageUtils.clear();
AVWEB.avwUserSessionObj = null; AVWEB.avwUserSessionObj = null;
...@@ -843,12 +827,14 @@ LOGIN.ready = function(){ ...@@ -843,12 +827,14 @@ LOGIN.ready = function(){
ClientData.isGetitsMode(false); ClientData.isGetitsMode(false);
ClientData.isStreamingMode(false); ClientData.isStreamingMode(false);
ClientData.storeUrl("");
//getitsサーバー設定確認 //getitsサーバー設定確認
if( sysSettings.apiUrl == "" ){ if( sysSettings.apiUrl == "" ){
//引数パラメータを取得 //引数パラメータを取得
var siteUrl = COMMON.getUrlParam('siteUrl', ''); var siteUrl = COMMON.getUrlParam('siteUrl', '');
var urlPath = COMMON.getUrlParam('urlPath', ''); var urlPath = COMMON.getUrlParam('urlPath', '');
var storeUrl = COMMON.getUrlParam('storeUrl', '');
if(siteUrl != "" && urlPath != ""){ if(siteUrl != "" && urlPath != ""){
//getitsモード有効 //getitsモード有効
...@@ -862,7 +848,9 @@ LOGIN.ready = function(){ ...@@ -862,7 +848,9 @@ LOGIN.ready = function(){
ClientData.userInfo_accountPath_session(urlPath); ClientData.userInfo_accountPath_session(urlPath);
ClientData.userInfo_loginId(""); ClientData.userInfo_loginId("");
ClientData.userInfo_loginId_session(""); ClientData.userInfo_loginId_session("");
//ストア遷移用のURL
ClientData.storeUrl(storeUrl);
} }
} else { } else {
......
custom/getits/login.html
...@@ -40,21 +40,13 @@ ...@@ -40,21 +40,13 @@
} }
</style> </style>
<![endif]--> <![endif]-->
<!-- <script type="text/javascript">
<script type="text/javascript">
$('head').append( $(document).ready(function(){
'<style type="text/css">#container { display: none; } #fade, #loader { display: block; }</style>' LOGIN.ready();
); });
</script>
jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に呼ばれる関数
var pageH = $("#container").height();
$("#fade").css("height", pageH).delay(900).fadeOut(800);
$("#loader").delay(600).fadeOut(300);
$("#container").css("display", "block");
});
</script>-->
</head> </head>
<body id="login"> <body id="login">
......
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