Merge pull request #1 from linyue/master

merge
merge from linyue
修改播放器

播放器修改
Merge pull request #15 from darknwpu/master

video组件修改