Merge pull request #1 from DGAH/master

同步大神的工作
Merge pull request #2 from DGAH/master

同步大神的工作
LuaJilue
LuaShensu

0224中会出现距离问题。。。1111正常
Merge pull request #3 from kingling/master

e。。LuaJilve