++BaseActivity.java
Merge branch 'master' of https://github.com/02110917/XiaoXiao