更该出行的接收页面
更新
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/zero/goOut/BusInfo.class
	bin/classes/com/zero/goOut/BusTrackInfo.class
	bin/classes/com/zero/goOut/BusTrackInfoAdapter$Holder.class
	bin/classes/com/zero/goOut/BusTrackInfoAdapter.class
	bin/classes/com/zero/jxauapp/BusTrackFragment$1.class
	bin/classes/com/zero/jxauapp/BusTrackFragment.class
	src/com/zero/goOut/BusInfo.java
	src/com/zero/goOut/BusTrackInfo.java
	src/com/zero/goOut/BusTrackInfoAdapter.java
合并
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/zero/goOut/BusInfo.class
	bin/classes/com/zero/jxauapp/BusTrackFragment.class
	bin/classes/com/zero/jxauapp/MainActivity$PopMenuBtnListener.class
	bin/classes/com/zero/jxauapp/MainActivity.class
	src/com/zero/goOut/BusInfo.java
	src/com/zero/goOut/GoOutBean.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/zero/goOut/BusInfo.class
优化