Merge pull request #1 from eoecn/master

和eoe的保持代码同步
Merge pull request #2 from eoecn/master

gengxin
revert old file because yjl commmit have a bug
Merge pull request #45 from com360/master

MainActivity.java回退到上个版本，退出连续播放动画有bug。