12.21 update some bugs
Merge branch 'master' of https://github.com/zzt93/Hw-Client