Merge pull request #70 from HollyDAI/master

UI设计
Merge pull request #86 from HollyDAI/master

Merge pull request #70 from HollyDAI/master
Merge pull request #87 from HollyDAI/2c

2c
工程合并版本
Merge pull request #88 from HollyDAI/2c

工程合并版本
Merge pull request #89 from HollyDAI/master

5.19