Merge pull request #7 from tidezyc/master

啊啊
activity基本功能实现，还差总结和评论加上去
Merge pull request #19 from ylnb91/master

pull