#19490 360°Getits Webビューアツールバーの非表示

abvw/common/js/common.js

@@ -372,6 +372,7 @@ COMMON.Keys = {
     conf_apiLoginUrl : 'conf_apiLoginUrl',
     conf_apiResourceDlUrl : 'conf_apiResourceDlUrl',
     storeUrl : 'storeUrl',
+    siteUrl : 'siteUrl',
 
     latitude : 'latitude',
     longitude : 'longitude',
@@ -1709,6 +1710,14 @@ var ClientData = {
         }
     },
     
+    siteUrl : function(data) {
+        if (arguments.length > 0) {
+            SessionStorageUtils.set(COMMON.Keys.siteUrl, data);
+        } else {
+            return SessionStorageUtils.get(COMMON.Keys.siteUrl);
+        }
+    },
+
     latitude : function(data) {
         if (arguments.length > 0) {
             SessionStorageUtils.set(COMMON.Keys.latitude, data);

abvw/js/contentview.js

@@ -2140,10 +2140,6 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
     else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
     	var url = ClientData.conf_apiUrl();    	
     	var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
-    	if(ClientData.isGetitsMode() == true){    		
-    		var linkUrlGetits = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "open/panorama/play/" + CONTENTVIEW_GENERAL.contentID + "/";
-    		CONTENTVIEW.handleForContentTypePanoMovie(linkUrlGetits);
-    	}else{
 		var apiUrl = linkUrlTmp + "/createSession/";
 		
 		CONTENTVIEW.panoOldContent();
@@ -2175,14 +2171,11 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
     			console.log("error" + errorThrown);
     		}
     	});
-    	}    	    	   	  	
+    	    	    	   	  	
     }else if(CONTENTVIEW_GENERAL.contentType == 'panoImage'){
 	    var url = ClientData.conf_apiUrl();    	
 		var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
-		if(ClientData.isGetitsMode() == true){    		
-    		var linkUrlGetits = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "open/vtour/play/" + CONTENTVIEW_GENERAL.contentID + "/";
-    		CONTENTVIEW.handleForContentTypePanoMovie(linkUrlGetits);
-    	}else{
+
 		var apiUrl = linkUrlTmp + "/createSession/";
 		
 		var oldPageNo = CONTENTVIEW.panoOldContent();
@@ -2218,7 +2211,7 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
     			console.log("error" + errorThrown);
     		}
     	});
-    	}  	
+    	  	
     }
     else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html){
 

abvw/js/login.js

@@ -751,12 +751,16 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
 		} else {
 			// Go to Conten view page
 			if(ClientData.isGetitsMode()){
-				if(contentType == COMMON.ContentTypeKeys.Type_Html || contentType == COMMON.ContentTypeKeys.Type_Link){
+				if(contentType == COMMON.ContentTypeKeys.Type_Html || contentType == COMMON.ContentTypeKeys.Type_Link || contentType == COMMON.ContentTypeKeys.Type_PanoImage || contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
 					var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
 					var htmlUrl = LOGIN.htmlLinkById(strContentId, contentType);
 					if(htmlUrl){
 						//TODO 閲覧ログ送信
+						if(contentType == COMMON.ContentTypeKeys.Type_Html){
 							location.href=htmlUrl + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl + "&cid=" + strContentId;
+						}else{
+							location.href = htmlUrl;
+						}						
 					}
 					return;
 				}
@@ -814,6 +818,11 @@ LOGIN.htmlLinkById = function(contentId,contentType) {
 	};
 
 	var resourceUrl = "";
+	if(contentType == COMMON.ContentTypeKeys.Type_PanoImage){
+		resourceUrl = ClientData.siteUrl() + ClientData.userInfo_accountPath() + "/open/vtour/play/" + contentId;
+	}else if(contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
+		resourceUrl = ClientData.siteUrl() + ClientData.userInfo_accountPath() + "/open/panorama/play/" + contentId;
+	}else{
 		AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
 				function(data) {
 					if(contentType == COMMON.ContentTypeKeys.Type_Html){
@@ -823,6 +832,7 @@ LOGIN.htmlLinkById = function(contentId,contentType) {
 					}
 				}
 			);
+	}
 	
 	if( !resourceUrl ){
 		resourceUrl = "";
@@ -901,6 +911,8 @@ LOGIN.ready = function() {
 
 			// getitsモード有効
 			ClientData.isGetitsMode(true);
+			
+			ClientData.siteUrl(siteUrl);
 			// api接続先設定
 			ClientData.conf_apiUrl(siteUrl + "{0}/abvapi");
 			ClientData.conf_apiLoginUrl(siteUrl + "nuabvapi");