Merge pull request #3 from eoecn/master

版本1.1.0
Merge pull request #4 from eoecn/master

update
Merge remote-tracking branch 'eoecn/master'
Merge branch 'master' of https://github.com/feicien/android-app
Merge pull request #86 from qxw2012/master

主要解决了issue#55和issue25
add weixin scan line
scan Screenshots
Merge pull request #88 from feicien/master

添加微信那样的扫描线
Merge pull request #87 from KOHOH1992/master

Fixed #82
Merge pull request #90 from KOHOH1992/master

修复issue #78 issue #79 issue #84
Merge pull request #92 from KOHOH1992/master

fix the issue #75
fix the issue #9
Merge pull request #94 from KOHOH1992/issue#9

fix the issue #9
Revert "delete uuseless file"

This reverts commit efeedd3b1feff7d345955adc0bc4bf3f84526509.
Merge branch 'KOHOH1992-master'