mirror of
https://github.com/zhw2590582/ArtPlayer.git
synced 2026-10-25 08:01:20 -08:00
build all
Refactor utility functions for improved readability and consistency - Updated compatibility.js to use consistent line endings and formatting. - Refactored component.js for better readability and structure, including consistent use of arrow functions and binding. - Simplified dom.js functions with consistent formatting and improved readability. - Enhanced emitter.js with consistent formatting and arrow function usage. - Streamlined error.js for improved readability and consistency. - Refactored file.js to use consistent formatting and improved readability. - Improved format.js functions for better readability and consistency. - Updated index.js to maintain consistent export formatting. - Refactored property.js for improved readability and consistency. - Enhanced subtitle.js with consistent formatting and improved readability. - Refactored time.js for better readability and consistent formatting. fix: update lint script to target only source files for consistency Revert "fix: restore export statements for various plugins and update type definitions for better clarity" This reverts commit b5e969d81ec765cd8a34b06e6ef4f232ef25087f. fix: restore export statements for various plugins and update type definitions for better clarity Refactor type definitions to use interfaces instead of type aliases for better extensibility and clarity across i18n, icons, option, player, quality, setting, subtitle, template, and utils modules.
This commit is contained in:
Harvey Zack committed
1 parent
532dd67cfd
commit
35ad9883af
447 files changed
+18248
-17946
No files matched your search
@@ -1,101 +1,104 @@
|
||||
import { clamp, secondToTime, isMobile } from '../utils';
|
||||
import { setCurrentTime } from '../control/progress';
|
||||
import { setCurrentTime } from '../control/progress'
|
||||
import { clamp, isMobile, secondToTime } from '../utils'
|
||||
|
||||
function GetSlideAngle(dx, dy) {
|
||||
return (Math.atan2(dy, dx) * 180) / Math.PI;
|
||||
return (Math.atan2(dy, dx) * 180) / Math.PI
|
||||
}
|
||||
|
||||
function GetSlideDirection(startX, startY, endX, endY) {
|
||||
var dy = startY - endY;
|
||||
var dx = endX - startX;
|
||||
var result = 0;
|
||||
const dy = startY - endY
|
||||
const dx = endX - startX
|
||||
let result = 0
|
||||
|
||||
if (Math.abs(dx) < 2 && Math.abs(dy) < 2) {
|
||||
return result;
|
||||
}
|
||||
if (Math.abs(dx) < 2 && Math.abs(dy) < 2) {
|
||||
return result
|
||||
}
|
||||
|
||||
var angle = GetSlideAngle(dx, dy);
|
||||
if (angle >= -45 && angle < 45) {
|
||||
result = 4;
|
||||
} else if (angle >= 45 && angle < 135) {
|
||||
result = 1;
|
||||
} else if (angle >= -135 && angle < -45) {
|
||||
result = 2;
|
||||
} else if ((angle >= 135 && angle <= 180) || (angle >= -180 && angle < -135)) {
|
||||
result = 3;
|
||||
}
|
||||
const angle = GetSlideAngle(dx, dy)
|
||||
if (angle >= -45 && angle < 45) {
|
||||
result = 4
|
||||
}
|
||||
else if (angle >= 45 && angle < 135) {
|
||||
result = 1
|
||||
}
|
||||
else if (angle >= -135 && angle < -45) {
|
||||
result = 2
|
||||
}
|
||||
else if ((angle >= 135 && angle <= 180) || (angle >= -180 && angle < -135)) {
|
||||
result = 3
|
||||
}
|
||||
|
||||
return result;
|
||||
return result
|
||||
}
|
||||
|
||||
export default function gestureInit(art, events) {
|
||||
if (isMobile && !art.option.isLive) {
|
||||
const { $video, $progress } = art.template;
|
||||
if (isMobile && !art.option.isLive) {
|
||||
const { $video, $progress } = art.template
|
||||
|
||||
let touchTarget = null;
|
||||
let isDragging = false;
|
||||
let startX = 0;
|
||||
let startY = 0;
|
||||
let startTime = 0;
|
||||
let touchTarget = null
|
||||
let isDragging = false
|
||||
let startX = 0
|
||||
let startY = 0
|
||||
let startTime = 0
|
||||
|
||||
const onTouchStart = (event) => {
|
||||
if (event.touches.length === 1 && !art.isLock) {
|
||||
if (touchTarget === $progress) {
|
||||
setCurrentTime(art, event);
|
||||
}
|
||||
|
||||
isDragging = true;
|
||||
const { pageX, pageY } = event.touches[0];
|
||||
startX = pageX;
|
||||
startY = pageY;
|
||||
startTime = art.currentTime;
|
||||
}
|
||||
};
|
||||
|
||||
const onTouchMove = (event) => {
|
||||
if (event.touches.length === 1 && isDragging && art.duration) {
|
||||
const { pageX, pageY } = event.touches[0];
|
||||
const direction = GetSlideDirection(startX, startY, pageX, pageY);
|
||||
const isHorizontal = [3, 4].includes(direction);
|
||||
const isVertical = [1, 2].includes(direction);
|
||||
const isLegal = (isHorizontal && !art.isRotate) || (isVertical && art.isRotate);
|
||||
if (isLegal) {
|
||||
const ratioX = clamp((pageX - startX) / art.width, -1, 1);
|
||||
const ratioY = clamp((pageY - startY) / art.height, -1, 1);
|
||||
const ratio = art.isRotate ? ratioY : ratioX;
|
||||
const TOUCH_MOVE_RATIO = touchTarget === $video ? art.constructor.TOUCH_MOVE_RATIO : 1;
|
||||
const currentTime = clamp(startTime + art.duration * ratio * TOUCH_MOVE_RATIO, 0, art.duration);
|
||||
art.seek = currentTime;
|
||||
art.emit('setBar', 'played', clamp(currentTime / art.duration, 0, 1), event);
|
||||
art.notice.show = `${secondToTime(currentTime)} / ${secondToTime(art.duration)}`;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const onTouchEnd = () => {
|
||||
if (isDragging) {
|
||||
startX = 0;
|
||||
startY = 0;
|
||||
startTime = 0;
|
||||
isDragging = false;
|
||||
touchTarget = null;
|
||||
}
|
||||
};
|
||||
|
||||
if (art.option.gesture) {
|
||||
events.proxy($video, 'touchstart', (event) => {
|
||||
touchTarget = $video;
|
||||
onTouchStart(event);
|
||||
});
|
||||
events.proxy($video, 'touchmove', onTouchMove);
|
||||
const onTouchStart = (event) => {
|
||||
if (event.touches.length === 1 && !art.isLock) {
|
||||
if (touchTarget === $progress) {
|
||||
setCurrentTime(art, event)
|
||||
}
|
||||
|
||||
events.proxy($progress, 'touchstart', (event) => {
|
||||
touchTarget = $progress;
|
||||
onTouchStart(event);
|
||||
});
|
||||
|
||||
events.proxy($progress, 'touchmove', onTouchMove);
|
||||
events.proxy(document, 'touchend', onTouchEnd);
|
||||
isDragging = true
|
||||
const { pageX, pageY } = event.touches[0]
|
||||
startX = pageX
|
||||
startY = pageY
|
||||
startTime = art.currentTime
|
||||
}
|
||||
}
|
||||
|
||||
const onTouchMove = (event) => {
|
||||
if (event.touches.length === 1 && isDragging && art.duration) {
|
||||
const { pageX, pageY } = event.touches[0]
|
||||
const direction = GetSlideDirection(startX, startY, pageX, pageY)
|
||||
const isHorizontal = [3, 4].includes(direction)
|
||||
const isVertical = [1, 2].includes(direction)
|
||||
const isLegal = (isHorizontal && !art.isRotate) || (isVertical && art.isRotate)
|
||||
if (isLegal) {
|
||||
const ratioX = clamp((pageX - startX) / art.width, -1, 1)
|
||||
const ratioY = clamp((pageY - startY) / art.height, -1, 1)
|
||||
const ratio = art.isRotate ? ratioY : ratioX
|
||||
const TOUCH_MOVE_RATIO = touchTarget === $video ? art.constructor.TOUCH_MOVE_RATIO : 1
|
||||
const currentTime = clamp(startTime + art.duration * ratio * TOUCH_MOVE_RATIO, 0, art.duration)
|
||||
art.seek = currentTime
|
||||
art.emit('setBar', 'played', clamp(currentTime / art.duration, 0, 1), event)
|
||||
art.notice.show = `${secondToTime(currentTime)} / ${secondToTime(art.duration)}`
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const onTouchEnd = () => {
|
||||
if (isDragging) {
|
||||
startX = 0
|
||||
startY = 0
|
||||
startTime = 0
|
||||
isDragging = false
|
||||
touchTarget = null
|
||||
}
|
||||
}
|
||||
|
||||
if (art.option.gesture) {
|
||||
events.proxy($video, 'touchstart', (event) => {
|
||||
touchTarget = $video
|
||||
onTouchStart(event)
|
||||
})
|
||||
events.proxy($video, 'touchmove', onTouchMove)
|
||||
}
|
||||
|
||||
events.proxy($progress, 'touchstart', (event) => {
|
||||
touchTarget = $progress
|
||||
onTouchStart(event)
|
||||
})
|
||||
|
||||
events.proxy($progress, 'touchmove', onTouchMove)
|
||||
events.proxy(document, 'touchend', onTouchEnd)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user