Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
toxic-johann committed Nov 11, 2017
1 parent ec3332e commit a8ff7d0
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions demo/flv/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ window.player = new window.Chimee({
src: 'http://yunxianchang.live.ujne7.com/vod-system-bj/TL1ce1196bce348070bfeef2116efbdea6.flv',
// src: 'http://1253804432.vod2.myqcloud.com/3712977fvodgzp1253804432/f3f31e5f9031868223411915443/f0.flv',
isLive: false,
// kernels: {
// flv: window.chimeeKernelFlv
// },
preset: {
kernels: {
flv: window.chimeeKernelFlv
},
// preset: {
// flv: window.chimeeKernelFlv
// },
// 编解码容器
box: 'flv', // flv hls native
// dom容器
Expand All @@ -19,11 +19,11 @@ window.player = new window.Chimee({
controls: true
});

window.player.on('play', evt => {
setTimeout(() => {
console.log('wowowoow');
window.player.$silentLoad('http://yunxianchang.live.ujne7.com/vod-system-bj/TL1ce1196bce348070bfeef2116efbdea6.flv', {
duration: 10
});
}, 500);
});
// window.player.on('play', evt => {
// setTimeout(() => {
// console.log('wowowoow');
// window.player.$silentLoad('http://yunxianchang.live.ujne7.com/vod-system-bj/TL1ce1196bce348070bfeef2116efbdea6.flv', {
// duration: 10
// });
// }, 500);
// });
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"homepage": "https://github.com/Chimeejs/chimee#readme",
"dependencies": {
"babel-runtime": "^6.26.0",
"chimee-kernel": "^1.0.12",
"chimee-kernel": "^1.0.9",
"es-fullscreen": "^0.2.1",
"toxic-decorators": "^0.3.8"
},
Expand All @@ -70,7 +70,7 @@
"husky": "^0.14.3",
"jest": "^21.2.1",
"npm-check-updates": "^2.13.0",
"rollup": "^0.50.0",
"rollup": "^0.49.3",
"rollup-plugin-babel": "^3.0.2",
"rollup-plugin-commonjs": "^8.2.6",
"rollup-plugin-flow-no-whitespace": "^1.0.0",
Expand Down

0 comments on commit a8ff7d0

Please sign in to comment.