xiaoxue_admin
/
DPlayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

limited danmaku

This commit is contained in:
DIYgod 2017-09-02 12:47:50 +08:00
parent 72012e7f80
commit 76d34cc317
No known key found for this signature in database
GPG Key ID: EC0B76A252D3EF67
5 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demo/index.html
View File

@ -24,10 +24,7 @@
},
danmaku: {
id: '9E2E3368B56CDBB4',
api: 'https://api.prprpr.me/dplayer/',
margin: {
bottom: '15%'
}
api: 'https://api.prprpr.me/dplayer/'
}
});
</script>
@ -60,11 +57,15 @@
type: 'auto'
},
danmaku: {
id: '9E2E3368B56CDBB42',
id: '9E2E3368B56CDBB4',
api: 'https://api.prprpr.me/dplayer/',
token: 'tokendemo',
maximum: 3000,
user: 'DIYgod'
user: 'DIYgod',
margin: {
bottom: '15%'
},
unlimited: true
},
contextmenu: [
{

2
dist/DPlayer.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/DPlayer.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

1
src/DPlayer.js
View File

@ -103,6 +103,7 @@ class DPlayer {
borderColor: this.option.theme,
height: this.arrow ? 24 : 30,
time: () => this.video.currentTime,
unlimited: this.option.danmaku.unlimited,
api: {
id: this.option.danmaku.id,
address: this.option.danmaku.api,

33
src/danmaku.js
View File

@ -148,7 +148,7 @@ class Danmaku {
const getTunnel = (ele, type, width) => {
const tmp = danWidth / danSpeed(width);
for (let i = 0; ; i++) {
for (let i = 0; this.options.unlimited || i < itemY; i++) {
const item = this.danTunnel[type][i + ''];
if (item && item.length) {
if (type !== 'right') {
@ -176,6 +176,7 @@ class Danmaku {
return i % itemY;
}
}
return -1;
};
if (Object.prototype.toString.call(dan) !== '[object Array]') {
@ -207,29 +208,41 @@ class Danmaku {
});
const itemWidth = this._measure(dan[i].text);
let tunnel;
// adjust
switch (dan[i].type) {
case 'right':
item.style.width = itemWidth + 1 + 'px';
item.style.top = itemHeight * getTunnel(item, dan[i].type, itemWidth) + 'px';
item.style.transform = `translateX(-${danWidth}px)`;
tunnel = getTunnel(item, dan[i].type, itemWidth);
if (tunnel >= 0) {
item.style.width = itemWidth + 1 + 'px';
item.style.top = itemHeight * tunnel + 'px';
item.style.transform = `translateX(-${danWidth}px)`;
}
break;
case 'top':
item.style.top = itemHeight * getTunnel(item, dan[i].type) + 'px';
tunnel = getTunnel(item, dan[i].type);
if (tunnel >= 0) {
item.style.top = itemHeight * tunnel + 'px';
}
break;
case 'bottom':
item.style.bottom = itemHeight * getTunnel(item, dan[i].type) + 'px';
tunnel = getTunnel(item, dan[i].type);
if (tunnel >= 0) {
item.style.bottom = itemHeight * tunnel + 'px';
}
break;
default:
console.error(`Can't handled danmaku type: ${dan[i].type}`);
}
// move
item.classList.add(`dplayer-danmaku-move`);
if (tunnel >= 0) {
// move
item.classList.add(`dplayer-danmaku-move`);
// insert
docFragment.appendChild(item);
// insert
docFragment.appendChild(item);
}
}
this.container.appendChild(docFragment);