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

[2.13.0-opt]remove service module and module-common

Browse Source
This commit is contained in:
zhongchao
2022-12-23 14:09:47 +08:00
parent 704200d03f
commit 40caefa91f
163 changed files with 13479 additions and 980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/mogo-map/src/main/java/com/mogo/map/AMapMarkerClickHandler.java
View File

@@ -55,7 +55,7 @@ public class AMapMarkerClickHandler {
IMogoMarker iMogoMarker = new AMapMarkerWrapper(marker,new MogoMarkerOptions());
iMogoMarker.setOwner(MAP_STATIC); //TODO 后续可能由于类型比较多，需要owner匹配机制,以及控制owner细粒度
CallerLogger.INSTANCE.d("AMapMarkerWrapper", "traffic marker 点击回调");
return MogoMarkersHandler.getInstance().onStaticMarkerClicked(iMogoMarker);
return MogoMarkersHandler.Companion.getMogoMarkersHandler().onStaticMarkerClicked(iMogoMarker);
}
Map<String, IMogoMarker> mogoMarkerMap = MarkerWrapperClickHelper.getInstance().getMogoMarkerMap();
@@ -69,7 +69,7 @@ public class AMapMarkerClickHandler {
return true;
}
}
return MogoMarkersHandler.getInstance().onMarkerClicked(mogoMarker);
return MogoMarkersHandler.Companion.getMogoMarkersHandler().onMarkerClicked(mogoMarker);
}
return false;
}

25
libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
View File

@@ -677,9 +677,6 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void changeMapViewAngle(int type) {
if (checkAMapView()) {
//mMapView.getMapAutoViewHelper().testMapViewAngle(type);
}
}
@Override
@@ -783,18 +780,13 @@ public class AMapViewWrapper implements IMogoMapView,
} else {
mIsFirstLocated = true;
mIsDelayed = false;
// try {
// CallerLogger.INSTANCE.d(M_MAP + TAG, "同步定位：" + GsonUtils.toJson(location));
// } catch (Exception e) {
// e.printStackTrace();
// }
}
}
}
@Override
public void onMapClick(@Nullable LonLatPoint lonLatPoint) {
MogoMapListenerHandler.getInstance().onMapClick(ObjectUtils.fromAMap(lonLatPoint));
MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapClick(ObjectUtils.fromAMap(lonLatPoint));
}
@@ -809,7 +801,7 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onMapInit() {
CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--onMapInit: ");
MogoMapListenerHandler.getInstance().onMapLoaded();
MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapLoaded();
}
@ChainLog(
@@ -827,7 +819,7 @@ public class AMapViewWrapper implements IMogoMapView,
if (checkAMapView()) {
CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition();
Trace.beginSection("timer.onCameraChangeFinish");
MogoMapListenerHandler.getInstance().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()),
MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()),
cameraPosition.getZoom(),
cameraPosition.getTilt(),
cameraPosition.getBearing());
@@ -840,7 +832,7 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public boolean onTouch(@Nullable MotionEvent motionEvent) {
MogoMapListenerHandler.getInstance().onTouch(motionEvent);
MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onTouch(motionEvent);
return false;
}
@@ -857,14 +849,13 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onMapStatusChanged(int type, int value) {
//CallerLogger.INSTANCE.i(M_MAP+TAG, "mapop--onMapStatusChanged-: " + type + "," + value);
}
@Override
public void onMapViewVisualAngleChange(int i) {
CallerLogger.INSTANCE.d(M_MAP + TAG, " 地图自动更改视距 currentThread : " + Thread.currentThread().getName());
mVisualAngleMode = getVisualAngleMode(i);
MogoMapListenerHandler.getInstance().onMapVisualAngleChanged(mVisualAngleMode);
MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapVisualAngleChanged(mVisualAngleMode);
}
/**
@@ -894,15 +885,13 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onCameraChange(int type, int value) {
//CallerLogger.INSTANCE.i(M_MAP+TAG, "mapop--onCameraChange-: " + type + "," + value);
}
@Override
public void onCameraChangeFinish(@Nullable CameraPosition cameraPosition) {
// CallerLogger.INSTANCE.i( M_MAP+TAG, "mapop--onCameraChangeFinish-: " + cameraPosition + "cost:" + ( System.currentTimeMillis() - startTime ) );
if (cameraPosition != null) {
Trace.beginSection("timer.onCameraChangeFinish");
MogoMapListenerHandler.getInstance().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()),
MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()),
cameraPosition.getZoom(),
cameraPosition.getTilt(),
cameraPosition.getBearing());
@@ -935,7 +924,7 @@ public class AMapViewWrapper implements IMogoMapView,
UiThreadHandler.post(() -> {
try {
CallerLogger.INSTANCE.d(M_MAP + TAG, "currentUI = " + mCurrentUI);
MogoMapListenerHandler.getInstance().onMapModeChanged(mCurrentUI);
MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapModeChanged(mCurrentUI);
CallerMapStyleListenerManager.INSTANCE.invokeMapStyleChange(styleId);
} catch (Exception e) {
e.printStackTrace();

4
libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
View File

@@ -101,7 +101,7 @@ public class AMapWrapper implements IMogoMap {
}
final IMogoMarker mogoMarker = new AMapMarkerWrapper(mAMap.addMarker(markerOptions), options);
if (options.isAutoManager()) {
MogoMarkersHandler.getInstance().add(tag, mogoMarker);
MogoMarkersHandler.Companion.getMogoMarkersHandler().add(tag, mogoMarker);
}
return mogoMarker;
}
@@ -185,7 +185,7 @@ public class AMapWrapper implements IMogoMap {
}
mogoMarkers.add(new AMapMarkerWrapper(marker, options.get(i)));
}
MogoMarkersHandler.getInstance().add(tag, mogoMarkers);
MogoMarkersHandler.Companion.getMogoMarkersHandler().add(tag, mogoMarkers);
return mogoMarkers;
}

16
libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java
View File

@@ -102,44 +102,44 @@ public class MogoMarkerManager implements IMogoMarkerManager {
@Override
public void removeMarkers( String tag ) {
CallMarkersClearManager.INSTANCE.invokeClearAllMarkersOfTag(tag);
MogoMarkersHandler.getInstance().remove( tag );
MogoMarkersHandler.Companion.getMogoMarkersHandler().remove( tag );
}
@Override
public void removeMarkers() {
CallMarkersClearManager.INSTANCE.invokeClearAllMarkers();
MogoMarkersHandler.getInstance().removeAll();
MogoMarkersHandler.Companion.getMogoMarkersHandler().removeAll();
}
@Override
public void visibleAllMarkers() {
MogoMarkersHandler.getInstance().visibleAll();
MogoMarkersHandler.Companion.getMogoMarkersHandler().visibleAll();
}
@Override
public void inVisibleAllMarkers() {
CallMarkersClearManager.INSTANCE.invokeClearAllMarkers();
MogoMarkersHandler.getInstance().inVisibleAll();
MogoMarkersHandler.Companion.getMogoMarkersHandler().inVisibleAll();
}
@Override
public void inVisibleWithoutMarkers(String ...owner) {
MogoMarkersHandler.getInstance().inVisibleMarkers(owner);
MogoMarkersHandler.Companion.getMogoMarkersHandler().inVisibleMarkers(owner);
}
@Override
public List< IMogoMarker > getMarkers( String tag ) {
return MogoMarkersHandler.getInstance().getMarkers( tag );
return MogoMarkersHandler.Companion.getMogoMarkersHandler().getMarkers( tag );
}
@Override
public Map< String, List< IMogoMarker > > getAllMarkers() {
return MogoMarkersHandler.getInstance().getAllMarkers();
return MogoMarkersHandler.Companion.getMogoMarkersHandler().getAllMarkers();
}
@Override
public void removeMarkersExcept( String tag ) {
MogoMarkersHandler.getInstance().deleteAllExcept( tag );
MogoMarkersHandler.Companion.getMogoMarkersHandler().deleteAllExcept( tag );
}
@Override