diff --git a/package-lock.json b/package-lock.json index a1e037d..bdefdb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "zy", - "version": "2.8.3", + "version": "2.8.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "zy", - "version": "2.8.3", + "version": "2.8.4", "hasInstallScript": true, "dependencies": { "axios": "^0.21.1", @@ -39,7 +39,8 @@ "vuex": "^3.6.2", "xgplayer": "2.19.1", "xgplayer-flv.js": "^2.3.0", - "xgplayer-hls.js": "^2.4.2" + "xgplayer-hls.js": "^2.4.2", + "xgplayer-mp4": "^1.2.2" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.11", @@ -5264,6 +5265,14 @@ "typedarray": "^0.0.6" } }, + "node_modules/concat-typed-array": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/concat-typed-array/-/concat-typed-array-1.0.2.tgz", + "integrity": "sha1-Z4gMPOGez/EQwxWYtBx/RznUfKA=", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/config-chain": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", @@ -19558,6 +19567,24 @@ "node": ">=0.10.0" } }, + "node_modules/xgplayer-mp4": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/xgplayer-mp4/-/xgplayer-mp4-1.2.2.tgz", + "integrity": "sha512-WB0Hi6vDy2zyy2jiv6fHP0e8WeydxD2cClOO9DwzBDzVzRTfSMva8cM/qpn5HioXigq1Arq4diUmAEg6U5N6ag==", + "dependencies": { + "concat-typed-array": "^1.0.2", + "deepmerge": "^2.0.1", + "event-emitter": "^0.3.5" + } + }, + "node_modules/xgplayer-mp4/node_modules/deepmerge": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", + "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/xgplayer-subtitles": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/xgplayer-subtitles/-/xgplayer-subtitles-1.0.9.tgz", @@ -24166,6 +24193,11 @@ "typedarray": "^0.0.6" } }, + "concat-typed-array": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/concat-typed-array/-/concat-typed-array-1.0.2.tgz", + "integrity": "sha1-Z4gMPOGez/EQwxWYtBx/RznUfKA=" + }, "config-chain": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", @@ -35704,6 +35736,23 @@ } } }, + "xgplayer-mp4": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/xgplayer-mp4/-/xgplayer-mp4-1.2.2.tgz", + "integrity": "sha512-WB0Hi6vDy2zyy2jiv6fHP0e8WeydxD2cClOO9DwzBDzVzRTfSMva8cM/qpn5HioXigq1Arq4diUmAEg6U5N6ag==", + "requires": { + "concat-typed-array": "^1.0.2", + "deepmerge": "^2.0.1", + "event-emitter": "^0.3.5" + }, + "dependencies": { + "deepmerge": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", + "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==" + } + } + }, "xgplayer-subtitles": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/xgplayer-subtitles/-/xgplayer-subtitles-1.0.9.tgz", diff --git a/package.json b/package.json index e255b8a..e0fff27 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,8 @@ "vuex": "^3.6.2", "xgplayer": "2.19.1", "xgplayer-flv.js": "^2.3.0", - "xgplayer-hls.js": "^2.4.2" + "xgplayer-hls.js": "^2.4.2", + "xgplayer-mp4": "^1.2.2" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.11", diff --git a/src/components/Play.vue b/src/components/Play.vue index c2af007..b060452 100644 --- a/src/components/Play.vue +++ b/src/components/Play.vue @@ -252,6 +252,7 @@ import { mapMutations } from 'vuex' import { star, history, setting, shortcut, mini, channelList, sites } from '../lib/dexie' import zy from '../lib/site/tools' import Player from 'xgplayer' +import 'xgplayer-mp4' import HlsJsPlayer from 'xgplayer-hls.js' import FlvJsPlayer from 'xgplayer-flv.js' import mt from 'mousetrap' diff --git a/yarn.lock b/yarn.lock index dcbe5ae..adc7b33 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3086,6 +3086,11 @@ "readable-stream" "^2.2.2" "typedarray" "^0.0.6" +"concat-typed-array@^1.0.2": + "integrity" "sha1-Z4gMPOGez/EQwxWYtBx/RznUfKA=" + "resolved" "https://registry.npmjs.org/concat-typed-array/-/concat-typed-array-1.0.2.tgz" + "version" "1.0.2" + "config-chain@^1.1.11": "integrity" "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==" "resolved" "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz" @@ -3657,6 +3662,11 @@ "resolved" "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz" "version" "1.5.2" +"deepmerge@^2.0.1": + "integrity" "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==" + "resolved" "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz" + "version" "2.2.1" + "deepmerge@2.0.1": "integrity" "sha512-VIPwiMJqJ13ZQfaCsIFnp5Me9tnjURiaIFxfz7EH0Ci0dTSQpZtSLrqOicXqEd/z2r+z+Klk9GzmnRsgpgbOsQ==" "resolved" "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.1.tgz" @@ -10908,6 +10918,15 @@ "event-emitter" "^0.3.5" "eventemitter3" "^4.0.7" +"xgplayer-mp4@^1.2.2": + "integrity" "sha512-WB0Hi6vDy2zyy2jiv6fHP0e8WeydxD2cClOO9DwzBDzVzRTfSMva8cM/qpn5HioXigq1Arq4diUmAEg6U5N6ag==" + "resolved" "https://registry.npmjs.org/xgplayer-mp4/-/xgplayer-mp4-1.2.2.tgz" + "version" "1.2.2" + dependencies: + "concat-typed-array" "^1.0.2" + "deepmerge" "^2.0.1" + "event-emitter" "^0.3.5" + "xgplayer-subtitles@^1.0.9": "integrity" "sha512-9or3CvDzKVudhzyljveV2/kV1Y13W+T57c+ilquA+Ysym+cY4A1v9Z8umq2KM4JNQPFGKWRvgfGjl5YpICnI3w==" "resolved" "https://registry.npmjs.org/xgplayer-subtitles/-/xgplayer-subtitles-1.0.9.tgz"