++推送更新
Merge branch 'asmacktest' of https://github.com/02110917/XiaoXiao into asmacktest

Conflicts:
	src/com/flying/xiao/common/UIHelper.java

修改 消息提醒bug  没加震动权限 chatmessage 可能为null