对当前代码进行了整体的重构
Merge branch 'master' of https://github.com/HelloMars/KuangNeiAndroid.git