パフォーマンス改善 動画キャッシュ関連

abvw/common/js/avweb.js

@@ -631,7 +631,7 @@ function avwGrabContentPageImage(accountPath, params, success, error) {
 				//フィアルシステムが有効であればキャッシュ
 				if( CONTENTVIEW_FILESYSTEM.fs != null ){
 					var fileName = "page_" + params.pageNo + ".dat";
-					CONTENTVIEW_FILESYSTEM.saveFile(params.contentId, fileName, src);
+					CONTENTVIEW_FILESYSTEM.savePageFile(params.contentId, fileName, src);
 				}
 
 	            if (success) {

abvw/js/contentview.js

@@ -2817,7 +2817,7 @@ CONTENTVIEW.ready = function(){
     // Set event to prevent leave
     ToogleLogoutNortice();
     //START TRB00048 - EDITOR : Long - Date : 09/18/2013 - Summary : Fix Jumpcontent              
-    getContentID();     
+    getContentID();
                
     avwCmsApi(ClientData.userInfo_accountPath(),
          "webGetContent",
@@ -4955,7 +4955,7 @@ function showControlsVideo(target) {
 };
 
 /* show video*/
-function showVideoObject(x, y, width, height, src, isFullscreen) {
+function showVideoObject(x, y, width, height, src, isFullscreen, isAddKey) {
 
     var pt1 = imageToScreen(x, y);
     var pt2 = imageToScreen(x + width, y + height);
@@ -4967,7 +4967,11 @@ function showVideoObject(x, y, width, height, src, isFullscreen) {
 
     //getPosVideo(x, y, (pt2.x - pt1.x), (pt2.y - pt1.y));
     getPosVideo(x, y, width, height);
-
+    
+    if( !isFullscreen && isAddKey ){
+    	src = src + '&key=' + (new Date()).toIdString();
+    }
+    
     if (isFullscreen === false) {
         $('#playvideo').attr('z-order', '1000');
         $('#playvideo').css('left', pt1.x + 'px');
@@ -4979,8 +4983,8 @@ function showVideoObject(x, y, width, height, src, isFullscreen) {
                              'width="' + (pt2.x - pt1.x) + '" ' +
                              'height="' + (pt2.y - pt1.y) + '" ' +
                              'autoplay controls loop>' +
-                             '   <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' +
-                             '    <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' +
+                             '   <source src="' + src + '" type="video/mp4"> ' +
+                             '    <source src="' + src + '" type="video/ogg"> ' +
                              '</video>'
                 );
         } else {
@@ -4988,8 +4992,8 @@ function showVideoObject(x, y, width, height, src, isFullscreen) {
                              'width="' + (pt2.x - pt1.x) + '" ' +
                              'height="' + (pt2.y - pt1.y) + '" ' +
                              'autoplay controls>' +
-                             '   <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' +
-                             '    <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' +
+                             '   <source src="' + src + '" type="video/mp4"> ' +
+                             '    <source src="' + src + '" type="video/ogg"> ' +
                              '</video>'
                 );
         }

abvw/js/contentview_Events.js

@@ -868,6 +868,8 @@ function onUnlock() {
 
 function onClick_CanvasMain(event) {
      
+	console.log("onClick_CanvasMain");
+	
     event.preventDefault(); 
     
     if(isLoadingObject){       
@@ -1493,6 +1495,8 @@ function resetNaviAction(){
 
 function onTouchstart(evt){
 
+	console.log("onTouchstart _isClick:" + _isClick);
+	
     //evt.preventDefault();
 
     if(ClientData.IsAddingMarking() == true){
@@ -1540,7 +1544,6 @@ function onTouchstart(evt){
     _touchFirstPos = null;
     
     if(_bWin8TouchEnabled){
-    
         _bufferPoints = [];
         if(_startPoints.length == 0){
             // start navi page case
@@ -1728,6 +1731,8 @@ var isPreventClick = false;
 
 function onTouchmove(evt){
 
+	console.log("onTouchmove isClick:" + _isClick);
+	
     //evt.preventDefault();
 
     if(ClientData.IsAddingMarking() == true){
@@ -1931,11 +1936,15 @@ function onTouchmove(evt){
         }       
     }
     else{
-        _isClick = false; 
+        //_isClick = false; 
         // for android or ipad
         touch1 = evt.touches[0];
         touch2 = evt.touches[1];
         
+        if( touch2 != null ){
+            _isClick = false; 
+        }
+        
         if(_3dAnimate){
                            
             var imagePt = screenToImage(touch1.pageX, touch1.pageY);
@@ -2006,6 +2015,8 @@ function onTouchmove(evt){
 
 function onTouchend(evt){
     
+	console.log("onTouchend isClick:" + _isClick);
+	
     //evt.preventDefault();
     
     if(ClientData.IsAddingMarking() == true){
@@ -2080,8 +2091,10 @@ function onTouchend(evt){
                 touchStartedTime= 0;
                 if(_moveNum == 2){
                     nextPage_click();
+                    return;
                 }else if (_moveNum == -2){
                     prevPage_click();
+                    return;
                 }else {
                     correctCanvasPosition();
                 }