- * 主模块需要注册监听的事件 - */ -public interface IMogoHosListenerRegister extends - IMogoMapListenerRegister, - IMogoMarkerClickListenerRegister { -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoHosListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoHosListenerRegister.java deleted file mode 100644 index 64079055df..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoHosListenerRegister.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.mogo.map.listener; - -import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.marker.MogoMarkersHandler; - -/** - * @author congtaowang - * @since 2019-12-29 - *
- * 描述 - */ -public class MogoHosListenerRegister implements IMogoHosListenerRegister { - - private static volatile MogoHosListenerRegister sInstance; - - private MogoHosListenerRegister() { - } - - public static MogoHosListenerRegister getInstance() { - if ( sInstance == null ) { - synchronized ( MogoHosListenerRegister.class ) { - if ( sInstance == null ) { - sInstance = new MogoHosListenerRegister(); - } - } - } - return sInstance; - } - - public synchronized void release() { - sInstance = null; - } - - - @Override - public void registerHostMapListener(String tag, IMogoMapListener listener ) { - MogoMapListenerHandler.Companion.getMogoMapListenerHandler().registerHostMapListener(tag, listener ); - } - - @Override - public void unregisterHostMapListener(String tag) { - MogoMapListenerHandler.Companion.getMogoMapListenerHandler().unregisterHostMapListener(tag); - } - - @Override - public void registerMarkerClickListener( String tag,IMogoMarkerClickListener listener ) { - MogoMarkersHandler.Companion.getMogoMarkersHandler().registerMarkerClickListener(tag, listener ); - } - - @Override - public void unregisterMarkerClickListener(String tag) { - MogoMarkersHandler.Companion.getMogoMarkersHandler().unregisterMarkerClickListener(tag); - } - -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationClient.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationClient.java deleted file mode 100644 index 61310341a2..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationClient.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.mogo.map.location; - -import com.mogo.eagle.core.data.map.MogoLocation; - -/** - * @author congtaowang - * @since 2019-12-19 - *
- * 定位接口 - */ -public interface IMogoLocationClient extends IMogoLocationListenerRegister { - - /** - * 开始定位 - */ - void start(); - - /** - * 开始定位 - * - * @param interval 默认定位间隔 - */ - void start( long interval ); - - /** - * 停止定位 - */ - void stop(); - - /** - * 返回上一次有效定位 - * - * @return - */ - MogoLocation getLastKnowLocation(); - - void destroy(); - - /** - * 更正最新的位置 - * @param locationToUpdate - */ - void updateLocation(Object locationToUpdate); -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListener.java deleted file mode 100644 index 6d6372fba4..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListener.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mogo.map.location; - -import com.mogo.eagle.core.data.map.MogoLocation; - -/** - * @author congtaowang - * @since 2019-12-19 - *
- * 定位回调 - */ -public interface IMogoLocationListener { - - /** - * 定位发生改变 - * - * @param location 新定位点 - */ - void onLocationChanged( MogoLocation location ); -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListenerRegister.java deleted file mode 100644 index 3fd36903af..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListenerRegister.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.mogo.map.location; - -/** - * @author congtaowang - * @since 2019-12-24 - *
- * 地图监听注册管理 - */ -public interface IMogoLocationListenerRegister { - - /** - * 注册定位回调 - * - * @param listener - */ - void addLocationListener( IMogoLocationListener listener ); - - /** - * 注销定位回调 - * - * @param listener - */ - void removeLocationListener( IMogoLocationListener listener ); -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocationListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocationListenerRegister.java deleted file mode 100644 index 87820f9b83..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocationListenerRegister.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.mogo.map.location; - -import java.util.HashSet; -import java.util.Set; - -/** - * @author congtaowang - * @since 2019-12-24 - *
- * 地图监听注册管理 - */ -public class MogoLocationListenerRegister implements IMogoLocationListenerRegister { - - private static volatile MogoLocationListenerRegister sInstance; - - private MogoLocationListenerRegister() { - } - - public static MogoLocationListenerRegister getInstance() { - if ( sInstance == null ) { - synchronized ( MogoLocationListenerRegister.class ) { - if ( sInstance == null ) { - sInstance = new MogoLocationListenerRegister(); - } - } - } - return sInstance; - } - - public synchronized void release() { - sInstance = null; - } - - private final Set< IMogoLocationListener > sListeners = new HashSet<>( 10 ); - - /** - * 注册定位回调 - * - * @param listener - */ - @Override - public void addLocationListener( IMogoLocationListener listener ) { - if ( listener == null ) { - return; - } - synchronized ( sListeners ) { - sListeners.add( listener ); - } - } - - /** - * 注销定位回调 - * - * @param listener - */ - @Override - public void removeLocationListener( IMogoLocationListener listener ) { - if ( listener == null ) { - return; - } - synchronized ( sListeners ) { - sListeners.remove( listener ); - } - } - - public Set< IMogoLocationListener > getListeners() { - return sListeners; - } -} diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 73b81ebdd7..681c4241e8 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -38,7 +38,6 @@ import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapStyleListenerManager; -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; @@ -981,7 +980,6 @@ public class AMapViewWrapper implements IMogoMapView, bean.setLat(lat); // 使用外部定位数据修改自车位置 mMapView.getLocationClient().updateRTKAutoPilotLocation(bean); - CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(getContext()).updateLocation(bean); CallerMapDataCollectorManager.INSTANCE.setIsInit(); } @@ -1121,7 +1119,6 @@ public class AMapViewWrapper implements IMogoMapView, locationClient.updateLocation(lonLatPoint);//更新新自动驾驶RTK相关数据 - CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(getContext()).updateLocation(lonLatPoint); CallerMapDataCollectorManager.INSTANCE.setIsInit(); } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java b/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java index 0da12910e2..d745f286fb 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java @@ -1,10 +1,6 @@ package com.mogo.map; -import android.content.Context; - import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.map.location.ALocationClient; -import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.uicontroller.AMapUIController; import com.mogo.map.uicontroller.IMogoMapUIController; @@ -32,17 +28,10 @@ public class CustomMapApiBuilder { return sApiBuilder; } - public IMogoLocationClient getLocationClient(Context context) { - return new ALocationClient(context); - } - public IMogoMapUIController getMapUIController() { return AMapUIController.getInstance(); } - public static IMogoLocationClient getLocationClientDelegate(Context context) { - return getApiBuilder().getLocationClient(context); - } public static IMogoMapUIController getMapUIControllerDelegate() { return getApiBuilder().getMapUIController(); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoLocationClient.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoLocationClient.java deleted file mode 100644 index 5d9fbc2d9a..0000000000 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoLocationClient.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.mogo.map; - -import android.content.Context; - -import com.mogo.eagle.core.data.map.MogoLocation; -import com.mogo.map.location.IMogoLocationClient; -import com.mogo.map.location.IMogoLocationListener; -import com.mogo.map.location.MogoLocationListenerRegister; - -/** - * @author congtaowang - * @since 2019-12-19 - *
- */
-public class MogoLocationClient implements IMogoLocationClient {
-
- private static volatile MogoLocationClient sInstance;
-
- public MogoLocationClient( Context context ) {
- mDelegate = CustomMapApiBuilder.getLocationClientDelegate( context );
- }
-
- public static MogoLocationClient getInstance( Context context ) {
- if ( sInstance == null ) {
- synchronized ( MogoLocationClient.class ) {
- if ( sInstance == null ) {
- sInstance = new MogoLocationClient( context );
- }
- }
- }
- return sInstance;
- }
-
- private IMogoLocationClient mDelegate;
-
- @Override
- public void start() {
- if ( mDelegate != null ) {
- mDelegate.start();
- }
- }
-
- @Override
- public void start( long interval ) {
- if ( mDelegate != null ) {
- mDelegate.start( interval );
- }
- }
-
- @Override
- public void stop() {
- if ( mDelegate != null ) {
- mDelegate.stop();
- }
- }
-
- @Override
- public void addLocationListener( IMogoLocationListener listener ) {
- MogoLocationListenerRegister.getInstance().addLocationListener( listener );
- }
-
- @Override
- public void removeLocationListener( IMogoLocationListener listener ) {
- MogoLocationListenerRegister.getInstance().removeLocationListener( listener );
- }
-
- @Override
- public MogoLocation getLastKnowLocation() {
- if ( mDelegate != null ) {
- return mDelegate.getLastKnowLocation();
- }
- return null;
- }
-
- @Override
- public void destroy() {
- if ( mDelegate != null ) {
- mDelegate.destroy();
- }
- }
-
- @Override
- public void updateLocation(Object locationToUpdate) {
- if (mDelegate != null) {
- mDelegate.updateLocation(locationToUpdate);
- }
- }
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/RoadCacheWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/RoadCacheWrapper.java
deleted file mode 100644
index 4f3a9c2497..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/RoadCacheWrapper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.mogo.map;
-
-import com.zhidaoauto.map.sdk.open.query.LonLatPoint;
-
-import java.util.List;
-
-/**
- * 道路数据缓存
- *
- * @author tongchenfei
- */
-public class RoadCacheWrapper {
- private List
- * 自研定位
- */
-public class ALocationClient implements IMogoLocationClient {
-
- private static final String TAG = "ALocationClient";
-
- private MogoLocation mLastLocation;
- private final LocationListener mListener = new InternalLocationListener();
-
- private boolean mIsDestroyed = false;
-
- public ALocationClient( Context context ) {
- mClient = new LocationClient( context );
- mClient.registerListener( mListener );
- mLastLocation = ObjectUtils.fromLocation( mClient.getLastKnownMogoLocation() );
- if ( mLastLocation == null ) {
- mLastLocation = new MogoLocation();
- }
- }
-
- private LocationClient mClient;
-
- @Override
- public void start() {
- start( 2_000L );
- }
-
- @Override
- public void start( long interval ) {
- if ( mIsDestroyed ) {
- destroyWarming();
- return;
- }
- if ( mClient != null ) {
- mClient.start();
- }
- }
-
- @Override
- public void stop() {
- if ( mIsDestroyed ) {
- destroyWarming();
- return;
- }
- if ( mClient != null && mClient.isAGpsStarted() ) {
- mClient.stop();
- }
- }
-
- @Override
- public void addLocationListener( IMogoLocationListener listener ) {
- // do not impl.
- }
-
- @Override
- public void removeLocationListener( IMogoLocationListener listener ) {
- // do not impl.
- }
-
- @Override
- public MogoLocation getLastKnowLocation() {
- if ( mIsDestroyed ) {
- destroyWarming();
- return null;
- }
- return mLastLocation;
- }
-
- @Override
- public synchronized void destroy() {
- mIsDestroyed = true;
- if ( mClient != null ) {
- mClient.unRegisterListener( mListener );
- mClient.destory();
- }
- mClient = null;
- mLastLocation = null;
- }
-
- private class InternalLocationListener implements LocationListener {
-
- @Override
- public void onLocationChanged( @NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location ) {
- if ( mIsDestroyed ) {
- destroyWarming();
- return;
- }
- if ( location == null ||
- location.getLat() == 0.0D ||
- location.getLon() == 0.0D ) {
- return;
- }
- Trace.beginSection( "timer.onLocationChanged" );
- mLastLocation = ObjectUtils.fromLocation( location );
- UiThreadHandler.post(() -> CallerMapLocationListenerManager.INSTANCE.invokeMapLocationChangeListener(mLastLocation, 0, false));
-
- Set< IMogoLocationListener > listeners = MogoLocationListenerRegister.getInstance().getListeners();
- synchronized ( listeners ) {
- Iterator< IMogoLocationListener > listenerIterator = listeners.iterator();
- while ( listenerIterator.hasNext() ) {
- listenerIterator.next().onLocationChanged( mLastLocation.clone() );
- }
- }
- Trace.endSection();
- }
- }
-
- private void destroyWarming() {
- CallerLogger.INSTANCE.w( TAG, "location client has destroyed." );
- }
-
- @Override
- public void updateLocation(Object locationToUpdate) {
- if (locationToUpdate == null) {
- return;
- }
- if (locationToUpdate instanceof MogoLocation) {
- return;
- }
-// if (locationToUpdate instanceof RTKAutopilotLocationBean) {
-// RTKAutopilotLocationBean current = (RTKAutopilotLocationBean) locationToUpdate;
-// if (mClient != null) {
-// mClient.updateRTKAutoPilotLocation(current);
-// }
-// }
- if (locationToUpdate instanceof com.zhidaoauto.map.sdk.open.query.LonLatPoint) {
- LonLatPoint current = (LonLatPoint) locationToUpdate;
- if (mClient != null) {
- mClient.updateLocation(current);
- }
- }
- }
-}