Skip to content

C
check
Commit 999c601a by Masaru Abe
Options

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

parent 4a385f13
Showing with 200 additions and 80 deletions
abvw/common/js/avweb.js
...@@ -631,7 +631,7 @@ function avwGrabContentPageImage(accountPath, params, success, error) { ...@@ -631,7 +631,7 @@ function avwGrabContentPageImage(accountPath, params, success, error) {
//フィアルシステムが有効であればキャッシュ //フィアルシステムが有効であればキャッシュ
if( CONTENTVIEW_FILESYSTEM.fs != null ){ if( CONTENTVIEW_FILESYSTEM.fs != null ){
var fileName = "page_" + params.pageNo + ".dat"; var fileName = "page_" + params.pageNo + ".dat";
CONTENTVIEW_FILESYSTEM.saveFile(params.contentId, fileName, src); CONTENTVIEW_FILESYSTEM.savePageFile(params.contentId, fileName, src);
} }
if (success) { if (success) {
......
abvw/js/contentview.js
...@@ -2817,7 +2817,7 @@ CONTENTVIEW.ready = function(){ ...@@ -2817,7 +2817,7 @@ CONTENTVIEW.ready = function(){
// Set event to prevent leave // Set event to prevent leave
ToogleLogoutNortice(); ToogleLogoutNortice();
//START TRB00048 - EDITOR : Long - Date : 09/18/2013 - Summary : Fix Jumpcontent //START TRB00048 - EDITOR : Long - Date : 09/18/2013 - Summary : Fix Jumpcontent
getContentID(); getContentID();
avwCmsApi(ClientData.userInfo_accountPath(), avwCmsApi(ClientData.userInfo_accountPath(),
"webGetContent", "webGetContent",
...@@ -4955,7 +4955,7 @@ function showControlsVideo(target) { ...@@ -4955,7 +4955,7 @@ function showControlsVideo(target) {
}; };
/* show video*/ /* 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 pt1 = imageToScreen(x, y);
var pt2 = imageToScreen(x + width, y + height); var pt2 = imageToScreen(x + width, y + height);
...@@ -4967,7 +4967,11 @@ function showVideoObject(x, y, width, height, src, isFullscreen) { ...@@ -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, (pt2.x - pt1.x), (pt2.y - pt1.y));
getPosVideo(x, y, width, height); getPosVideo(x, y, width, height);
if( !isFullscreen && isAddKey ){
src = src + '&key=' + (new Date()).toIdString();
}
if (isFullscreen === false) { if (isFullscreen === false) {
$('#playvideo').attr('z-order', '1000'); $('#playvideo').attr('z-order', '1000');
$('#playvideo').css('left', pt1.x + 'px'); $('#playvideo').css('left', pt1.x + 'px');
...@@ -4979,8 +4983,8 @@ function showVideoObject(x, y, width, height, src, isFullscreen) { ...@@ -4979,8 +4983,8 @@ function showVideoObject(x, y, width, height, src, isFullscreen) {
'width="' + (pt2.x - pt1.x) + '" ' + 'width="' + (pt2.x - pt1.x) + '" ' +
'height="' + (pt2.y - pt1.y) + '" ' + 'height="' + (pt2.y - pt1.y) + '" ' +
'autoplay controls loop>' + 'autoplay controls loop>' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' + ' <source src="' + src + '" type="video/mp4"> ' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' + ' <source src="' + src + '" type="video/ogg"> ' +
'</video>' '</video>'
); );
} else { } else {
...@@ -4988,8 +4992,8 @@ function showVideoObject(x, y, width, height, src, isFullscreen) { ...@@ -4988,8 +4992,8 @@ function showVideoObject(x, y, width, height, src, isFullscreen) {
'width="' + (pt2.x - pt1.x) + '" ' + 'width="' + (pt2.x - pt1.x) + '" ' +
'height="' + (pt2.y - pt1.y) + '" ' + 'height="' + (pt2.y - pt1.y) + '" ' +
'autoplay controls>' + 'autoplay controls>' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' + ' <source src="' + src + '" type="video/mp4"> ' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' + ' <source src="' + src + '" type="video/ogg"> ' +
'</video>' '</video>'
); );
} }
......
abvw/js/contentview_Events.js
...@@ -868,6 +868,8 @@ function onUnlock() { ...@@ -868,6 +868,8 @@ function onUnlock() {
function onClick_CanvasMain(event) { function onClick_CanvasMain(event) {
console.log("onClick_CanvasMain");
event.preventDefault(); event.preventDefault();
if(isLoadingObject){ if(isLoadingObject){
...@@ -1493,6 +1495,8 @@ function resetNaviAction(){ ...@@ -1493,6 +1495,8 @@ function resetNaviAction(){
function onTouchstart(evt){ function onTouchstart(evt){
console.log("onTouchstart _isClick:" + _isClick);
//evt.preventDefault(); //evt.preventDefault();
if(ClientData.IsAddingMarking() == true){ if(ClientData.IsAddingMarking() == true){
...@@ -1540,7 +1544,6 @@ function onTouchstart(evt){ ...@@ -1540,7 +1544,6 @@ function onTouchstart(evt){
_touchFirstPos = null; _touchFirstPos = null;
if(_bWin8TouchEnabled){ if(_bWin8TouchEnabled){
_bufferPoints = []; _bufferPoints = [];
if(_startPoints.length == 0){ if(_startPoints.length == 0){
// start navi page case // start navi page case
...@@ -1728,6 +1731,8 @@ var isPreventClick = false; ...@@ -1728,6 +1731,8 @@ var isPreventClick = false;
function onTouchmove(evt){ function onTouchmove(evt){
console.log("onTouchmove isClick:" + _isClick);
//evt.preventDefault(); //evt.preventDefault();
if(ClientData.IsAddingMarking() == true){ if(ClientData.IsAddingMarking() == true){
...@@ -1931,11 +1936,15 @@ function onTouchmove(evt){ ...@@ -1931,11 +1936,15 @@ function onTouchmove(evt){
} }
} }
else{ else{
_isClick = false; //_isClick = false;
// for android or ipad // for android or ipad
touch1 = evt.touches[0]; touch1 = evt.touches[0];
touch2 = evt.touches[1]; touch2 = evt.touches[1];
if( touch2 != null ){
_isClick = false;
}
if(_3dAnimate){ if(_3dAnimate){
var imagePt = screenToImage(touch1.pageX, touch1.pageY); var imagePt = screenToImage(touch1.pageX, touch1.pageY);
...@@ -2006,6 +2015,8 @@ function onTouchmove(evt){ ...@@ -2006,6 +2015,8 @@ function onTouchmove(evt){
function onTouchend(evt){ function onTouchend(evt){
console.log("onTouchend isClick:" + _isClick);
//evt.preventDefault(); //evt.preventDefault();
if(ClientData.IsAddingMarking() == true){ if(ClientData.IsAddingMarking() == true){
...@@ -2080,8 +2091,10 @@ function onTouchend(evt){ ...@@ -2080,8 +2091,10 @@ function onTouchend(evt){
touchStartedTime= 0; touchStartedTime= 0;
if(_moveNum == 2){ if(_moveNum == 2){
nextPage_click(); nextPage_click();
return;
}else if (_moveNum == -2){ }else if (_moveNum == -2){
prevPage_click(); prevPage_click();
return;
}else { }else {
correctCanvasPosition(); correctCanvasPosition();
} }
......
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