yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'qa_hengyang_base' into feature/feature_hengyang_base

Browse Source 
# Conflicts:
#	.idea/runConfigurations.xml
This commit is contained in:
董宏宇
2021-07-26 11:08:53 +08:00
parent 99c680719f 6e3d93ee2c
commit e408181eee
48 changed files with 984 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java
View File

@@ -5,6 +5,7 @@ import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.cloud.socket.entity.MsgBody;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.connection.IMogoLifecycleListener;
import com.mogo.service.connection.IMogoMsgAckListener;
import com.mogo.service.connection.IMogoOnMessageListener;
import com.mogo.service.connection.IMogoSocketManager;
@@ -52,6 +53,20 @@ public class MogoSocketManager implements IMogoSocketManager {
}
}
@Override
public void registerLifecycleListener(int msgType, IMogoLifecycleListener listener) {
if ( mDelegate != null ) {
mDelegate.registerLifecycleListener( msgType, listener );
}
}
@Override
public void unregisterLifecycleListener(int msgType) {
if ( mDelegate != null ) {
mDelegate.unregisterLifecycleListener( msgType);
}
}
@Override
public void sendMsg(MsgBody body, IMogoMsgAckListener listener ) {
if ( mDelegate != null ) {

2
services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java
View File

@@ -46,7 +46,7 @@ public class IntentManager implements IMogoIntentManager {
sInstance = null;
}
private Map< String, CopyOnWriteArrayList< IMogoIntentListener > > mListeners = new ConcurrentHashMap<>();
private final Map< String, CopyOnWriteArrayList< IMogoIntentListener > > mListeners = new ConcurrentHashMap<>();
@Override
public void registerIntentListener( String intent, IMogoIntentListener listener ) {

6
services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java
View File

@@ -10,6 +10,7 @@ import com.mogo.map.MogoCoordinatesTransformer;
import com.mogo.map.MogoGeoSearch;
import com.mogo.map.MogoInputtipsSearch;
import com.mogo.map.MogoLocationClient;
import com.mogo.map.MogoMap;
import com.mogo.map.MogoMapUIController;
import com.mogo.map.MogoMapViewInstanceHandler;
import com.mogo.map.MogoMarkerManager;
@@ -120,6 +121,11 @@ public class MogoMapService implements IMogoMapService {
return MogoCoordinatesTransformer.getInstance();
}
@Override
public String getMapVersion() {
return MogoMap.getInstance().getMogoMap().getMapVersion();
}
@Override
public void init( Context context ) {
}