mirror of
https://github.com/zhw2590582/ArtPlayer.git
synced 2026-10-19 19:51:20 -08:00
feat: Add parameter to append danmuku library in artplayer-plugin-danmuku
This commit is contained in:
Harvey Zack committed
1 parent
390be821d6
commit
2d44d602e4
8 files changed
+86
-50
No files matched your search
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|||||||
|
|
||||||
- 优化 `setBar` 事件
|
- 优化 `setBar` 事件
|
||||||
- 新增 `artplayerPluginChapter` 插件
|
- 新增 `artplayerPluginChapter` 插件
|
||||||
|
- 新增 `art.plugins.artplayerPluginDanmuku.load(target)` 参数，用于追加弹幕库
|
||||||
|
|
||||||
## [5.1.4] - 2024-6-1
|
## [5.1.4] - 2024-6-1
|
||||||
|
|
||||||
|
|||||||
@@ -195,7 +195,6 @@ class Danmuku {
|
|||||||
this.$danmuku = template.$danmuku; // 弹幕层容器
|
this.$danmuku = template.$danmuku; // 弹幕层容器
|
||||||
this.$player = template.$player; // 播放器容器
|
this.$player = template.$player; // 播放器容器
|
||||||
this.art = art;
|
this.art = art;
|
||||||
this.danmus = []; // 原始弹幕数据
|
|
||||||
this.queue = []; // 实际弹幕队列
|
this.queue = []; // 实际弹幕队列
|
||||||
this.$refs = []; // 弹幕DOM节点池
|
this.$refs = []; // 弹幕DOM节点池
|
||||||
this.isStop = false; // 是否停止
|
this.isStop = false; // 是否停止
|
||||||
@@ -411,17 +410,36 @@ class Danmuku {
|
|||||||
return this.option.synchronousPlayback && this.art.playbackRate ? this.option.speed / Number(this.art.playbackRate) : this.option.speed;
|
return this.option.synchronousPlayback && this.art.playbackRate ? this.option.speed / Number(this.art.playbackRate) : this.option.speed;
|
||||||
}
|
}
|
||||||
// 加载弹幕
|
// 加载弹幕
|
||||||
async load() {
|
async load(danmuku) {
|
||||||
const { errorHandle } = this.utils;
|
const { errorHandle } = this.utils;
|
||||||
|
let danmus = [];
|
||||||
|
const target = danmuku || this.option.danmuku;
|
||||||
try {
|
try {
|
||||||
if (typeof this.option.danmuku === "function") this.danmus = await this.option.danmuku();
|
if (typeof target === "function") danmus = await target(); // 异步函数获取
|
||||||
else if (typeof this.option.danmuku.then === "function") this.danmus = await this.option.danmuku;
|
else if (target instanceof Promise) danmus = await target; // 从 Promise 对象获取
|
||||||
else if (typeof this.option.danmuku === "string") this.danmus = await (0, _bilibili.bilibiliDanmuParseFromUrl)(this.option.danmuku);
|
else if (typeof target === "string") danmus = await (0, _bilibili.bilibiliDanmuParseFromUrl)(target); // 从B站xml链接解析
|
||||||
else this.danmus = this.option.danmuku;
|
else if (Array.isArray(target)) danmus = [
|
||||||
errorHandle(Array.isArray(this.danmus), "Danmuku need return an array as result");
|
...target
|
||||||
this.queue = []; // 清空实际弹幕队列
|
]; // 直接传入数组
|
||||||
this.$danmuku.innerText = ""; // 清空弹幕层
|
errorHandle(Array.isArray(danmus), "Danmuku need return an array as result");
|
||||||
this.danmus.forEach((danmu)=>this.emit(danmu)); // 逐个验证原始弹幕并转换为实际弹幕
|
// 假如没有传入弹幕参数，则清空弹幕，否则追加弹幕
|
||||||
|
if (danmuku === undefined) {
|
||||||
|
this.reset(); // 重置弹幕
|
||||||
|
this.queue = []; // 清空弹幕队列
|
||||||
|
this.states = {
|
||||||
|
wait: [],
|
||||||
|
ready: [],
|
||||||
|
emit: [],
|
||||||
|
stop: []
|
||||||
|
}; // 清空弹幕状态池
|
||||||
|
this.$refs = []; // 清空弹幕DOM节点池
|
||||||
|
this.$danmuku.innerText = ""; // 清空弹幕层
|
||||||
|
}
|
||||||
|
// 逐个验证原始弹幕并转换到弹幕队列
|
||||||
|
for(let index = 0; index < danmus.length; index++){
|
||||||
|
const danmu = danmus[index];
|
||||||
|
await this.emit(danmu);
|
||||||
|
}
|
||||||
this.art.emit("artplayerPluginDanmuku:loaded", this.queue);
|
this.art.emit("artplayerPluginDanmuku:loaded", this.queue);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.art.emit("artplayerPluginDanmuku:error", error);
|
this.art.emit("artplayerPluginDanmuku:error", error);
|
||||||
@@ -430,7 +448,7 @@ class Danmuku {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
// 把原始弹幕转换为实际弹幕
|
// 把原始弹幕转换为实际弹幕
|
||||||
emit(danmu) {
|
async emit(danmu) {
|
||||||
const { clamp } = this.utils;
|
const { clamp } = this.utils;
|
||||||
this.validator(danmu, {
|
this.validator(danmu, {
|
||||||
text: "string",
|
text: "string",
|
||||||
@@ -1597,7 +1615,7 @@ function heatmap(art, danmuku, option) {
|
|||||||
else {
|
else {
|
||||||
const gap = art.duration / svg.w;
|
const gap = art.duration / svg.w;
|
||||||
for(let x = 0; x <= svg.w; x += options.sampling){
|
for(let x = 0; x <= svg.w; x += options.sampling){
|
||||||
const y = danmuku.danmus.filter(({ time })=>time > x * gap && time <= (x + options.sampling) * gap).length;
|
const y = danmuku.queue.filter(({ time })=>time > x * gap && time <= (x + options.sampling) * gap).length;
|
||||||
points.push([
|
points.push([
|
||||||
x,
|
x,
|
||||||
y
|
y
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
{"mappings":"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 truncated
|
{"mappings":"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 truncated
|
||||||
@@ -11,7 +11,6 @@ export default class Danmuku {
|
|||||||
this.$player = template.$player; // 播放器容器
|
this.$player = template.$player; // 播放器容器
|
||||||
|
|
||||||
this.art = art;
|
this.art = art;
|
||||||
this.danmus = []; // 原始弹幕数据
|
|
||||||
this.queue = []; // 实际弹幕队列
|
this.queue = []; // 实际弹幕队列
|
||||||
this.$refs = []; // 弹幕DOM节点池
|
this.$refs = []; // 弹幕DOM节点池
|
||||||
this.isStop = false; // 是否停止
|
this.isStop = false; // 是否停止
|
||||||
@@ -23,12 +22,7 @@ export default class Danmuku {
|
|||||||
this.option = Danmuku.option;
|
this.option = Danmuku.option;
|
||||||
|
|
||||||
// 弹幕状态池
|
// 弹幕状态池
|
||||||
this.states = {
|
this.states = { wait: [], ready: [], emit: [], stop: [] };
|
||||||
wait: [],
|
|
||||||
ready: [],
|
|
||||||
emit: [],
|
|
||||||
stop: [],
|
|
||||||
};
|
|
||||||
|
|
||||||
// 初始化配置
|
// 初始化配置
|
||||||
this.config(option);
|
this.config(option);
|
||||||
@@ -265,28 +259,37 @@ export default class Danmuku {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 加载弹幕
|
// 加载弹幕
|
||||||
async load() {
|
async load(danmuku) {
|
||||||
const { errorHandle } = this.utils;
|
const { errorHandle } = this.utils;
|
||||||
|
|
||||||
|
let danmus = [];
|
||||||
|
const target = danmuku || this.option.danmuku;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (typeof this.option.danmuku === 'function') {
|
if (typeof target === 'function') {
|
||||||
this.danmus = await this.option.danmuku();
|
danmus = await target(); // 异步函数获取
|
||||||
} else if (typeof this.option.danmuku.then === 'function') {
|
} else if (target instanceof Promise) {
|
||||||
this.danmus = await this.option.danmuku;
|
danmus = await target; // 从 Promise 对象获取
|
||||||
} else if (typeof this.option.danmuku === 'string') {
|
} else if (typeof target === 'string') {
|
||||||
this.danmus = await bilibiliDanmuParseFromUrl(this.option.danmuku);
|
danmus = await bilibiliDanmuParseFromUrl(target); // 从B站xml链接解析
|
||||||
} else {
|
} else if (Array.isArray(target)) {
|
||||||
this.danmus = this.option.danmuku;
|
danmus = [...target]; // 直接传入数组
|
||||||
}
|
}
|
||||||
|
|
||||||
errorHandle(Array.isArray(this.danmus), 'Danmuku need return an array as result');
|
errorHandle(Array.isArray(danmus), 'Danmuku need return an array as result');
|
||||||
|
|
||||||
this.queue = []; // 清空实际弹幕队列
|
// 假如没有传入弹幕参数，则清空弹幕，否则追加弹幕
|
||||||
this.$danmuku.innerText = ''; // 清空弹幕层
|
if (danmuku === undefined) {
|
||||||
|
this.reset(); // 重置弹幕
|
||||||
|
this.queue = []; // 清空弹幕队列
|
||||||
|
this.states = { wait: [], ready: [], emit: [], stop: [] }; // 清空弹幕状态池
|
||||||
|
this.$refs = []; // 清空弹幕DOM节点池
|
||||||
|
this.$danmuku.innerText = ''; // 清空弹幕层
|
||||||
|
}
|
||||||
|
|
||||||
// 逐个验证原始弹幕并转换为实际弹幕
|
// 逐个验证原始弹幕并转换到弹幕队列
|
||||||
for (let index = 0; index < this.danmus.length; index++) {
|
for (let index = 0; index < danmus.length; index++) {
|
||||||
const danmu = this.danmus[index];
|
const danmu = danmus[index];
|
||||||
await this.emit(danmu);
|
await this.emit(danmu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ export default function heatmap(art, danmuku, option) {
|
|||||||
} else {
|
} else {
|
||||||
const gap = art.duration / svg.w;
|
const gap = art.duration / svg.w;
|
||||||
for (let x = 0; x <= svg.w; x += options.sampling) {
|
for (let x = 0; x <= svg.w; x += options.sampling) {
|
||||||
const y = danmuku.danmus.filter(
|
const y = danmuku.queue.filter(
|
||||||
({ time }) => time > x * gap && time <= (x + options.sampling) * gap,
|
({ time }) => time > x * gap && time <= (x + options.sampling) * gap,
|
||||||
).length;
|
).length;
|
||||||
points.push([x, y]);
|
points.push([x, y]);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ export = artplayerPluginDanmuku;
|
|||||||
export as namespace artplayerPluginDanmuku;
|
export as namespace artplayerPluginDanmuku;
|
||||||
|
|
||||||
type Mode = 0 | 1 | 2;
|
type Mode = 0 | 1 | 2;
|
||||||
|
type Danmuku = Danmu[] | string | (() => Promise<Danmu[]>) | Promise<Danmu[]>;
|
||||||
|
|
||||||
type Slider = {
|
type Slider = {
|
||||||
min: number;
|
min: number;
|
||||||
@@ -51,7 +52,7 @@ type Option = {
|
|||||||
/**
|
/**
|
||||||
* 弹幕数据: 函数，数组，Promise，URL
|
* 弹幕数据: 函数，数组，Promise，URL
|
||||||
*/
|
*/
|
||||||
danmuku: Danmu[] | string | (() => Promise<Danmu[]>) | Promise<Danmu[]>;
|
danmuku: Danmuku;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 弹幕持续时间，范围在[1 ~ 10]
|
* 弹幕持续时间，范围在[1 ~ 10]
|
||||||
@@ -192,33 +193,33 @@ type Option = {
|
|||||||
COLOR?: string[];
|
COLOR?: string[];
|
||||||
};
|
};
|
||||||
|
|
||||||
type Danmuku = {
|
type Result = {
|
||||||
name: 'artplayerPluginDanmuku';
|
name: 'artplayerPluginDanmuku';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发送一条实时弹幕
|
* 发送一条实时弹幕
|
||||||
*/
|
*/
|
||||||
emit: (danmu: Danmu) => Danmuku;
|
emit: (danmu: Danmu) => Result;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 重载弹幕源，或者切换新弹幕
|
* 重载弹幕源，或者切换新弹幕
|
||||||
*/
|
*/
|
||||||
load: () => Promise<Danmuku>;
|
load: (danmuku?: Danmuku) => Promise<Result>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 实时改变弹幕配置
|
* 实时改变弹幕配置
|
||||||
*/
|
*/
|
||||||
config: (option: Option) => Danmuku;
|
config: (option: Option) => Result;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 隐藏弹幕层
|
* 隐藏弹幕层
|
||||||
*/
|
*/
|
||||||
hide: () => Danmuku;
|
hide: () => Result;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 显示弹幕层
|
* 显示弹幕层
|
||||||
*/
|
*/
|
||||||
show: () => Danmuku;
|
show: () => Result;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 挂载弹幕输入框
|
* 挂载弹幕输入框
|
||||||
@@ -228,7 +229,7 @@ type Danmuku = {
|
|||||||
/**
|
/**
|
||||||
* 重置弹幕
|
* 重置弹幕
|
||||||
*/
|
*/
|
||||||
reset: () => Danmuku;
|
reset: () => Result;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 弹幕配置
|
* 弹幕配置
|
||||||
@@ -246,4 +247,4 @@ type Danmuku = {
|
|||||||
isStop: boolean;
|
isStop: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
declare const artplayerPluginDanmuku: (option: Option) => (art: Artplayer) => Danmuku;
|
declare const artplayerPluginDanmuku: (option: Option) => (art: Artplayer) => Result;
|
||||||
@@ -42,7 +42,7 @@ https://unpkg.com/artplayer-plugin-danmuku/dist/artplayer-plugin-danmuku.js
|
|||||||
|
|
||||||
## 弹幕结构
|
## 弹幕结构
|
||||||
|
|
||||||
每一个弹幕是一个对象，多个弹幕组成的数组就是弹幕源，通常只需要`text`就可以发送一个弹幕，其余都是非必要参数
|
每一个弹幕是一个对象，多个弹幕组成的数组就是弹幕库，通常只需要`text`就可以发送一个弹幕，其余都是非必要参数
|
||||||
|
|
||||||
```js
|
```js
|
||||||
{
|
{
|
||||||
@@ -371,7 +371,7 @@ var art = new Artplayer({
|
|||||||
|
|
||||||
## `load`
|
## `load`
|
||||||
|
|
||||||
通过 load 方法可以重载弹幕源，或者切换新弹幕
|
通过 load 方法可以重载弹幕库，或者切换新弹幕库，或者追加新的弹幕库
|
||||||
|
|
||||||
<div className="run-code" data-libs="./uncompiled/artplayer-plugin-danmuku/index.js">
|
<div className="run-code" data-libs="./uncompiled/artplayer-plugin-danmuku/index.js">
|
||||||
▶ Run Code
|
▶ Run Code
|
||||||
@@ -384,26 +384,38 @@ var art = new Artplayer({
|
|||||||
plugins: [
|
plugins: [
|
||||||
artplayerPluginDanmuku({
|
artplayerPluginDanmuku({
|
||||||
danmuku: '/assets/sample/danmuku.xml',
|
danmuku: '/assets/sample/danmuku.xml',
|
||||||
|
emitter: false,
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
controls: [
|
controls: [
|
||||||
{
|
{
|
||||||
position: 'right',
|
position: 'right',
|
||||||
html: '重载弹幕',
|
html: '重载',
|
||||||
click: function () {
|
click: function () {
|
||||||
|
// 重新加载当前弹幕库
|
||||||
art.plugins.artplayerPluginDanmuku.load();
|
art.plugins.artplayerPluginDanmuku.load();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
position: 'right',
|
position: 'right',
|
||||||
html: '切换弹幕',
|
html: '切换',
|
||||||
click: function () {
|
click: function () {
|
||||||
|
// 切换到新的弹幕库
|
||||||
art.plugins.artplayerPluginDanmuku.config({
|
art.plugins.artplayerPluginDanmuku.config({
|
||||||
danmuku: '/assets/sample/danmuku-v2.xml',
|
danmuku: '/assets/sample/danmuku-v2.xml',
|
||||||
});
|
});
|
||||||
art.plugins.artplayerPluginDanmuku.load();
|
art.plugins.artplayerPluginDanmuku.load();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
position: 'right',
|
||||||
|
html: '追加',
|
||||||
|
click: function () {
|
||||||
|
// 追加新的弹幕库，参数类型和option.danmuku
|
||||||
|
const target = '/assets/sample/danmuku.xml'
|
||||||
|
art.plugins.artplayerPluginDanmuku.load(target);
|
||||||
|
},
|
||||||
|
},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -8,7 +8,8 @@
|
|||||||
if (codeElement) {
|
if (codeElement) {
|
||||||
const libs = event.target.dataset.libs || '';
|
const libs = event.target.dataset.libs || '';
|
||||||
const code = encodeURIComponent(codeElement.innerText);
|
const code = encodeURIComponent(codeElement.innerText);
|
||||||
const env = 'https://artplayer.org';
|
const isDev = location.hostname === 'localhost';
|
||||||
|
const env = isDev ? 'http://localhost:8082' : 'https://artplayer.org';
|
||||||
const url = env + '/?libs=' + libs + '&code=' + code;
|
const url = env + '/?libs=' + libs + '&code=' + code;
|
||||||
window.open(url);
|
window.open(url);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user