x15904151985/ArtPlayer
1
0 Fork 0
mirror of https://github.com/zhw2590582/ArtPlayer.git synced 2026-10-09 11:56:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

add getPosFromEventMobile

Browse Source
This commit is contained in:
Harvey committed 2022-04-26 18:21:24 +08:00
1 parent 8549661327
commit e862f8d56c
5 files changed
+90 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/uncompiled/artplayer.js
+50 -9
View File
@@ -2723,7 +2723,7 @@
var _$progress$getBoundin = $progress.getBoundingClientRect(),
left = _$progress$getBoundin.left;
var eventLeft = typeof event.pageX === 'number' ? event.pageX : event.touches[0].clientX;
var eventLeft = event.pageX;
var width = clamp(eventLeft - left, 0, $progress.clientWidth);
var second = width / $progress.clientWidth * art.duration;
var time = secondToTime(second);
@@ -2735,6 +2735,32 @@
percentage: percentage
};
}
function getPosFromEventMobile(art, event) {
var autoOrientation = art.plugins.autoOrientation && art.plugins.autoOrientation.state;
var $progress = art.template.$progress;
var _$progress$getBoundin2 = $progress.getBoundingClientRect(),
left = _$progress$getBoundin2.left,
top = _$progress$getBoundin2.top;
var _event$touches$ = event.touches[0],
clientX = _event$touches$.clientX,
clientY = _event$touches$.clientY;
var width = clamp(clientX - left, 0, $progress.clientWidth);
var height = clamp(clientY - top, 0, $progress.clientWidth);
var size = autoOrientation ? height : width;
var secondX = width / $progress.clientWidth * art.duration;
var secondY = height / $progress.clientWidth * art.duration;
var second = autoOrientation ? secondY : secondX;
var time = secondToTime(second);
var percentage = clamp(size / $progress.clientWidth, 0, 1);
return {
second: second,
time: time,
size: size,
percentage: percentage
};
}
function progress(options) {
return function (art) {
var icons = art.icons,
@@ -2875,10 +2901,11 @@
});
proxy(document, 'touchmove', function (event) {
if (event.touches.length === 1 && isDroging) {
var _getPosFromEvent5 = getPosFromEvent(art, event),
second = _getPosFromEvent5.second,
percentage = _getPosFromEvent5.percentage;
var _getPosFromEventMobil = getPosFromEventMobile(art, event),
second = _getPosFromEventMobil.second,
percentage = _getPosFromEventMobil.percentage;
console.log(second, percentage);
setBar('played', percentage);
art.seek = second;
}
@@ -3221,7 +3248,7 @@
_this.add(thumbnails({
name: 'thumbnails',
disable: !option.thumbnails.url || option.isLive,
disable: !option.thumbnails.url || option.isLive || isMobile,
position: 'top',
index: 20
}));
@@ -3263,7 +3290,7 @@
_this.add(screenshot$1({
name: 'screenshot',
disable: !option.screenshot,
disable: !option.screenshot || isMobile,
position: 'right',
index: 20
}));
@@ -3904,12 +3931,17 @@
$video = art.template.$video;
var isDroging = false;
var startX = 0;
var startY = 0;
var currentTime = 0;
var pressTimer = null;
events.proxy($video, 'touchstart', function (event) {
if (event.touches.length === 1) {
isDroging = true;
startX = event.touches[0].clientX;
var _event$touches$ = event.touches[0],
clientX = _event$touches$.clientX,
clientY = _event$touches$.clientY;
startX = clientX;
startY = clientY;
clearTimeout(pressTimer);
pressTimer = setTimeout(function () {
art.playbackRate = 3;
@@ -3918,11 +3950,19 @@
});
events.proxy($video, 'touchmove', function (event) {
if (event.touches.length === 1 && isDroging) {
var clientX = event.touches[0].clientX;
var _event$touches$2 = event.touches[0],
clientX = _event$touches$2.clientX,
clientY = _event$touches$2.clientY;
var ratioX = clamp((clientX - startX) / art.width, -1, 1);
var ratioY = clamp((clientY - startY) / art.height, -1, 1);
if (art.duration) {
currentTime = clamp(art.currentTime + art.duration * ratioX, 0, art.duration);
if (art.plugins.autoOrientation && art.plugins.autoOrientation.state) {
currentTime = clamp(art.currentTime + art.duration * ratioY, 0, art.duration);
} else {
currentTime = clamp(art.currentTime + art.duration * ratioX, 0, art.duration);
}
notice.show = "".concat(secondToTime(currentTime), " / ").concat(secondToTime(art.duration));
}
}
@@ -3938,6 +3978,7 @@
}
startX = 0;
startY = 0;
currentTime = 0;
isDroging = false;
clearTimeout(pressTimer);
docs/uncompiled/artplayer.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"artplayer.js","sources":["../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/classCallCheck.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/createClass.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/assertThisInitialized.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/setPrototypeOf.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/inherits.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/typeof.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/possibleConstructorReturn.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/getPrototypeOf.js","../../node_modules/_style-inject@0.3.0@style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/_option-validator@2.0.6@option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/isNativeFunction.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/isNativeReflectConstruct.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/construct.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/arrayLikeToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/arrayWithoutHoles.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/iterableToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/unsupportedIterableToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/nonIterableSpread.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrMix.js","../../packages/artplayer/src/player/playMix.js","../../packages/artplayer/src/player/pauseMix.js","../../packages/artplayer/src/player/toggleMix.js","../../packages/artplayer/src/player/seekMix.js","../../packages/artplayer/src/player/volumeMix.js","../../packages/artplayer/src/player/currentTimeMix.js","../../packages/artplayer/src/player/durationMix.js","../../packages/artplayer/src/player/switchMix.js","../../packages/artplayer/src/player/playbackRateMix.js","../../packages/artplayer/src/player/aspectRatioMix.js","../../packages/artplayer/src/player/screenshotMix.js","../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMix.js","../../packages/artplayer/src/player/posterMix.js","../../packages/artplayer/src/player/autoHeightMix.js","../../packages/artplayer/src/player/themeMix.js","../../packages/artplayer/src/player/titleMix.js","../../packages/artplayer/src/player/exclusiveMix.js","../../packages/artplayer/src/player/subtitleOffsetMix.js","../../packages/artplayer/src/player/optionInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/index.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/superPropBase.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplayer/src/control/vLine truncated
{"version":3,"file":"artplayer.js","sources":["../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/classCallCheck.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/createClass.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/assertThisInitialized.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/setPrototypeOf.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/inherits.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/typeof.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/possibleConstructorReturn.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/getPrototypeOf.js","../../node_modules/_style-inject@0.3.0@style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/_option-validator@2.0.6@option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/isNativeFunction.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/isNativeReflectConstruct.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/construct.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/arrayLikeToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/arrayWithoutHoles.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/iterableToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/unsupportedIterableToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/nonIterableSpread.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrMix.js","../../packages/artplayer/src/player/playMix.js","../../packages/artplayer/src/player/pauseMix.js","../../packages/artplayer/src/player/toggleMix.js","../../packages/artplayer/src/player/seekMix.js","../../packages/artplayer/src/player/volumeMix.js","../../packages/artplayer/src/player/currentTimeMix.js","../../packages/artplayer/src/player/durationMix.js","../../packages/artplayer/src/player/switchMix.js","../../packages/artplayer/src/player/playbackRateMix.js","../../packages/artplayer/src/player/aspectRatioMix.js","../../packages/artplayer/src/player/screenshotMix.js","../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMix.js","../../packages/artplayer/src/player/posterMix.js","../../packages/artplayer/src/player/autoHeightMix.js","../../packages/artplayer/src/player/themeMix.js","../../packages/artplayer/src/player/titleMix.js","../../packages/artplayer/src/player/exclusiveMix.js","../../packages/artplayer/src/player/subtitleOffsetMix.js","../../packages/artplayer/src/player/optionInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/index.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/superPropBase.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplayer/src/control/vLine truncated
packages/artplayer/src/control/index.js
+3 -3
View File
@@ -1,4 +1,4 @@
import { errorHandle, addClass, removeClass } from '../utils';
import { errorHandle, addClass, removeClass, isMobile } from '../utils';
import Component from '../utils/component';
import fullscreen from './fullscreen';
import fullscreenWeb from './fullscreenWeb';
@@ -55,7 +55,7 @@ export default class Control extends Component {
this.add(
thumbnails({
name: 'thumbnails',
disable: !option.thumbnails.url || option.isLive,
disable: !option.thumbnails.url || option.isLive || isMobile,
position: 'top',
index: 20,
}),
@@ -109,7 +109,7 @@ export default class Control extends Component {
this.add(
screenshot({
name: 'screenshot',
disable: !option.screenshot,
disable: !option.screenshot || isMobile,
position: 'right',
index: 20,
}),
packages/artplayer/src/control/progress.js
+24 -2
View File
@@ -3,7 +3,7 @@ import { query, clamp, append, setStyle, setStyles, secondToTime, includeFromEve
export function getPosFromEvent(art, event) {
const { $progress } = art.template;
const { left } = $progress.getBoundingClientRect();
const eventLeft = typeof event.pageX === 'number' ? event.pageX : event.touches[0].clientX;
const eventLeft = event.pageX;
const width = clamp(eventLeft - left, 0, $progress.clientWidth);
const second = (width / $progress.clientWidth) * art.duration;
const time = secondToTime(second);
@@ -11,6 +11,27 @@ export function getPosFromEvent(art, event) {
return { second, time, width, percentage };
}
export function getPosFromEventMobile(art, event) {
const autoOrientation = art.plugins.autoOrientation && art.plugins.autoOrientation.state;
const { $progress } = art.template;
const { left, top } = $progress.getBoundingClientRect();
const { clientX, clientY } = event.touches[0];
const width = clamp(clientX - left, 0, $progress.clientWidth);
const height = clamp(clientY - top, 0, $progress.clientWidth);
const size = autoOrientation ? height : width;
const secondX = (width / $progress.clientWidth) * art.duration;
const secondY = (height / $progress.clientWidth) * art.duration;
const second = autoOrientation ? secondY : secondX;
const time = secondToTime(second);
const percentage = clamp(size / $progress.clientWidth, 0, 1);
return { second, time, size, percentage };
}
export default function progress(options) {
return (art) => {
const {
@@ -164,7 +185,8 @@ export default function progress(options) {
proxy(document, 'touchmove', (event) => {
if (event.touches.length === 1 && isDroging) {
const { second, percentage } = getPosFromEvent(art, event);
const { second, percentage } = getPosFromEventMobile(art, event);
console.log(second, percentage);
setBar('played', percentage);
art.seek = second;
}
packages/artplayer/src/events/gestureInit.js
+12 -3
View File
@@ -9,13 +9,16 @@ export default function gestureInit(art, events) {
let isDroging = false;
let startX = 0;
let startY = 0;
let currentTime = 0;
let pressTimer = null;
events.proxy($video, 'touchstart', (event) => {
if (event.touches.length === 1) {
isDroging = true;
startX = event.touches[0].clientX;
const { clientX, clientY } = event.touches[0];
startX = clientX;
startY = clientY;
clearTimeout(pressTimer);
pressTimer = setTimeout(() => {
@@ -26,11 +29,16 @@ export default function gestureInit(art, events) {
events.proxy($video, 'touchmove', (event) => {
if (event.touches.length === 1 && isDroging) {
const { clientX } = event.touches[0];
const { clientX, clientY } = event.touches[0];
const ratioX = clamp((clientX - startX) / art.width, -1, 1);
const ratioY = clamp((clientY - startY) / art.height, -1, 1);
if (art.duration) {
currentTime = clamp(art.currentTime + art.duration * ratioX, 0, art.duration);
if (art.plugins.autoOrientation && art.plugins.autoOrientation.state) {
currentTime = clamp(art.currentTime + art.duration * ratioY, 0, art.duration);
} else {
currentTime = clamp(art.currentTime + art.duration * ratioX, 0, art.duration);
}
notice.show = `${secondToTime(currentTime)} / ${secondToTime(art.duration)}`;
}
}
@@ -47,6 +55,7 @@ export default function gestureInit(art, events) {
}
startX = 0;
startY = 0;
currentTime = 0;
isDroging = false;
clearTimeout(pressTimer);