登录模块改成事件触发
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/src/main/res/layout/activity_center.xml
第一个merge