diff --git a/Plugin.php b/Plugin.php index bfa08bd..5730832 100644 --- a/Plugin.php +++ b/Plugin.php @@ -6,8 +6,8 @@ * * @package DPlayer * @author Volio - * @version 1.0.4 - * @link http://github.com/volio/DPlayer-for-typecho + * @version 1.1.0 + * @link https://niconiconi.org */ class DPlayer_Plugin implements Typecho_Plugin_Interface { @@ -20,8 +20,8 @@ class DPlayer_Plugin implements Typecho_Plugin_Interface */ public static function activate() { - Typecho_Plugin::factory('Widget_Abstract_Contents')->contentEx = ['DPlayer_Plugin', 'parsePlayer']; - Typecho_Plugin::factory('Widget_Abstract_Contents')->excerptEx = ['DPlayer_Plugin', 'parsePlayer']; + Typecho_Plugin::factory('Widget_Abstract_Contents')->contentEx = ['DPlayer_Plugin', 'replacePlayer']; + Typecho_Plugin::factory('Widget_Abstract_Contents')->excerptEx = ['DPlayer_Plugin', 'replacePlayer']; Typecho_Plugin::factory('Widget_Archive')->header = ['DPlayer_Plugin', 'playerHeader']; Typecho_Plugin::factory('Widget_Archive')->footer = ['DPlayer_Plugin', 'playerFooter']; Typecho_Plugin::factory('admin/write-post.php')->bottom = ['DPlayer_Plugin', 'addEditorButton']; @@ -44,10 +44,8 @@ public static function deactivate() */ public static function playerHeader() { - $url = Helper::options()->pluginUrl . '/DPlayer'; echo << - EOF; } @@ -66,29 +64,26 @@ public static function playerFooter() } echo << - + EOF; } /** * 内容标签替换 * - * @param string $content + * @param $text * @param $widget - * @param $lastResult + * @param $last * @return string */ - public static function parsePlayer($content, $widget, $lastResult) + public static function replacePlayer($text, $widget, $last) { - $content = empty($lastResult) ? $content : $lastResult; + $text = empty($last) ? $text : $last; if ($widget instanceof Widget_Archive) { - if (false === strpos($content, '[')) { - return $content; - } $pattern = self::get_shortcode_regex(['dplayer']); - $content = preg_replace_callback("/$pattern/", ['DPlayer_Plugin', 'parseCallback'], $content); + $text = preg_replace_callback("/$pattern/", ['DPlayer_Plugin', 'parseCallback'], $text); } - return $content; + return $text; } /** @@ -114,76 +109,64 @@ public static function parseCallback($matches) } //还原转义后的html //[dplayer title="Test Abc" artist="haha" id="1234543"/] - $attr = htmlspecialchars_decode($matches[3]); + $tag = htmlspecialchars_decode($matches[3]); //[dplayer]标签的属性，类型为array - $atts = self::shortcode_parse_atts($attr); - //播放器id - $id = md5(isset($atts['url']) ? $atts['url'] : 'default id'); + $attrs = self::shortcode_parse_atts($tag); + return DPlayer_Plugin::parsePlayer($attrs); + } + public static function parsePlayer($attrs) + { //播放器设置 - $theme = Typecho_Widget::widget('Widget_Options')->plugin('DPlayer')->theme; + $theme = Typecho_Widget::widget('Widget_Options')->plugin('DPlayer')->theme ?: '#FADFA3'; $api = Typecho_Widget::widget('Widget_Options')->plugin('DPlayer')->api; - if (!$theme) $theme = '#FADFA3'; - - //输出代码 - $playerCode = '
'; - $playerCode .= "
\n"; - $video = array( - 'url' => isset($atts['url']) ? $atts['url'] : '', - 'pic' => isset($atts['pic']) ? $atts['pic'] : '', - 'type' => isset($atts['type']) ? $atts['type'] : 'auto', - 'thumbnails' => isset($atts['thumbnails']) ? $atts['thumbnails'] : '', - ); - //弹幕部分配置文件 - $subtitle = [ - 'url' => isset($atts['subtitleurl']) ? $atts['subtitleurl'] : '', - 'type' => isset($atts['subtitletype']) ? $atts['subtitletype'] : 'webvtt', - 'fontSize' => isset($atts['subtitlefontsize']) ? $atts['subtitlefontsize'] : '25px', - 'bottom' => isset($atts['subtitlebottom']) ? $atts['subtitlebottom'] : '10%', - 'color' => isset($atts['subtitlecolor']) ? $atts['subtitlecolor'] : '#b7daff', - ]; - $danmaku = [ - 'id' => $id, - 'api' => $api, - 'maximum' => isset($atts['maximum']) ? $atts['maximum'] : 1000, - 'addition' => isset($atts['addition']) ? [$atts['addition']] : null, - 'user' => isset($atts['user']) ? $atts['user'] : 'DIYgod', - 'bottom' => isset($atts['bottom']) ? $atts['bottom'] : '15%', - 'unlimited' => true, - ]; - - //播放器默认属性 - $data = [ - 'id' => $id, + //播放器属性 + $config = [ 'live' => false, - 'autoplay' => false, - 'theme' => isset($atts['theme']) ? $atts['theme'] : '#FADFA3', - 'loop' => (isset($atts['loop']) && $atts['loop'] == 'true') ? true : false, - 'screenshot' => (isset($atts['screenshot']) && $atts['screenshot'] == 'true') ? true : false, + 'autoplay' => isset($attrs['autoplay']) && $attrs['autoplay'] == 'true', + 'theme' => isset($attrs['theme']) ? $attrs['theme'] : $theme, + 'loop' => isset($attrs['loop']) && $attrs['loop'] == 'true', + 'screenshot' => isset($attrs['screenshot']) && $attrs['screenshot'] == 'true', 'hotkey' => true, 'preload' => 'metadata', - 'lang' => isset($atts['lang']) ? $atts['lang'] : 'zh-cn', - 'logo' => isset($atts['logo']) ? $atts['logo'] : null, - 'volume' => isset($atts['volume']) ? $atts['volume'] : 0.7, + 'lang' => isset($attrs['lang']) ? $attrs['lang'] : 'zh-cn', + 'logo' => isset($attrs['logo']) ? $attrs['logo'] : null, + 'volume' => isset($attrs['volume']) ? $attrs['volume'] : 0.7, 'mutex' => true, + 'video' => [ + 'url' => isset($attrs['url']) ? $attrs['url'] : null, + 'pic' => isset($attrs['pic']) ? $attrs['pic'] : null, + 'type' => isset($attrs['type']) ? $attrs['type'] : 'auto', + 'thumbnails' => isset($attrs['thumbnails']) ? $attrs['thumbnails'] : null, + ], ]; - $data['video'] = $video; - $data['danmaku'] = (isset($atts['danmu']) && $atts['danmu'] == 'true') ? $danmaku : null; - $data['subtitle'] = isset($atts['subtitleurl']) ? $subtitle : null; - $data['autoplay'] = (isset($atts['autoplay']) && $atts['autoplay'] == 'true') ? true : false; - $data['theme'] = isset($atts['theme']) ? $atts['theme'] : $theme; - //加入头部数组 - $js = json_encode($data); - $playerCode .= <<dPlayerOptions.push({$js}); -EOF; - return $playerCode; + if (isset($attrs['danmu']) && $attrs['danmu'] == 'true') { + $config['danmaku'] = [ + 'id' => md5(isset($attrs['url']) ? $attrs['url'] : ''), + 'api' => $api, + 'maximum' => isset($attrs['maximum']) ? $attrs['maximum'] : 1000, + 'user' => isset($attrs['user']) ? $attrs['user'] : 'DIYgod', + 'bottom' => isset($attrs['bottom']) ? $attrs['bottom'] : '15%', + 'unlimited' => true, + ]; + } + if (isset($attrs['subtitle']) && $attrs['subtitle'] == 'true') { + $config['subtitle'] = [ + 'url' => isset($attrs['subtitleurl']) ? $attrs['subtitleurl'] : null, + 'type' => isset($attrs['subtitletype']) ? $attrs['subtitletype'] : 'webvtt', + 'fontSize' => isset($attrs['subtitlefontsize']) ? $attrs['subtitlefontsize'] : '25px', + 'bottom' => isset($attrs['subtitlebottom']) ? $attrs['subtitlebottom'] : '10%', + 'color' => isset($attrs['subtitlecolor']) ? $attrs['subtitlecolor'] : '#b7daff', + ]; + } + $json = json_encode($config); + return "
"; } public static function addEditorButton() { - $dir = Helper::options()->pluginUrl . '/DPlayer/dist/editor.js'; + $dir = Helper::options()->pluginUrl . '/DPlayer/assets/editor.js'; echo ""; } @@ -191,10 +174,10 @@ public static function config(Typecho_Widget_Helper_Form $form) { $theme = new Typecho_Widget_Helper_Form_Element_Text( 'theme', null, '#FADFA3', - _t('默认主题颜色'), _t('播放器默认的主题颜色，如 #372e21、#75c、red、blue，该设定会被[dplayer]标签中的theme属性覆盖，默认为 #FADFA3')); + _t('默认主题颜色'), _t('播放器默认的主题颜色，例如 #372e21、#75c、red、blue，该设定会被[dplayer]标签中的theme属性覆盖，默认为 #FADFA3')); $api = new Typecho_Widget_Helper_Form_Element_Text( - 'api', null, 'https://api.prprpr.me/dplayer/v3/', - _t('弹幕服务器地址'), _t('用于保存视频弹幕，默认为 https://api.prprpr.me/dplayer/v3/')); + 'api', null, '', + _t('弹幕服务器地址'), _t('用于保存视频弹幕，例如 https://api.prprpr.me/dplayer/v3/')); $hls = new Typecho_Widget_Helper_Form_Element_Radio('hls', array('0' => _t('不开启HLS支持'), '1' => _t('开启HLS支持')), '0', _t('HLS支持'), _t("开启后可解析 m3u8 格式视频")); $flv = new Typecho_Widget_Helper_Form_Element_Radio('flv', array('0' => _t('不开启FLV支持'), '1' => _t('开启FLV支持')), '0', _t('FLV支持'), _t("开启后可解析 flv 格式视频")); $form->addInput($theme); diff --git a/README.md b/README.md index 2502a8c..5898a0a 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ [dplayer url="http://xxx.com/xxx.mp4" pic="http://xxx.com/xxx.jpg"/] ``` -关闭弹幕 +开启弹幕 ``` -[dplayer url="http://xxx.com/xxx.mp4" pic="http://xxx.com/xxx.jpg" danmu="false"/] +[dplayer url="http://xxx.com/xxx.mp4" pic="http://xxx.com/xxx.jpg" danmu="true"/] ``` 开启自动播放 @@ -19,13 +19,16 @@ [dplayer url="http://xxx.com/xxx.mp4" pic="http://xxx.com/xxx.jpg" autoplay="true"/] ``` -添加额外弹幕源(例：bilibili弹幕) +更多参数待补充 + +### FAQ + +#### 1. Pjax页面切换？ + +重新加载播放器回调函数 ``` -[dplayer url="http://xxx.com/xxx.mp4" pic="http://xxx.com/xxx.jpg" autoplay="true" addition="https://api.prprpr.me/dplayer/bilibili?aid=7286894"/] +loadDPlayer(); ``` -### 设置截图 -![](https://raw.githubusercontent.com/volio/DPlayer-for-typecho/master/assets/screenshot.png) - ### LICENSE MIT © [Volio](https://niconiconi.org) \ No newline at end of file diff --git a/dist/editor.js b/assets/editor.js similarity index 60% rename from dist/editor.js rename to assets/editor.js index ec7381b..dae85df 100644 --- a/dist/editor.js +++ b/assets/editor.js @@ -6,14 +6,14 @@ $(function () { $(document).on('click', '#wmd-dplayer-button', function () { $('body').append( '
' + - '
' + + '
' + '
' + '
' + '

插入视频

' + '

在下方输入参数

' + - '

' + - '

' + - '

' + + '

' + + '

' + + '

' + '

开启弹幕

' + '

自动播放

' + '
' + @@ -31,40 +31,38 @@ $(function () { }); //ok $(document).on('click', '#ok', function () { - var DP_url = document.getElementById('DP-url').value, - DP_pic = document.getElementById('DP-pic').value, - DP_danmu = document.getElementById('DP-danmu').checked ? true : false, - DP_autoplay = document.getElementById('DP-autoplay').checked ? true : false, - DP_addition = document.getElementById('DP-addition').value; - var tag = '[dplayer url="' + DP_url + '" pic="' + DP_pic + '" '; - if (!DP_danmu) tag += 'danmu="' + DP_danmu + '" '; - if (DP_autoplay) tag += 'autoplay="' + DP_autoplay + '" '; - if (DP_addition) tag += 'addition="' + DP_addition + '" '; + var url = document.getElementById('DP-url').value, + pic = document.getElementById('DP-pic').value, + danmu = !!document.getElementById('DP-danmu').checked, + autoplay = !!document.getElementById('DP-autoplay').checked; + var tag = '[dplayer url="' + url + '" pic="' + pic + '" '; + if (!danmu) tag += 'danmu="' + danmu + '" '; + if (autoplay) tag += 'autoplay="' + autoplay + '" '; tag += '/]\n'; - myField = document.getElementById('text'); + var editor = document.getElementById('text'); if (document.selection) { - myField.focus(); + editor.focus(); sel = document.selection.createRange(); sel.text = tag; - myField.focus(); + editor.focus(); } - else if (myField.selectionStart || myField.selectionStart == '0') { - var startPos = myField.selectionStart; - var endPos = myField.selectionEnd; + else if (editor.selectionStart || editor.selectionStart === '0') { + var startPos = editor.selectionStart; + var endPos = editor.selectionEnd; var cursorPos = startPos; - myField.value = myField.value.substring(0, startPos) + editor.value = editor.value.substring(0, startPos) + tag - + myField.value.substring(endPos, myField.value.length); + + editor.value.substring(endPos, myField.value.length); cursorPos += tag.length; - myField.focus(); - myField.selectionStart = cursorPos; - myField.selectionEnd = cursorPos; + editor.focus(); + editor.selectionStart = cursorPos; + editor.selectionEnd = cursorPos; } else { - myField.value += tag; - myField.focus(); + editor.value += tag; + editor.focus(); } $('#DPlayer-Panel').remove(); diff --git a/assets/player.js b/assets/player.js new file mode 100644 index 0000000..869946a --- /dev/null +++ b/assets/player.js @@ -0,0 +1,16 @@ +var dPlayers = []; +var loadDPlayer = function () { + var load = function (d, conf) { + conf.container = d; + dPlayers.push(new DPlayer(conf)); + }; + for (var i = 0; i < dPlayers.length; i++) { + dPlayers[i].destroy(); + } + dPlayers = []; + for (var j = 0, k = document.querySelectorAll('.dplayer'); j < k.length; j++) { + load(k[j], JSON.parse(k[j].dataset.config)); + } +}; + +document.addEventListener('DOMContentLoaded', loadDPlayer, !1); \ No newline at end of file diff --git a/assets/screenshot.png b/assets/screenshot.png deleted file mode 100644 index d706191..0000000 Binary files a/assets/screenshot.png and /dev/null differ diff --git a/assets/screenshot_editor.png b/assets/screenshot_editor.png deleted file mode 100644 index a012f58..0000000 Binary files a/assets/screenshot_editor.png and /dev/null differ diff --git a/dist/util.js b/dist/util.js deleted file mode 100644 index 5e326f7..0000000 --- a/dist/util.js +++ /dev/null @@ -1,20 +0,0 @@ -var len = dPlayerOptions.length; -var dPlayers = []; -for (var i = 0; i < len; i++) { - dPlayers.push(new DPlayer({ - container: document.getElementById('player' + dPlayerOptions[i]['id']), - autoplay: dPlayerOptions[i]['autoplay'], - theme: dPlayerOptions[i]['theme'], - loop: dPlayerOptions[i]['loop'], - lang: dPlayerOptions[i]['lang'], - screenshot: dPlayerOptions[i]['screenshot'], - hotkey: dPlayerOptions[i]['hotkey'], - preload: dPlayerOptions[i]['preload'], - logo: dPlayerOptions[i]['logo'], - volume: dPlayerOptions[i]['volume'], - mutex: dPlayerOptions[i]['mutex'], - video: dPlayerOptions[i]['video'], - subtitle: dPlayerOptions[i]['subtitle'], - danmaku: dPlayerOptions[i]['danmaku'], - })); -} \ No newline at end of file