Merge pull request #2 from foxcode7/master

merge foxcode7的最新代码
修改扫描页面，图标被选中时的状态改变
Merge pull request #10 from xuezhangbin/master

修改了扫面页，图标被选中时状态改变