x15904151985/ArtPlayer
1
0 Fork 0
mirror of https://github.com/zhw2590582/ArtPlayer.git synced 2026-10-30 03:51:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

修改弹幕模式变量

Browse Source
This commit is contained in:
Harvey committed 2020-02-24 11:19:17 +08:00
1 parent 31f8f9fe09
commit a969686d88
6 files changed
+60 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/artplayer-plugin-danmuku/src/bilibili.js
+23 -21
View File
@@ -3,12 +3,12 @@ export function getMode(key) {
case 1:
case 2:
case 3:
return 'scroll';
return 0;
case 4:
case 5:
return 'static';
return 1;
default:
return null;
return 0;
}
}
@@ -17,22 +17,22 @@ export function bilibiliDanmuParseFromXml(xmlString) {
const srtList = xmlString.match(/<d([\S ]*?>[\S ]*?)<\/d>/gi);
return srtList.length
? srtList.map(item => {
const [, attrStr, text] = item.match(/<d p="(.+)">(.+)<\/d>/);
const attr = attrStr.split(',');
return attr.length === 8 && text.trim()
? {
text,
time: Number(attr[0]),
mode: getMode(Number(attr[1])),
fontSize: Number(attr[2]),
color: `#${Number(attr[3]).toString(16)}`,
timestamp: Number(attr[4]),
pool: Number(attr[5]),
userID: attr[6],
rowID: Number(attr[7]),
}
: null;
})
const [, attrStr, text] = item.match(/<d p="(.+)">(.+)<\/d>/);
const attr = attrStr.split(',');
return attr.length === 8 && text.trim()
? {
text,
time: Number(attr[0]),
mode: getMode(Number(attr[1])),
fontSize: Number(attr[2]),
color: `#${Number(attr[3]).toString(16)}`,
timestamp: Number(attr[4]),
pool: Number(attr[5]),
userID: attr[6],
rowID: Number(attr[7]),
}
: null;
})
: [];
}
@@ -50,8 +50,10 @@ export function bilibiliDanmuParseFromAv(av) {
.then(res => res.json())
.then(res => {
if (res.code === 0 && res.data && res.data.cid) {
return bilibiliDanmuParseFromUrl(`${corsUrl}https://api.bilibili.com/x/v1/dm/list.so?oid=${res.data.cid}`);
return bilibiliDanmuParseFromUrl(
`${corsUrl}https://api.bilibili.com/x/v1/dm/list.so?oid=${res.data.cid}`,
);
}
throw new Error(`Unable to get data: ${JSON.stringify(res)}`);
});
}
}
packages/artplayer-plugin-danmuku/src/danmuku.js
+5 -5
View File
@@ -85,7 +85,7 @@ export default class Danmuku {
danmu.$state = 'emit';
danmu.$lastStartTime = Date.now();
switch (danmu.mode) {
case 'scroll':
case 0:
danmu.$ref.style.transform = `translateX(${-danmu.$restWidth}px) translateY(0px) translateZ(0px)`;
danmu.$ref.style.transition = `transform ${danmu.$restTime}s linear 0s`;
break;
@@ -100,7 +100,7 @@ export default class Danmuku {
filter(this.queue, 'emit', danmu => {
danmu.$state = 'stop';
switch (danmu.mode) {
case 'scroll': {
case 0: {
const { left: playerLeft, width: playerWidth } = getRect($player);
const { left: danmuLeft } = getRect(danmu.$ref);
const translateX = playerWidth - (danmuLeft - playerLeft) + 5;
@@ -174,7 +174,7 @@ export default class Danmuku {
const danmuTop = getDanmuTop(this, danmu);
danmu.$state = 'emit';
switch (danmu.mode) {
case 'scroll': {
case 0: {
danmu.$restWidth = danmuLeft + danmuWidth + 5;
danmu.$ref.style.left = `${danmuLeft}px`;
danmu.$ref.style.top = `${danmuTop}px`;
@@ -182,7 +182,7 @@ export default class Danmuku {
danmu.$ref.style.transition = `transform ${danmu.$restTime}s linear 0s`;
break;
}
case 'static':
case 1:
danmu.$ref.style.top = `${danmuTop}px`;
danmu.$ref.style.left = '50%';
danmu.$ref.style.marginLeft = `-${danmuWidth / 2}px`;
@@ -240,7 +240,7 @@ export default class Danmuku {
}
this.queue.push({
mode: 'scroll',
mode: 0,
...danmu,
$state: 'wait',
$ref: null,