1.5.2対応

246326a3 · Masaru Abe · 77b6d2c2 · 246326a3 · 246326a3 · 246326a3
Commit 246326a3 authored Jan 14, 2015 by Masaru Abe
14 changed files
--- a/abvw/common/js/avweb.js
+++ b/abvw/common/js/avweb.js
@@ -836,9 +836,11 @@ AVWEB.avwClearError = function() {
 /* ブラウザunload時に警告メッセージの出力設定を行う関数 */
 AVWEB.avwSetLogoutNortice = function() {
 	window.onbeforeunload = function(event) {
-		if( ClientData.isGetitsMode() == true || ClientData.isStreamingMode() == true ){
+		if(ClientData.isGetitsMode() || ClientData.isStreamingMode()){
+			if(ClientData.isGetitsMode()){
 				COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
 				COMMON.RegisterLog();
+			}
 		} else {
 			// メッセージ表示
 			// FFでは、https://bugzilla.mozilla.org/show_bug.cgi?id=588292 によりメッセージが出力されない

--- a/abvw/common/json/lang/lang-en.json
+++ b/abvw/common/json/lang/lang-en.json
 {
 "sysErrorCallApi01":"System error.<br/>Please close this window and contact administrator.",
+"sysErrorCallApi02":"I am terribly sorry to cause you inconvenience.<br />A certification error occurred.<br />return to a login screen.",
 "sysInfoScrLock01":"Click to unlock.",
 "sysInfoWithoutLogout":"Are you sure to close this window without logout?\nIncorrect logout will cause login problem next time.",
@@ -150,9 +151,10 @@
 "txtMediaAutoPlayWarning":"Media will be played  automatically.",
 "txtPreventLink": "This function is not available in the preview.",
 "msgContentNotExist": "Content does not exist.",
-"txtShare": "共有",
+"txtShare": "share",
 "txtDashMark": "-",
-"txtUrlValidDate": "URL有効期間",
+"txtUrlValidDate": "validated period",
-"txtMaxDownloadCount": "最大DL回数",
+"txtMaxDownloadCount": "number of max dl",
-"msgShareUrlPassword": "パスワードを設定する場合、以下に入力して下さい。"
+"msgShareUrlPassword": "When you set a password, please input below."
+"msgStreamingOpenError": "It is the contents that I cannot read in the streaming."
 }
--- a/abvw/common/json/lang/lang-ja.json
+++ b/abvw/common/json/lang/lang-ja.json
 {
 "sysErrorCallApi01":"ご迷惑をおかけし申し訳ございません。<br />システムエラーが発生しました。<br />アプリケーションを終了し、管理者に連絡してください。",
+"sysErrorCallApi02":"ご迷惑をおかけし申し訳ございません。<br />認証エラーが発生しました。<br />ログイン画面に戻ります。",
 "sysInfoScrLock01":"長時間操作されなかったため、画面をロックしています。<br />画面をクリックしてロックを解除してください。",
 "sysInfoWithoutLogout":"ログアウトしていませんが、このまま終了してもよろしいですか？\n※【注意】ログアウトしないと次回ログインできない場合がございます。",
@@ -154,5 +155,6 @@
 "txtDashMark": "～",
 "txtUrlValidDate": "URL有効期間",
 "txtMaxDownloadCount": "最大DL回数",
-"msgShareUrlPassword": "パスワードを設定する場合、以下に入力して下さい。"
+"msgShareUrlPassword": "パスワードを設定する場合、以下に入力して下さい。",
+"msgStreamingOpenError": "ストリーミングでは閲覧出来ないコンテンツです。"
 }
--- a/abvw/common/json/lang/lang-ko.json
+++ b/abvw/common/json/lang/lang-ko.json
 {
 "sysErrorCallApi01":"시스템 에러가 발생했습니다. 이용에 불편을 드려 죄송합니다.",
+"sysErrorCallApi02":"죄송합니다. <br/> 인증 오류가 발생하였습니다. <br/> 로그인 화면으로 돌아갑니다.",
 "sysInfoScrLock01":"장시간 조작이 없었으므로, 화면이 잠겼습니다.<br/>잠김을 해제하려면 화면을 클릭하십시오.",
 "sysInfoWithoutLogout":"로그아웃하지 않은 상태로 창을 닫으면, 다음에 로그인되지 않는 경우도 있습니다. 이대로 창을 닫으시겠습니까?\n(이 메세지는 브라우저를 '새로 고침' 할 때에도 표시됩니다.)",
@@ -149,10 +150,11 @@
 "txtContentWarning":"경고",
 "txtMediaAutoPlayWarning":"음악/동영상은 자동으로 재생됩니다.",
 "txtPreventLink": "미리 보기에서 사용하실 수 없는 기능입니다.",
-"msgContentNotExist": "コンテンツが存在しません。",
+"msgContentNotExist": "컨텐츠가 존재하지 않습니다.",
-"txtShare": "共有",
+"txtShare": "Share",
-"txtDashMark": "～",
+"txtDashMark": "-",
 "txtUrlValidDate": "URL유효기간",
 "txtMaxDownloadCount": "최대DL횟수",
 "msgShareUrlPassword": "암호를 설정할경우 다음의 입력란에 입력하십시오."
+"msgStreamingOpenError": "스트리밍에서는 열람 할 수 없는 컨텐츠입니다."
 }
--- a/abvw/contentview_streaming.html
+++ b/abvw/contentview_streaming.html
@@ -9,6 +9,7 @@
    <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>
@@ -71,6 +72,10 @@
            -ms-touch-action : none;
        }
+        body {
+            -webkit-text-size-adjust: 100%;
+        }
 #menu {
  width: 100%;
  height: 45px;
@@ -122,9 +127,9 @@
 			ClientData.latitude(latitude);
 			ClientData.longitude(longitude);
 			COMMON.SetGpsLog(ClientData.contentInfo_contentId());
-		}
 			//alert("contentview receive setLocation:" + ClientData.latitude() + "," + ClientData.longitude() + " " + CONTENTVIEW_GENERAL.avwUserEnvObj.os);
 		}
+	}
 	//デバイスから呼ばれる閲覧ログ送信指示
 	function sendLog(){

--- a/abvw/js/contentsearch.js
+++ b/abvw/js/contentsearch.js
@@ -395,20 +395,19 @@ CONTENTSEARCH.renderGridView = function(){
 	//Refresh GridView
 	CONTENTSEARCH.refreshGrid();
-	if(searchText == '' || searchText == null){
+	//if(searchText == '' || searchText == null){
-		CONTENTSEARCH.displayResultNoRecord();
+	//	CONTENTSEARCH.displayResultNoRecord();
-		CONTENTSEARCH.chkSearchTextEmpty = true;
+	//	CONTENTSEARCH.chkSearchTextEmpty = true;
-		CONTENTSEARCH.noRecordFlg = true;
+	//	CONTENTSEARCH.noRecordFlg = true;
-		CONTENTSEARCH.reRenderPageNumber(0, 0);
+	//	CONTENTSEARCH.reRenderPageNumber(0, 0);
-	}
+	//}
-    else {
+	//else {
 	$('#msgSearchNotExist').hide();
 	CONTENTSEARCH.chkSearchTextEmpty = false;
 	//Render Gridview
 	CONTENTSEARCH.renderContent(sid, searchText, searchDivision, sortType, sortOrder, fromPage, toPage, genreId, groupId);
 	$('#control-nextrecord').css('visibility','visible');
-	}
+	//}
 };
@@ -1133,20 +1132,20 @@ CONTENTSEARCH.searchEventButtonFunction = function(){
 	CONTENTSEARCH.handleSortDisp();
-	if(searchText == '' || searchText == null){
+	//if(searchText == '' || searchText == null){
-		CONTENTSEARCH.displayResultNoRecord();
+	//	CONTENTSEARCH.displayResultNoRecord();
-		CONTENTSEARCH.chkSearchTextEmpty = true;
+	//	CONTENTSEARCH.chkSearchTextEmpty = true;
-		CONTENTSEARCH.noRecordFlg = true;
+	//	CONTENTSEARCH.noRecordFlg = true;
-		CONTENTSEARCH.reRenderPageNumber(0, 0);
+	//	CONTENTSEARCH.reRenderPageNumber(0, 0);
-	}
+	//}
-    else {
+	//else {
 	$('#msgSearchNotExist').hide();
 	$('#control-nextrecord').css('visibility','hidden');
 		//Render Gridview
 	CONTENTSEARCH.chkSearchTextEmpty = false;
 	CONTENTSEARCH.renderContent(sid, searchText, searchDivision, sortType, sortOrder, fromPage, toPage, genreId, groupId);
 	//$('#control-nextrecord').css('visibility','visible');
-	}
+	//}
 };
 //Render User view date

--- a/abvw/js/contentview.js
+++ b/abvw/js/contentview.js
@@ -898,7 +898,7 @@ CONTENTVIEW.showErrorScreen = function() {
 };
 /* display alert screen*/
-CONTENTVIEW.showAlertScreen = function(errMes) {
+CONTENTVIEW.showAlertScreen = function(errMes, scrMove) {
    // アラートメッセージの表示
    if( errMes == undefined || errMes == "" ){
@@ -919,6 +919,9 @@ CONTENTVIEW.showAlertScreen = function(errMes) {
    $('.toast-item-close').live('click',
        function () {
            COMMON.unlockLayout();
+            if( scrMove ){
+            	AVWEB.avwScreenMove(scrMove);
+            }
        }
    );
 };
@@ -1556,10 +1559,10 @@ CONTENTVIEW.ev_canvas = function(ev) {
 /* handle display page from book mark page */
 CONTENTVIEW.handleFromBookMarkPage = function() {
-	CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = true;
+	//CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = true;
    /* check exist pageno */
    if (ClientData.bookmark_pageNo()) {
+    	CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = true;
    	CONTENTVIEW.changePageWithoutSlide(CONTENTVIEW.changePageNo(ClientData.bookmark_pageNo()));
        ClientData.bookmark_pageNo(null)
    }
@@ -1568,13 +1571,11 @@ CONTENTVIEW.handleFromBookMarkPage = function() {
 /* handle display page from actiontype=10 mediaType =1 :jump to content */
 CONTENTVIEW.handleFromJumpContent = function() {
-	CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = true;
+	//CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = true;
    /* check exist pageno */
    if (ClientData.common_prePageNo()) {
-        //CONTENTVIEW.changePage(CONTENTVIEW.changePageNo(ClientData.common_prePageNo()));
+    	CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = true;
    	CONTENTVIEW.changePageWithoutSlide(CONTENTVIEW.changePageNo(ClientData.common_prePageNo()));
-        //LocalStorageUtils.remove(COMMON.Keys.common_prePageNo);
        ClientData.common_prePageNo(null)
    }
 };
@@ -3318,6 +3319,7 @@ CONTENTVIEW.removeObject = function() {
    }
    $("#bgmConfirm").hide();
+    $("#bgmConfirm_page").hide();
    $("#boxCopyText").hide();
    $("#boxSearching").hide();
    $("#boxIndex").hide();
@@ -3325,7 +3327,6 @@ CONTENTVIEW.removeObject = function() {
    $('#pop_up_memo').hide();
    CONTENTVIEW_GENERAL.isSendingData = false;
    CONTENTVIEW_GENERAL.isDisplayBookMarkList = false;
    CONTENTVIEW_GENERAL.isDisplayCopyText = false;
    CONTENTVIEW_GENERAL.isDisplayListIndex = false;
@@ -5176,6 +5177,86 @@ CONTENTVIEW.is3DObject = function(pageContent){
 };
 //End Function : No.9 - Editor : Long - Date : 08/16/2013 - Summary :
+//コンテンツ差し替えで最大ページ数を超えるデータは削除
+CONTENTVIEW.deleteMaxPageOverData = function() {
+	if( CONTENTVIEW_GENERAL.totalPage == 0 ){
+		return;
+	}
+	var removeFlag = false;
+	//bookmark
+	var listBM = [];
+	if (ClientData.BookMarkData().length > 0) {
+		//get list bookmark
+		listBM = ClientData.BookMarkData();
+		for(;;){
+			removeFlag = false;
+			for (var nIndex = 0; nIndex < listBM.length; nIndex++) {
+				//check bookmark belong contentID                               
+				if (listBM[nIndex].contentid == CONTENTVIEW_GENERAL.contentID && listBM[nIndex].pageNo > CONTENTVIEW_GENERAL.totalPage ) {
+					//console.log("remove bookmark:" + CONTENTVIEW_GENERAL.contentID + " p:" + listBM[nIndex].pageNo);
+					listBM.splice(nIndex, 1);
+					removeFlag = true;
+					break;
+				}
+			}
+			if( !removeFlag ){
+				break;
+			}
+		}
+		ClientData.BookMarkData(listBM);
+	}
+	//memo
+	var listMemo = [];
+	if (ClientData.MemoData().length > 0) {
+		//get list memo
+		listMemo = ClientData.MemoData();
+		for(;;){
+			removeFlag = false;
+			for (var nIndex = 0; nIndex < listMemo.length; nIndex++) {
+				//check memo belong contentID                               
+				if (listMemo[nIndex].contentid == CONTENTVIEW_GENERAL.contentID && listMemo[nIndex].pageNo > CONTENTVIEW_GENERAL.totalPage ) {
+					//console.log("remove memo:" + CONTENTVIEW_GENERAL.contentID + " p:" + listMemo[nIndex].pageNo);
+					listMemo.splice(nIndex, 1);
+					removeFlag = true;
+					break;
+				}
+			}
+			if( !removeFlag ){
+				break;
+			}
+		}
+		ClientData.MemoData(listMemo);
+	}
+	//marking
+	var listMarking = [];
+	if (ClientData.MarkingData().length > 0) {
+		//get list marking
+		listMarking = ClientData.MarkingData();
+		for(;;){
+			removeFlag = false;
+			for (var nIndex = 0; nIndex < listMarking.length; nIndex++) {
+				//check memo belong contentID                               
+				if (listMarking[nIndex].contentid == CONTENTVIEW_GENERAL.contentID && listMarking[nIndex].pageNo > CONTENTVIEW_GENERAL.totalPage ) {
+					//console.log("remove memo:" + CONTENTVIEW_GENERAL.contentID + " p:" + listMarking[nIndex].pageNo);
+					listMarking.splice(nIndex, 1);
+					removeFlag = true;
+					break;
+				}
+			}
+			if( !removeFlag ){
+				break;
+			}
+		}
+		ClientData.MarkingData(listMarking);
+	}
+};
 $("document").ready(function () {
 //CONTENTVIEW.ready = function(){
@@ -5229,8 +5310,6 @@ $("document").ready(function () {
 		CONTENTVIEW.marginX = 13;
 		CONTENTVIEW.marginY = 65;
 	}
-	//alert("url:" + ClientData.userInfo_accountPath() + " loginId:" + ClientData.userInfo_loginId() + " sid:" + ClientData.userInfo_sid());
-	//alert("CONTENTVIEW_GENERAL.avwUserEnvObj.os:" + CONTENTVIEW_GENERAL.avwUserEnvObj.os);
    /* check login */
    if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)) return;
@@ -5254,9 +5333,15 @@ $("document").ready(function () {
        	 CONTENTVIEW_GENERAL.contentType = data.contentData.contentType;
-            if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
+        	 if(ClientData.isStreamingMode()){
+        		 //リンク、その他は表示出来ないのでここでブロックする
+        		 if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Link || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Others){
+	            	 CONTENTVIEW.showAlertScreen(I18N.i18nText('msgStreamingOpenError'), null);
+	        		 return;
+        		 }
+        	 }
-            	//alert("isIOs = true");
+            if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
            	if(ClientData.isStreamingMode()){
            		//ClientData.IsRefresh(true);
@@ -5289,8 +5374,6 @@ $("document").ready(function () {
            }
            else {
-            	//alert("isIOs = false");
                //Check if is pdf content
                if(CONTENTVIEW.isMediaAndHTMLContent()){
                	CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType();
@@ -5316,12 +5399,17 @@ $("document").ready(function () {
        	 ClientData.JumpQueue([]);
        	 ClientData.IsJumpBack(false);
+        	 var moveScreen = null;
+        	 if(!ClientData.isStreamingMode()){
+        		 moveScreen = COMMON.ScreenIds.Home;
+        	 }
             if (xmlHttpRequest.status == 404) {
-            	 CONTENTVIEW.showAlertScreen(i18nText('msgContentNotExist'), ScreenIds.Home);
+            	 CONTENTVIEW.showAlertScreen(I18N.i18nText('msgContentNotExist'), moveScreen);
             }
             else if(xmlHttpRequest.status == 403) {
                 //認証エラー
-            	 CONTENTVIEW.showAlertScreen(i18nText('sysErrorCallApi02'), ScreenIds.Home);
+            	 CONTENTVIEW.showAlertScreen(I18N.i18nText('sysErrorCallApi02'), moveScreen);
             }
             else {
                 // Show system error

--- a/abvw/js/contentview_3d.js
+++ b/abvw/js/contentview_3d.js
@@ -154,15 +154,21 @@ CONTENTVIEW_3D.set3dLastSeclectedFrame = function(id, lastFrame){
    }
 };
-CONTENTVIEW_3D.getMatrixIndexByPosition = function(id, position, left, top){
+CONTENTVIEW_3D.getMatrixIndexByPosition = function(id, position, left, top, tempRatioWidth2, tempRatioHeight2){
    //compate with matrix to check went to another frame or not
    var posX = position.x;
    var posY = position.y;  
+    //console.log("posX:" + posX + " posY:" + posY + " left:" + left + " top:" + top );
    posX = posX - left;
    posY = posY - top;
+    //座標調整　縮める
+    posX = posX * tempRatioWidth2;
+    posY = posY * tempRatioHeight2;
    var _arrFrame = CONTENTVIEW_3D.getArrFrame(id);
    for(var countY=1;countY<_arrFrame.length;countY++){
@@ -203,27 +209,29 @@ CONTENTVIEW_3D.set3dCurrentFramePos = function(id, currFramePos){
    }
 };
-CONTENTVIEW_3D.OnMouseDown3D = function(id, position, left, top) {
+CONTENTVIEW_3D.OnMouseDown3D = function(id, position, left, top, tempRatioWidth2, tempRatioHeight2) {
    if(!CONTENTVIEW_3D._3dMoveFlag ){
    	CONTENTVIEW_3D._3dMoveFlag = true;  
        //compate with matrix to check went to another frame or not
        //and set to last selected frame to compare on move event later
-        var _lastSelectedFrame = CONTENTVIEW_3D.getMatrixIndexByPosition(id, position, left, top);  
+        var _lastSelectedFrame = CONTENTVIEW_3D.getMatrixIndexByPosition(id, position, left, top, tempRatioWidth2, tempRatioHeight2);
        CONTENTVIEW_3D.set3dLastSeclectedFrame(id, _lastSelectedFrame);
    }
 };
-CONTENTVIEW_3D.OnMouseMove3D = function(id, position, left, top, width, height, _h, _v) {
+CONTENTVIEW_3D.OnMouseMove3D = function(id, position, left, top, width, height, _h, _v, tempRatioWidth2, tempRatioHeight2) {
    if(!CONTENTVIEW_3D._3dMoveFlag){
        return;
    }
    //compate with matrix to check went to another frame or not
-    var selectedFrame = CONTENTVIEW_3D.getMatrixIndexByPosition(id, position, left, top);
+    var selectedFrame = CONTENTVIEW_3D.getMatrixIndexByPosition(id, position, left, top, tempRatioWidth2, tempRatioHeight2);
+//console.log("selectedFrameX:" + selectedFrame.matrixX + "," + selectedFrame.matrixY );
    var _lastSeclectedFrame = CONTENTVIEW_3D.get3dLastSeclectedFrame(id);
    var _currFramePos = CONTENTVIEW_3D.get3dCurrentFramePos(id);
    var _currFrameX = _currFramePos._currFrameX;

--- a/abvw/js/contentview_Anket.js
+++ b/abvw/js/contentview_Anket.js
@@ -32,7 +32,7 @@ CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) {
    + '<div class="anket-commands" id="anket-commands"><input type="button" value="' + I18N.i18nText('txtTransparent') + '" id="btnFullOpacity"/> <input type="button" value="' + I18N.i18nText('txtSemiTransparent') + '" id="btnApartOpacity"/> <input type="button" value="' + I18N.i18nText('txtNoTransparent') + '" id="btnNoOpacity"/></div><div style="clear:both;"></div>'
    );
-    $("#dialog h1 img").on({
+    $("#btnClose").on({
    	'click touchend': function(ev){
    		//時間記録
@@ -58,13 +58,20 @@ CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) {
    var avwUserEnvObj = new UserEnvironment();
    // set overflow for container iframe
-    if (avwUserEnvObj.isIpad()) {
+    if (avwUserEnvObj.isIos()) {
        $('#dialog .anket-container').css('overflow', 'scroll');
+        //$('#dialog .anket-container').css('-webkit-overflow-scrolling', 'touch');
+        //$('#dialog .anket-container').css('position', 'relative');
        if (fullscreen == true) {
            $container.attr('style', 'width:' + width + 'px; left:10px;right:auto;'); // !important on ipad can't move dialog
        }
        else {
+            if (avwUserEnvObj.isIpad()) {
            	$container.attr('style', 'width:' + width + 'px; right:20px;left:auto;');
+            } else {
+            	$container.attr('style', 'width:' + width + 'px; right:3px;left:auto;');
+            }
        }
    }
@@ -114,5 +121,14 @@ CONTENTVIEW_ANKET.resizeAnket = function() {
    // set height for anket container
    $('#dialog .anket-container').css('height', iframeHeight);
+    // set overflow for container iframe
+    //if (avwUserEnvObj.isIos()) {
+    //    $('#dialog .anket-container').css('overflow', 'scroll');
+    //    $('#dialog .anket-container').css('-webkit-overflow-scrolling', 'touch');
+    //    //$('#dialog .anket-container').css('display', 'inline-block');
+    //    //$('#dialog iframe').css('display', 'block');
+    //}
 };
--- a/abvw/js/contentview_CreateObjects.js
+++ b/abvw/js/contentview_CreateObjects.js
@@ -211,15 +211,15 @@ CONTENTVIEW_CREATEOBJECT.webContentType4 = function (id, x, y, w, h, imageUrl, l
    this.setup(id, x, y, w, h, imageUrl);
    this.action = function () {
        if (linkKind == "1") {
+        	//ストリーミングならリンクしない
+        	if(!ClientData.isStreamingMode()){
        		//START TRB00070
        		window.onbeforeunload = null;
        		//window.open(destURI, "_blank", "new window");
        		window.open(destURI, "_self");
        		setTimeout(function(){COMMON.ToogleLogoutNortice();}, 200);
        		//END TRB00070
+        	}
        } 
        else if (linkKind == "0") {
        	CONTENTVIEW.changePage(CONTENTVIEW.changePageNo(destPageNumber));
@@ -616,16 +616,32 @@ CONTENTVIEW_CREATEOBJECT.object3d = function (mediaType, actionType, id, imageUr
        if( tempRatioHeight < 1 ){
            tempRatioHeight = 1;
        }
+        //#11478 操作側のイベント判定には逆に縮める対応が必要
+        var tempRatioWidth2 = CONTENTVIEW_GENERAL.widthEachPageApi / canvasWidth;
+        if( tempRatioWidth2 > 1 ){
+            tempRatioWidth2 = 1;
+        }
+        var tempRatioHeight2 = CONTENTVIEW_GENERAL.heightEachPageApi / canvasHeight;
+        if( tempRatioHeight2 > 1 ){
+            tempRatioHeight2 = 1;
+        }
+        //console.log("tempRatioWidth:" + tempRatioWidth + " tempRatioHeight:" + tempRatioHeight);
+        //console.log("tempRatioWidth2:" + tempRatioWidth2 + " tempRatioHeight2:" + tempRatioHeight2);
        var tmpX = x *  tempRatioWidth;
        var tmpY = y * tempRatioHeight;
        var tmpW = w *  tempRatioWidth;
        var tmpH = h * tempRatioHeight;
       if(CONTENTVIEW_3D._3dAction == CONTENTVIEW_3D._3dActionType.TouchStart_MouseDown){
-    	   CONTENTVIEW_3D.OnMouseDown3D(id, imagePt, tmpX, tmpY);
+    	   CONTENTVIEW_3D.OnMouseDown3D(id, imagePt, tmpX, tmpY, tempRatioWidth2, tempRatioHeight2);
       }
       else if(CONTENTVIEW_3D._3dAction == CONTENTVIEW_3D._3dActionType.TouchMove_MouseMove){
-    	   CONTENTVIEW_3D.OnMouseMove3D(id, imagePt, tmpX, tmpY, tmpW, tmpH, hCnt, vCnt);
+    	   CONTENTVIEW_3D.OnMouseMove3D(id, imagePt, tmpX, tmpY, tmpW, tmpH, hCnt, vCnt, tempRatioWidth2, tempRatioHeight2);
       }
       else if(CONTENTVIEW_3D._3dAction == CONTENTVIEW_3D._3dActionType.TouchEnd_MouseUp){
    	   CONTENTVIEW_3D.OnMouseEnd3D(id, hCnt, vCnt);
@@ -907,9 +923,6 @@ CONTENTVIEW_CREATEOBJECT.anket = function (mediaType, actionType, id, imageUrl, 
    this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
    this.action = function () {
-        //abe
-        //alert("anket");
        //詳細ログ作成
        var objectLog = new ObjectLogEntity();
        objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
@@ -1625,6 +1638,11 @@ CONTENTVIEW_CREATEOBJECT.linkURL = function (mediaType, actionType, id, imageUrl
        //abe
        //alert("linkURL");
+    	//デフォルトでストリーミングなら表示しない
+        if( browserType == 1 && ClientData.isStreamingMode()){
+        	return;
+        }
        //詳細ログ作成
        var objectLog = new ObjectLogEntity();
        objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
@@ -1721,38 +1739,6 @@ CONTENTVIEW_CREATEOBJECT.imagePreview = function (mediaType, actionType, id, ima
        CONTENTVIEW_GENERAL.showDialog(true);
-        //タッチイベントキャンセル
-        if(ClientData.isStreamingMode()){
-        	//document.getElementById('divImagePreview').addEventListener('touchstart', function(evt){
-        	//	$("#debug").html("divImagePreview touchstart1");
-        	//	evt.preventDefault();
-        	//	evt.stopPropagation();
-        	//	return false;}, false);
-        	//document.getElementById('divImagePreview').addEventListener('touchmove', function(env){
-        	//	$("#debug").html("divImagePreview touchmove");
-        	//	evt.preventDefault();
-        	//	evt.stopPropagation();
-        	//	return false;}, false);
-        	//document.getElementById('divImagePreview').addEventListener('touchend', function(env){return false;}, false);
-        	//document.getElementById('slideWrapper').addEventListener('touchstart', function(env){
-        	//	$("#debug").html("slideWrapper touchstart");
-        	//	return false;
-        	//	}, false);
-        	//document.getElementById('slideWrapper').addEventListener('touchmove', function(env){return false;}, false);
-        	//document.getElementById('slideWrapper').addEventListener('touchend', function(env){return false;}, false);
-        	//document.getElementById('main-img').addEventListener('touchstart', function(env){
-        	//	$("#debug").html("main-img touchstart");
-            //		evt.preventDefault();
-            //		evt.stopPropagation();
-        	//	return false;
-        	//	}, false);
-        	//document.getElementById('main-img').addEventListener('touchmove', function(env){return false;}, false);
-        	//document.getElementById('main-img').addEventListener('touchend', function(env){return false;}, false);
-        }
        //時間記録
        var dateStart = new Date();
@@ -2380,7 +2366,6 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
 CONTENTVIEW_CREATEOBJECT.createTextConfirmAudio = function() {
    var text = I18N.i18nText('msgBGMPlayConfirm');
    $('#txtAudio').html(text);
    var text = I18N.i18nText('msgBGMPagePlayConfirm');
    $('#txtAudio_page').html(text);
 };
@@ -2551,13 +2536,13 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
                    }
                }
-                if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { 
+                //if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { 
-                	var myAudio=document.getElementById("play_audio_1"); 
+                //	var myAudio=document.getElementById("play_audio_1"); 
-                	if (myAudio.paused)
+                //	if (myAudio.paused)
-                	{
+                //	{
-                		myAudio.play();
+                //		myAudio.play();
-                	}
+                //	}
-                }
+                //}
            } 
            else {
@@ -2630,10 +2615,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
                    }
                }
                // Check to play BGM on ipad
-                if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
+                if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() || CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
                    //START TRB00069
                    if(CONTENTVIEW.isPendingContentBGM){
+                    	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){
                    		document.getElementById('play_audio_1').load();
+                    	}
                        CONTENTVIEW.isPendingContentBGM = false;
                    }
                    else{
@@ -2644,7 +2631,9 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
                        });
                        $("#bgmConfirm_dspOK").unbind('click');
                        $("#bgmConfirm_dspOK").click(function () {
+                        	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){
                        		document.getElementById('play_audio_1').load();
+                        	}
                            document.getElementById('play_audio_1').play();
                            $("#bgmConfirm").hide();
                        });
@@ -2654,14 +2643,6 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
                    //END TRB00069
                }
-                if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { 
-                	var myAudio=document.getElementById("play_audio_1"); 
-                	if (myAudio.paused)
-                	{
-                		myAudio.play();
-                	}
-                }
            }
        }
        else if (type == "2") { /* play on page */                    
@@ -2711,7 +2692,7 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
                }
                // Check to play BGM on ipad
-                if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
+                if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() || CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
                    // Show confim message to play background music
                    $("#bgmConfirm_dspCancel_page").unbind('click');
                    $("#bgmConfirm_dspCancel_page").click(function () {
@@ -2719,13 +2700,17 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
                    });
                    $("#bgmConfirm_dspOK_page").unbind('click');
                    $("#bgmConfirm_dspOK_page").click(function () {
+                    	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){
                    		document.getElementById('play_audio_2').load();
+                    	}
                        document.getElementById('play_audio_2').play();
                        $("#bgmConfirm_page").hide();
                    });
                    $("#bgmConfirm_page").show();
                    $("#bgmConfirm_page").center();
                }
            }
        }
    }

--- a/abvw/js/contentview_ImagePreview.js
+++ b/abvw/js/contentview_ImagePreview.js
@@ -172,35 +172,31 @@ CONTENTVIEW_IMAGEPREVIEW.renderSelectImage = function(){
 CONTENTVIEW_IMAGEPREVIEW.handleImagePreviewEvent = function(){
    $('#control-next').click(CONTENTVIEW_IMAGEPREVIEW.imageSelectNextFunction);
    $('#control-prev').click(CONTENTVIEW_IMAGEPREVIEW.imageSelectPrevFunction);
    $('#main-control-next').click(CONTENTVIEW_IMAGEPREVIEW.imageMainSelectNextFunction);
    $('#main-control-prev').click(CONTENTVIEW_IMAGEPREVIEW.imageMainSelectPrevFunction);
    $('.thumbnail').click(CONTENTVIEW_IMAGEPREVIEW.selectImgClickFunction);
    $('.thumbnail').mouseenter(CONTENTVIEW_IMAGEPREVIEW.selectImgMouseEnterFunction);
    $('.thumbnail').mouseleave(CONTENTVIEW_IMAGEPREVIEW.selectImgMouseLeaveFunction);
    $('.main-control').css('opacity','0');
    $('#main-control-next').mouseleave(CONTENTVIEW_IMAGEPREVIEW.mainControlNextMouseLeaveFunction);
    $('#main-control-prev').mouseleave(CONTENTVIEW_IMAGEPREVIEW.mainControlPrevMouseLeaveFunction);
-    if (COMMON.isTouchDevice() == false) {
+    if (COMMON.isTouchDevice()) {
+    	//タッチ操作が背後のメインコンテンツに伝わるのを防止
+    	$('#slideWrapper').on("touchmove", function(e) {
+    		e.preventDefault();
+    	});
+    } else {
        //$('.main-control').mouseenter(CONTENTVIEW_IMAGEPREVIEW.mainControlMouseEnterFunction);
        $('#main-control-next').mouseenter(CONTENTVIEW_IMAGEPREVIEW.mainControlNextMouseEnterFunction);
        $('#main-control-prev').mouseenter(CONTENTVIEW_IMAGEPREVIEW.mainControlPrevMouseEnterFunction);
    }
-    //$('.main-control').mouseleave(CONTENTVIEW_IMAGEPREVIEW.mainControlMouseLeaveFunction);
    //$('.thumbnail:first').css('box-shadow','0px 7px 7px #555');
    $('.thumbnail:first').addClass('activeThumb');
    CONTENTVIEW_IMAGEPREVIEW.handleDispNextPrevButton();

--- a/abvw/js/contentview_InitObjects.js
+++ b/abvw/js/contentview_InitObjects.js
@@ -266,11 +266,16 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
            	CONTENTVIEW.oldContent_Back();
            } else {
                if (CONTENTVIEW_GETDATA.getPageIndex() == 0) {
+                	//コンテンツ差し替えチェック
+                	CONTENTVIEW.deleteMaxPageOverData();
                    if(CONTENTVIEW_INITOBJECT.isHasPageBGM()){
                    	CONTENTVIEW.isPendingContentBGM = true;
                    } else {
                    	CONTENTVIEW.isPendingContentBGM = false;
                    }
                    CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages)
 					 				.setPageObjects(CONTENTVIEW_GENERAL.pageObjects)
 					 				.setUpPage(0);

--- a/abvw/js/stview.js
+++ b/abvw/js/stview.js
@@ -18,7 +18,6 @@ STVIEW.processLogin = function(cid,sid) {
 	// Get url to login
 	var apiLoginUrl = ClientData.conf_apiLoginUrl();
-	//alert("aaaa");
 	$('#main-error-message').html("loading...");
 	$('#main-error-message').show();
@@ -58,7 +57,7 @@ STVIEW.processLogin = function(cid,sid) {
 				//コンテンツIDセット
 				ClientData.contentInfo_contentId(cid);
 				//ストリーミングのビューアへ移動
-				AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentViewStreaming + "?123456");
+				AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentViewStreaming + "?__UPDATEID__");
 			} else {
 				$('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
@@ -127,9 +126,9 @@ STVIEW.saveLoginInfo = function(data) {
 //$(document).ready(function () {
 STVIEW.ready = function(){
-	//location.href="http://freebsd.csie.nctu.edu.tw/~freedom/html5/";
+	//$('#main-error-message').html( window.location.href );
+	//$('#main-error-message').show();
 	//return;
-	//console.log("STVIEW.ready");
 	//引数の確認
 	var sid = COMMON.getUrlParam('sid', '');
@@ -181,7 +180,7 @@ STVIEW.ready = function(){
 	}
 	//ページ番号指定有り
-	if( page == "" || page == "0"){
+	if( page == "" || page == "0" || page == "1"){
 		ClientData.common_prePageNo(null)
 	} else {
 		ClientData.common_prePageNo(page);
@@ -194,7 +193,13 @@ STVIEW.ready = function(){
 		STVIEW.longitude = longitude;
 	}
+	if( STVIEW.latitude != "" && STVIEW.longitude != "" ){
+		STVIEW.processLogin(cid,sid);
+	} else {
+		setTimeout(function (){
 			STVIEW.processLogin(cid,sid);
+		}, 1000);
+	}
 };
 //});

--- a/stview.html
+++ b/stview.html
@@ -16,7 +16,7 @@
    <script type="text/javascript" src="./abvw/common/js/common.js?__UPDATEID__"></script>
    <script type="text/javascript" src="./abvw/js/Limit_Access_Content.js?__UPDATEID__"></script>
    <script type="text/javascript" src="./abvw/js/login.js?__UPDATEID__"></script>
-    <script type="text/javascript" src="./abvw/js/stview.js?__UPDATEID__2"></script>
+    <script type="text/javascript" src="./abvw/js/stview.js?__UPDATEID__4"></script>
 <style>
 #loader-bg {
@@ -56,7 +56,6 @@
 		//$('#main-error-message').html("document ready");
 		//$('#main-error-message').show();
 		STVIEW.ready();
 		//$('#loader-bg').delay(900).fadeOut(800);
 		//$('#loader').delay(600).fadeOut(300);