优化页面显示,支持自定义播放器,调整cdn地址动态配置

This commit is contained in:
Aicirou 2020-05-31 01:02:42 +08:00
parent c8cbb4ccef
commit 62e0cc5869
15 changed files with 102 additions and 66 deletions

View File

@ -29,20 +29,20 @@ class BuildAppJSPlugin {
cssarr.push(filename); cssarr.push(filename);
} }
} }
cssarr = cssarr.sort(function(a) { cssarr = cssarr.sort(function (a) {
return a.indexOf("app."); return a.indexOf("app.");
}); });
var cdnjs = '' var cdnjs = "";
if (process.env.NODE_ENV === "production") { if (process.env.NODE_ENV === "production") {
cssarr = cdn.css.concat(cssarr); cssarr = cdn.css.concat(cssarr);
cdnjs = `var cdnjs = ${JSON.stringify(cdn.js)}; cdnjs = `var cdnjs = ${JSON.stringify(cdn.js)};
cdnjs.forEach((item) => { cdnjs.forEach((item) => {
document.write('<script src="' + item + '"></script>'); document.write('<script src="' + item + '"></script>');
});` });`;
} else { } else {
cssarr = cssarr.concat(cdnDependencies cssarr = cssarr.concat(
.filter((e) => e.name === "") cdnDependencies.filter((e) => e.name === "").map((e) => e.css)
.map((e) => e.css)); );
} }
let content = ` let content = `
var scripts = ${JSON.stringify(jsarr)}; var scripts = ${JSON.stringify(jsarr)};
@ -51,25 +51,25 @@ class BuildAppJSPlugin {
document.write('<script src="' + item + '"></script>'); document.write('<script src="' + item + '"></script>');
}); });
`; `;
let cssContent = '' let cssContent = "";
cssarr.forEach(item=>{ cssarr.forEach((item) => {
cssContent += `@import url(${item});\n` cssContent += `@import url(${item});\n`;
}) });
// 将这个列表作为一个新的文件资源,插入到 webpack 构建中: // 将这个列表作为一个新的文件资源,插入到 webpack 构建中:
compilation.assets["app.js"] = { compilation.assets["app.js"] = {
source: function() { source: function () {
return content; return content;
}, },
size: function() { size: function () {
return jsarr.length; return jsarr.length;
}, },
}; };
compilation.assets["style.css"] = { compilation.assets["style.css"] = {
source: function() { source: function () {
return cssContent; return cssContent;
}, },
size: function() { size: function () {
return cssarr.length; return cssarr.length;
}, },
}; };

View File

@ -1,6 +1,6 @@
{ {
"name": "go2index-theme-acrou", "name": "go2index-theme-acrou",
"version": "2.0.0", "version": "2.0.5bate",
"g2index": "1.1.0", "g2index": "1.1.0",
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 846 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

View File

@ -42,6 +42,9 @@
// 是否显示文件/文件夹描述(默认不显示) // 是否显示文件/文件夹描述(默认不显示)
// Show file/folder description or not (not shown by default) // Show file/folder description or not (not shown by default)
desc: true, desc: true,
},
player: {
api: "https://api.jsonpop.cn/demo/blplyaer/?url="
} }
} }
window.gdconfig = JSON.parse(JSON.stringify({ version: authConfig.version, themeOptions: themeOptions })); window.gdconfig = JSON.parse(JSON.stringify({ version: authConfig.version, themeOptions: themeOptions }));

View File

@ -83,7 +83,7 @@ body {
} }
.no-content { .no-content {
background: url(https://s1.hdslb.com/bfs/static/jinkela/search/asserts/no-data.png) no-repeat 50% 50%; background: url(#{$cdnPath}images/no-data.png) no-repeat 50% 50%;
height: 240px; height: 240px;
line-height: 240px; line-height: 240px;
text-align: center; text-align: center;

View File

@ -22,14 +22,13 @@ import "@/assets/style/theme/register.scss";
document.write( document.write(
`<script>var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src="https://hm.baidu.com/hm.js?6be1011f95a1bfcdb2179fe2ae6e58fe";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s)})();</script>` `<script>var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src="https://hm.baidu.com/hm.js?6be1011f95a1bfcdb2179fe2ae6e58fe";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s)})();</script>`
); );
Vue.config.productionTip = false; Vue.config.productionTip = false;
Vue.prototype.$cdnpath = cdnpath;
Vue.use(ElementUI); Vue.use(ElementUI);
Vue.use(VueAxios, axios); Vue.use(VueAxios, axios);
Vue.use(cdnpath);
Vue.use(VueClipboard); Vue.use(VueClipboard);
Vue.use(VueLazyload, { Vue.use(VueLazyload, {
loading: cdnpath("/images/airplane.gif"), loading: cdnpath("images/airplane.gif"),
}); });
Vue.use(Viewer); Vue.use(Viewer);

View File

@ -1,10 +1,10 @@
<template> <template>
<div class="content g2-content"> <div class="content g2-content">
<div class="video-content"> <div v-if="player && player.api" class="video-content">
<iframe <iframe
width="100%" width="100%"
height="100%" height="100%"
:src="apiurl" :src="apiUrl"
frameborder="0" frameborder="0"
border="0" border="0"
marginwidth="0" marginwidth="0"
@ -14,6 +14,9 @@
allowfullscreen="true" allowfullscreen="true"
></iframe> ></iframe>
</div> </div>
<video v-else style="width:100%;" preload controls>
<source :src="videoUrl" type="video/mp4" />
</video>
<div class="card"> <div class="card">
<header class="card-header"> <header class="card-header">
<p class="card-header-title"> <p class="card-header-title">
@ -32,7 +35,7 @@
<div class="field"> <div class="field">
<label class="label">{{ $t("page.video.link") }}</label> <label class="label">{{ $t("page.video.link") }}</label>
<div class="control"> <div class="control">
<input class="input" type="text" :value="videourl" /> <input class="input" type="text" :value="videoUrl" />
</div> </div>
</div> </div>
<div class="columns is-mobile is-multiline has-text-centered"> <div class="columns is-mobile is-multiline has-text-centered">
@ -62,16 +65,16 @@ import { decode64 } from "@utils/AcrouUtil";
export default { export default {
data: function() { data: function() {
return { return {
apiurl: "", apiUrl: "",
videourl: "", player: window.themeOptions.player,
videoUrl: "",
}; };
}, },
methods: { methods: {
render() { render() {
// 便 // 便
this.videourl = window.location.origin + encodeURI(this.url); this.videoUrl = window.location.origin + encodeURI(this.url);
this.apiurl = this.apiUrl = this.player.api + this.videoUrl;
"https://api.jsonpop.cn/demo/blplyaer/?url=" + this.videourl;
}, },
}, },
activated() { activated() {
@ -88,50 +91,50 @@ export default {
return [ return [
{ {
name: "IINA", name: "IINA",
icon: "https://www.iina.io/images/iina-icon-60.png", icon: this.$cdnpath("images/player/iina.png"),
scheme: "iina://weblink?url=" + this.videourl, scheme: "iina://weblink?url=" + this.videoUrl,
}, },
{ {
name: "PotPlayer", name: "PotPlayer",
icon: "https://cloud.jsonpop.cn/go2index/player/potplayer.png", icon: this.$cdnpath("images/player/potplayer.png"),
scheme: "potplayer://" + this.videourl, scheme: "potplayer://" + this.videoUrl,
}, },
{ {
name: "VLC", name: "VLC",
icon: "https://cloud.jsonpop.cn/go2index/player/vlc.png", icon: this.$cdnpath("images/player/vlc.png"),
scheme: "vlc://" + this.videourl, scheme: "vlc://" + this.videoUrl,
}, },
{ {
name: "Thunder", name: "Thunder",
icon: "https://cloud.jsonpop.cn/go2index/player/thunder.png", icon: this.$cdnpath("images/player/thunder.png"),
scheme: "thunder://" + this.getThunder, scheme: "thunder://" + this.getThunder,
}, },
{ {
name: "Aria2", name: "Aria2",
icon: "https://cloud.jsonpop.cn/go2index/player/aria2.png", icon: this.$cdnpath("images/player/aria2.png"),
scheme: 'javascript:alert("暂未实现")', scheme: 'javascript:alert("暂未实现")',
}, },
{ {
name: "nPlayer", name: "nPlayer",
icon: "https://cloud.jsonpop.cn/go2index/player/nplayer.png", icon: this.$cdnpath("images/player/nplayer.png"),
scheme: "nplayer-" + this.videourl, scheme: "nplayer-" + this.videoUrl,
}, },
{ {
name: "MXPlayer(Free)", name: "MXPlayer(Free)",
icon: "https://cloud.jsonpop.cn/go2index/player/mxplayer.png", icon: this.$cdnpath("images/player/mxplayer.png"),
scheme: scheme:
"intent:" + "intent:" +
this.videourl + this.videoUrl +
"#Intent;package=com.mxtech.videoplayer.ad;S.title=" + "#Intent;package=com.mxtech.videoplayer.ad;S.title=" +
this.title + this.title +
";end", ";end",
}, },
{ {
name: "MXPlayer(Pro)", name: "MXPlayer(Pro)",
icon: "https://cloud.jsonpop.cn/go2index/player/mxplayer.png", icon: this.$cdnpath("images/player/mxplayer.png"),
scheme: scheme:
"intent:" + "intent:" +
this.videourl + this.videoUrl +
"#Intent;package=com.mxtech.videoplayer.pro;S.title=" + "#Intent;package=com.mxtech.videoplayer.pro;S.title=" +
this.title + this.title +
";end", ";end",
@ -139,7 +142,7 @@ export default {
]; ];
}, },
getThunder() { getThunder() {
return Buffer.from("AA" + this.videourl + "ZZ").toString("base64"); return Buffer.from("AA" + this.videoUrl + "ZZ").toString("base64");
}, },
}, },
}; };

View File

@ -37,7 +37,14 @@
> >
<i></i> <i></i>
<figure class="image is-square"> <figure class="image is-square">
<img v-if="file.thumbnailLink" v-lazy="thum(file.thumbnailLink)" :alt="file.name" /> <img
v-if="file.thumbnailLink"
v-lazy="thum(file.thumbnailLink)"
:alt="file.name"
/>
<svg v-else class="file-icon iconfont" aria-hidden="true">
<use :xlink:href="getIcon(file.mimeType)" />
</svg>
</figure> </figure>
</div> </div>
<div class="media g2-grid-view-file"> <div class="media g2-grid-view-file">
@ -72,14 +79,14 @@ export default {
type: Function, type: Function,
}, },
}, },
data: function () { data: function() {
return {}; return {};
}, },
computed: { computed: {
folders () { folders() {
return this.data.filter((item) => item.isFolder); return this.data.filter((item) => item.isFolder);
}, },
files () { files() {
return this.data.filter((item) => !item.isFolder); return this.data.filter((item) => !item.isFolder);
}, },
}, },
@ -107,9 +114,19 @@ export default {
// box-shadow: 0 4px 10px rgba(0, 0, 0, 0.05), 0 0 1px rgba(0, 0, 0, 0.1); // box-shadow: 0 4px 10px rgba(0, 0, 0, 0.05), 0 0 1px rgba(0, 0, 0, 0.1);
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2), 0 0 1px rgba(0, 0, 0, 0.05); box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2), 0 0 1px rgba(0, 0, 0, 0.05);
border-radius: 0.5rem; border-radius: 0.5rem;
.card-image img { .card-image {
border-top-left-radius: 0.5rem; img {
border-top-right-radius: 0.5rem; border-top-left-radius: 0.5rem;
border-top-right-radius: 0.5rem;
}
.file-icon {
width: 64px;
height: 64px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
} }
&:hover { &:hover {
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.4), 0 0 1px rgba(0, 0, 0, 0.05); box-shadow: 0 4px 10px rgba(0, 0, 0, 0.4), 0 0 1px rgba(0, 0, 0, 0.05);

View File

@ -1,18 +1,26 @@
const path = require("path"); const path = require("path");
const cdnDependencies = require("./dependencies-cdn"); const cdnDependencies = require("./dependencies-cdn");
const BuildAppJSPlugin = require("./buildAppJSPlugin"); const BuildAppJSPlugin = require("./buildAppJSPlugin");
const CompressionWebpackPlugin = require('compression-webpack-plugin') const CompressionWebpackPlugin = require("compression-webpack-plugin");
function resolve(dir) { function resolve(dir) {
return path.join(__dirname, dir); return path.join(__dirname, dir);
} }
// 增加环境变量 // 增加环境变量
process.env.VUE_APP_VERSION = require('./package.json').version process.env.VUE_APP_VERSION = require("./package.json").version;
process.env.VUE_APP_G2INDEX_VERSION = require('./package.json').g2index process.env.VUE_APP_G2INDEX_VERSION = require("./package.json").g2index;
process.env.VUE_APP_CDN_PATH =
process.env.VUE_APP_CDN_PATH.replace(
"@master",
"@" + process.env.VUE_APP_VERSION
) || "/";
// 基础路径 注意发布之前要先修改这里 // 基础路径 注意发布之前要先修改这里
let publicPath = process.env.VUE_APP_CDN_PATH || "/"; let publicPath = process.env.VUE_APP_CDN_PATH || "/";
let cdnPath = process.env.VUE_APP_CDN_PATH;
const isProd = process.env.NODE_ENV === "production";
// 设置不参与构建的库 // 设置不参与构建的库
let externals = {}; let externals = {};
@ -28,23 +36,30 @@ const cdn = {
module.exports = { module.exports = {
publicPath, publicPath,
lintOnSave: true, lintOnSave: true,
css: {
loaderOptions: {
// 设置 scss 公用变量文件
sass: {
prependData: `$cdnPath: "${isProd ? cdnPath : "/"}";`,
},
},
},
configureWebpack: (config) => { configureWebpack: (config) => {
const configNew = {} const configNew = {};
if (process.env.NODE_ENV === 'production') { if (isProd) {
configNew.externals = externals configNew.externals = externals;
configNew.plugins = [ configNew.plugins = [
// gzip // gzip
new CompressionWebpackPlugin({ new CompressionWebpackPlugin({
filename: '[path].gz[query]', filename: "[path].gz[query]",
test: new RegExp('\\.(' + ['js', 'css'].join('|') + ')$'), test: new RegExp("\\.(" + ["js", "css"].join("|") + ")$"),
threshold: 10240, threshold: 10240,
minRatio: 0.8, minRatio: 0.8,
deleteOriginalAssets: false deleteOriginalAssets: false,
}) }),
] ];
} }
return configNew return configNew;
}, },
chainWebpack: (config) => { chainWebpack: (config) => {
@ -53,7 +68,7 @@ module.exports = {
* 添加 CDN 参数到 htmlWebpackPlugin 配置中 * 添加 CDN 参数到 htmlWebpackPlugin 配置中
*/ */
config.plugin("html").tap((args) => { config.plugin("html").tap((args) => {
if (process.env.NODE_ENV === "production") { if (isProd) {
args[0].cdn = cdn; args[0].cdn = cdn;
} else { } else {
args[0].cdn = { args[0].cdn = {
@ -61,12 +76,11 @@ module.exports = {
css: cdnDependencies.filter((e) => e.name === "").map((e) => e.css), css: cdnDependencies.filter((e) => e.name === "").map((e) => e.css),
}; };
} }
args[0].inject = false args[0].inject = false;
return args; return args;
}); });
// 解决 cli3 热更新失效 https://github.com/vuejs/vue-cli/issues/1559 // 解决 cli3 热更新失效 https://github.com/vuejs/vue-cli/issues/1559
config.resolve config.resolve.symlinks(true);
.symlinks(true)
config.resolve.alias config.resolve.alias
.set("@", resolve("src")) .set("@", resolve("src"))
.set("@assets", resolve("src/assets")) .set("@assets", resolve("src/assets"))