fix bugs
Merge branch 'master' of github.com:yalong-tse/drillingmobile