#18760 Web版で新コンテンツタイプの一覧表示、詳細画面を追加する

abvw/common/js/common.js

@@ -75,7 +75,8 @@ COMMON.ContentTypeKeys = {
 	Type_Html : 'html',
 	Type_Enquete : 'enquete',
 	Type_Exam : 'exam',
-	Type_Link : 'url'
+	Type_Link : 'url',
+	Type_PanoMovie : 'panoMovie'
 };
 
 /*

abvw/js/contentview.js

@@ -2114,9 +2114,43 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
     else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video){
     	CONTENTVIEW.handleForContentTypeVideo(resourceUrl);
     }
+    else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
+    	var url = ClientData.conf_apiUrl();
+    	
+    	var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
+    	var apiUrl = linkUrlTmp + "/createSession/";
+    	linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/panorama/play/" + ClientData.contentInfo_contentId() + "/";
+    	var linkUrlFinish = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/panorama/finishPlay/" + ClientData.contentInfo_contentId() + "/";
+    	var params = {
+    	        sid: ClientData.userInfo_sid()
+    	    };
+    	var sysSettings = AVWEB.avwSysSetting();
+    	// ajax によるAPIの実行（json）
+    	$.ajax( {
+    		async:		false,
+    		type:		'GET',
+    		url:		apiUrl,
+    		dataType:	'text',
+    		data:		params,
+    		crossDomain: true,
+	  		beforeSend:	function(xhr) {
+	  			xhr.setRequestHeader('X-AGT-AppId', sysSettings.appName);
+				xhr.setRequestHeader('X-AGT-AppVersion', sysSettings.appVersion);
+	   		},
+    		success:	function(data) {
+    			linkUrlTmp2 = linkUrlTmp + ";jsessionid=" + data;
+    			console.log("linkUrlTmp2" + linkUrlTmp2);
+    	    	CONTENTVIEW.handleForContentTypePanoMovie(linkUrlTmp2);
+    		},
+    		error:		function(xmlHttpRequest, txtStatus, errorThrown) {
+    			/* call custom error process */
+    			console.log("error" + errorThrown);
+    		}
+    	});    	
+    }
     else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html){
 
-        var linkUrlTmp = resourceUrl;
+        var linkUrlTmp = resourceUrl;console.log("linkUrlTmp" + linkUrlTmp);
         //HTMLカスタムログオプション有り
         if(ClientData.serviceOpt_html_custom_log() == 'Y'){
             var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
@@ -2206,6 +2240,13 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
     });
 };
 
+CONTENTVIEW.deleteCookie = function(){
+	var cookies = $.cookie();console.log("cookies" + cookies);
+	for(var cookie in cookies) {
+	   $.removeCookie(cookie);
+	}
+	console.log("hello world!!");
+}
 //handle for content type = video
 CONTENTVIEW.handleForContentTypeVideo = function(resourceUrl){
 
@@ -2273,6 +2314,32 @@ CONTENTVIEW.handleForContentTypeVideo = function(resourceUrl){
     //END TRB00068
 };
 
+//handle for content type = panoMovie
+CONTENTVIEW.handleForContentTypePanoMovie = function(resourceUrl){
+	//Create Dialog overlay
+    var $container = $('#dialog');
+
+    $container.html('');
+    $container.css('left','0%');
+    $container.css('width','100%');
+    $container.css('background-color','white');
+
+    //START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
+    if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){
+       $container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%;"></iframe>');
+
+       $container.css('overflow', 'scroll');
+       $container.css('-webkit-overflow-scrolling', 'touch');
+    }
+    else{
+       $container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%; height: 100%; "> </iframe>');
+       $container.css('overflow', 'hidden');
+    }
+    //END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
+    $container.show();
+    return;
+};
+
 //handle for content type = music
 CONTENTVIEW.handleForContentTypeMusic = function(resourceUrl){
 
@@ -2399,7 +2466,7 @@ CONTENTVIEW.handleForContentTypeEnquete = function(resourceUrl){
 //Check type of content
 CONTENTVIEW.isMediaAndHTMLContent = function(){
     if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video ||
-    		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html){
+    		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
         return true;
     }
     else{
@@ -2414,7 +2481,7 @@ CONTENTVIEW.enableSpecifyControl = function(){
 	CONTENTVIEW_GENERAL.disableAllControl();
 
     if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music ||
-    		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video){
+    		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
 
     	CONTENTVIEW.enableControlForMediaAndHtmlType();
     }
@@ -4342,7 +4409,7 @@ CONTENTVIEW.draw = function(context, opt) {
     context.save();
 
     //Draw on main canvas
-    if(opt==null || opt == 0){
+    if(opt==null || opt == 0){console.log("CONTENTVIEW_GETDATA.getContent().currentPage.drawPage(context)" + CONTENTVIEW_GETDATA.getContent().currentPage.drawPage(context));
         /* draw page objects */
         CONTENTVIEW_GETDATA.getContent().currentPage.drawPage(context);
     }
@@ -5759,7 +5826,6 @@ CONTENTVIEW.ready = function(initContentId){
          params,
          function (data) {
         	 CONTENTVIEW_GENERAL.contentType = data.contentData.contentType;
-
         	 if(ClientData.isStreamingMode()){
         		 //リンク、その他は表示出来ないのでここでブロックする
         		 if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Link || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Others){
@@ -5781,7 +5847,6 @@ CONTENTVIEW.ready = function(initContentId){
                 if (ClientData.IsRefresh() == true) {
                     //Check if is pdf content
                     if(CONTENTVIEW.isMediaAndHTMLContent()){
-
                     	CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType();
                         document.title = data.contentData.contentName + ' | ' + I18N.i18nText('sysAppTitle');
                     }
@@ -5802,7 +5867,6 @@ CONTENTVIEW.ready = function(initContentId){
                 }
             }
             else {
-
                 //Check if is pdf content
                 if(CONTENTVIEW.isMediaAndHTMLContent()){
                 	CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType();
@@ -5880,7 +5944,6 @@ CONTENTVIEW.ready = function(initContentId){
                 		CONTENTVIEW_INITOBJECT.initPage();
                 	 }
                 }
-
                 //ストリーミングならデバイス側に初期表示済通知
             	if(ClientData.isStreamingMode()){
             		CONTENTVIEW_STREAMING.initPageView();

abvw/js/header.js

@@ -1092,6 +1092,11 @@ HEADER.getIconTypeContent = function(contentType) {
                 src = 'img/bookshelf/icon_08.png';
                 break;
             }
+        case COMMON.ContentTypeKeys.Type_PanoMovie:
+	        {
+	            src = 'img/bookshelf/icon_11.png';
+	            break;
+	        }
         default: break
     }
     return src;