4ce946dd8f
# Conflicts: # gradle.properties # modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java # modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java # modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
基实现功能
基础服务apk实现对应功能：位置上报、长连接、passport
位置上报：com.zhidao.locationinfo 长链：com.zhidao.socketservice passport：