From cb7c7e3bb7388ac0db27bce3e402d22694e807a1 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 15 Nov 2021 15:12:51 +0800 Subject: [PATCH] =?UTF-8?q?[Delete]=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=BB=A3=E7=A0=81=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../map/impl/custom/CustomMapApiBuilder.java | 25 --------- .../CustomMapCoordinatesTransformer.java | 38 -------------- .../impl/custom/search/RoadSearchClient.java | 45 ---------------- .../com/mogo/map/CoordinatesTransformer.java | 13 ----- .../java/com/mogo/map/IMogoMapApiBuilder.java | 11 ---- .../mogo/map/IMogoMapViewInstanceHandler.java | 15 ------ .../mogo/map/MogoCoordinatesTransformer.java | 47 ----------------- .../com/mogo/map/MogoInputtipsSearch.java | 51 ------------------- .../com/mogo/map/MogoMapDelegateFactory.java | 19 ------- .../mogo/map/MogoMapViewInstanceHandler.java | 47 ----------------- .../java/com/mogo/map/MogoRoadSearch.java | 36 ------------- 11 files changed, 347 deletions(-) delete mode 100644 libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapCoordinatesTransformer.java delete mode 100644 libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/RoadSearchClient.java delete mode 100644 libraries/mogo-map-api/src/main/java/com/mogo/map/CoordinatesTransformer.java delete mode 100644 libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMapViewInstanceHandler.java delete mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/MogoCoordinatesTransformer.java delete mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/MogoInputtipsSearch.java delete mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/MogoMapViewInstanceHandler.java delete mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/MogoRoadSearch.java diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index 7fe491c09c..eb23706c19 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -4,25 +4,19 @@ import android.content.Context; import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.map.CoordinatesTransformer; import com.mogo.map.IMogoMapApiBuilder; import com.mogo.map.IMogoMapView; import com.mogo.map.MapApiPath; import com.mogo.map.impl.custom.location.ALocationClient; import com.mogo.map.impl.custom.navi.NaviClient; import com.mogo.map.impl.custom.search.GeocodeSearchClient; -import com.mogo.map.impl.custom.search.InputtipsSearch; import com.mogo.map.impl.custom.search.PoiSearchClient; -import com.mogo.map.impl.custom.search.RoadSearchClient; import com.mogo.map.impl.custom.uicontroller.AMapUIController; import com.mogo.map.impl.custom.utils.IconTypeUtils; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.navi.IMogoAimless; import com.mogo.map.navi.IMogoNavi; -import com.mogo.map.search.drive.IMogoRoadSearch; import com.mogo.map.search.geo.IMogoGeoSearch; -import com.mogo.map.search.inputtips.IMogoInputtipsSearch; -import com.mogo.map.search.inputtips.query.MogoInputtipsQuery; import com.mogo.map.search.poisearch.IMogoPoiSearch; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.search.traffic.IMogoTrafficSearch; @@ -49,11 +43,6 @@ public class CustomMapApiBuilder implements IMogoMapApiBuilder { return new GeocodeSearchClient(context); } - @Override - public IMogoInputtipsSearch getInputtipsSearch(Context context, MogoInputtipsQuery query) { - return new InputtipsSearch(context, query); - } - @Override public IMogoLocationClient getLocationClient(Context context) { return new ALocationClient(context); @@ -74,20 +63,11 @@ public class CustomMapApiBuilder implements IMogoMapApiBuilder { return new PoiSearchClient(context, query); } - @Override - public IMogoRoadSearch getRoadSearch() { - return new RoadSearchClient(); - } - @Override public IMogoAimless getAimless(Context context) { return null; } - @Override - public void createMapView(Context context) { - // do not implements. - } @Override public IMogoMapView getMapView(Context context) { @@ -125,11 +105,6 @@ public class CustomMapApiBuilder implements IMogoMapApiBuilder { return IconTypeUtils.getResIdByIconType(context, iconType); } - @Override - public CoordinatesTransformer getCoordinatesTransformer() { - return CustomMapCoordinatesTransformer.getInstance(); - } - @Override public void init(Context context) { Logger.d(TAG, "init"); diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapCoordinatesTransformer.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapCoordinatesTransformer.java deleted file mode 100644 index 92994ffaa1..0000000000 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapCoordinatesTransformer.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.mogo.map.impl.custom; - -import com.mogo.map.CoordinatesTransformer; - -public -/** - * @author congtaowang - * @since 2020/12/17 - * - * 描述 - */ -class CustomMapCoordinatesTransformer implements CoordinatesTransformer { - - private CustomMapCoordinatesTransformer() { - // private constructor - } - - private static final class InstanceHolder { - private static final CustomMapCoordinatesTransformer INSTANCE = new CustomMapCoordinatesTransformer(); - } - - public static CustomMapCoordinatesTransformer getInstance() { - return InstanceHolder.INSTANCE; - } - - private Object readResolve() { - // 阻止反序列化，必须实现 Serializable 接口 - return InstanceHolder.INSTANCE; - } - - @Override - public double[] transform( double lat, double lon ) { - double[] coor = new double[2]; - coor[0] = lat; - coor[1] = lon; - return coor; - } -} diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/RoadSearchClient.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/RoadSearchClient.java deleted file mode 100644 index 92bfe97367..0000000000 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/RoadSearchClient.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.mogo.map.impl.custom.search; - -import android.content.Context; - -import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.map.search.drive.IMogoRoadSearch; -import com.mogo.map.search.drive.IMogoRoadSearchListener; -import com.mogo.map.search.drive.MogoRoadSearchQuery; -import com.mogo.utils.logger.Logger; - -/** - * @author congtaowang - * @since 2020/6/1 - *

- * 描述 - */ -public class RoadSearchClient implements IMogoRoadSearch { - - private static final String TAG = "DriveSearchClient"; - - private IMogoRoadSearchListener mListener; - - @Override - public void searchRoadPath( Context context, - MogoRoadSearchQuery query ) { - - } - - private boolean checkPoint( MogoLatLng latLng, String msg ) { - if ( latLng == null ) { - Logger.e( TAG, msg + " is null" ); - return false; - } - if ( latLng.lat <= 0d || latLng.lon <= 0d ) { - Logger.e( TAG, msg + " is not a valid " ); - return false; - } - return true; - } - - @Override - public void setRoadPathSearchListener( IMogoRoadSearchListener listener ) { - mListener = listener; - } -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/CoordinatesTransformer.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/CoordinatesTransformer.java deleted file mode 100644 index ae6fcb07ae..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/CoordinatesTransformer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.map; - -public -/** - * @author congtaowang - * @since 2020/12/17 - * - * 目前整个坐标按照高德火星坐标为准，故对于高德和自研地图，需要实现不同的转换，达到适应各自地图的目的 - */ -interface CoordinatesTransformer { - - double[] transform( double lat, double lon ); -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMapApiBuilder.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMapApiBuilder.java index 74fa2d9840..f55c505ae6 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMapApiBuilder.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMapApiBuilder.java @@ -6,10 +6,7 @@ import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.navi.IMogoAimless; import com.mogo.map.navi.IMogoNavi; -import com.mogo.map.search.drive.IMogoRoadSearch; import com.mogo.map.search.geo.IMogoGeoSearch; -import com.mogo.map.search.inputtips.IMogoInputtipsSearch; -import com.mogo.map.search.inputtips.query.MogoInputtipsQuery; import com.mogo.map.search.poisearch.IMogoPoiSearch; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.search.traffic.IMogoTrafficSearch; @@ -26,8 +23,6 @@ interface IMogoMapApiBuilder extends IProvider { IMogoGeoSearch getGeoSearch( Context context ); - IMogoInputtipsSearch getInputtipsSearch( Context context, MogoInputtipsQuery query ); - IMogoLocationClient getLocationClient( Context context ); IMogoMapUIController getMapUIController(); @@ -36,12 +31,8 @@ interface IMogoMapApiBuilder extends IProvider { IMogoPoiSearch getPoiSearchClient( Context context, MogoPoiSearchQuery query ); - IMogoRoadSearch getRoadSearch(); - IMogoAimless getAimless( Context context ); - void createMapView( Context context ); - void destroy(); IMogoMapView getMapView( Context context ); @@ -49,6 +40,4 @@ interface IMogoMapApiBuilder extends IProvider { IMogoTrafficSearch getTrafficSearch(); int getResIdByIconType( Context context, int iconType ); - - CoordinatesTransformer getCoordinatesTransformer(); } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMapViewInstanceHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMapViewInstanceHandler.java deleted file mode 100644 index 55d5b23a2f..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMapViewInstanceHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mogo.map; - -import android.content.Context; - -public -/** - * @author congtaowang - * @since 2020/9/10 - * - * 描述 - */ -interface IMogoMapViewInstanceHandler extends IDestroyable { - - void createMapViewInstance( Context context ); -} diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoCoordinatesTransformer.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoCoordinatesTransformer.java deleted file mode 100644 index e37689fde1..0000000000 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoCoordinatesTransformer.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.mogo.map; - -public -/** - * @author congtaowang - * @since 2020/12/17 - * - * 描述 - */ -class MogoCoordinatesTransformer implements CoordinatesTransformer { - - private CoordinatesTransformer mDelegate; - - private static volatile MogoCoordinatesTransformer sInstance; - - private MogoCoordinatesTransformer(){ - mDelegate = MogoMapDelegateFactory.getCoordinatesTransformer(); - } - - public static MogoCoordinatesTransformer getInstance(){ - if( sInstance == null ){ - synchronized( MogoCoordinatesTransformer.class ) { - if( sInstance == null ){ - sInstance = new MogoCoordinatesTransformer(); - } - } - } - return sInstance; - } - - public synchronized void release(){ - sInstance = null; - } - - private Object readResolve() { - // 阻止反序列化，必须实现 Serializable 接口 - return sInstance; - } - - @Override - public double[] transform( double lat, double lon ) { - if ( mDelegate != null ) { - return mDelegate.transform( lat, lon ); - } - return null; - } -} diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoInputtipsSearch.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoInputtipsSearch.java deleted file mode 100644 index 86ef7414f1..0000000000 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoInputtipsSearch.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.mogo.map; - -import android.content.Context; - -import com.mogo.map.search.inputtips.IMogoInputtipsListener; -import com.mogo.map.search.inputtips.IMogoInputtipsSearch; -import com.mogo.map.search.inputtips.query.MogoInputtipsQuery; - -/** - * @author congtaowang - * @since 2019-12-20 - *

- * 描述 - */ -public class MogoInputtipsSearch implements IMogoInputtipsSearch { - - private IMogoInputtipsSearch mDelegate; - - public MogoInputtipsSearch( Context context, MogoInputtipsQuery query ) { - mDelegate = MogoMapDelegateFactory.getInputtipsSearchDelegate( context, query ); - } - - @Override - public void setQuery( MogoInputtipsQuery query ) { - if ( mDelegate != null ) { - mDelegate.setQuery( query ); - } - } - - @Override - public void setInputtipsListener( IMogoInputtipsListener listener ) { - if ( mDelegate != null ) { - mDelegate.setInputtipsListener( listener ); - } - } - - @Override - public void requestInputtipsAsyn() { - if ( mDelegate != null ) { - mDelegate.requestInputtipsAsyn(); - } - } - - @Override - public void destroy() { - if ( mDelegate != null ) { - mDelegate.destroy(); - } - mDelegate = null; - } -} diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapDelegateFactory.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapDelegateFactory.java index 997f7d8fbb..a05cc3dd9d 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapDelegateFactory.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapDelegateFactory.java @@ -8,10 +8,7 @@ import com.mogo.map.impl.automap.navi.AutoNaviClient; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.navi.IMogoAimless; import com.mogo.map.navi.IMogoNavi; -import com.mogo.map.search.drive.IMogoRoadSearch; import com.mogo.map.search.geo.IMogoGeoSearch; -import com.mogo.map.search.inputtips.IMogoInputtipsSearch; -import com.mogo.map.search.inputtips.query.MogoInputtipsQuery; import com.mogo.map.search.poisearch.IMogoPoiSearch; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.search.traffic.IMogoTrafficSearch; @@ -45,10 +42,6 @@ class MogoMapDelegateFactory { return getApiBuilder().getGeoSearch(context); } - public static IMogoInputtipsSearch getInputtipsSearchDelegate(Context context, MogoInputtipsQuery query) { - return getApiBuilder().getInputtipsSearch(context, query); - } - public static IMogoLocationClient getLocationClientDelegate(Context context) { return getApiBuilder().getLocationClient(context); } @@ -71,19 +64,10 @@ class MogoMapDelegateFactory { return getApiBuilder().getPoiSearchClient(context, query); } - public static IMogoRoadSearch getRoadSearchDelegate() { - return getApiBuilder().getRoadSearch(); - } - - public static IMogoAimless getAimless(Context context) { return getApiBuilder().getAimless(context); } - public static void createMapViewInstance(Context context) { - getApiBuilder().createMapView(context); - } - public static void destroy() { getApiBuilder().destroy(); } @@ -96,7 +80,4 @@ class MogoMapDelegateFactory { return getApiBuilder().getTrafficSearch(); } - public static CoordinatesTransformer getCoordinatesTransformer() { - return getApiBuilder().getCoordinatesTransformer(); - } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapViewInstanceHandler.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapViewInstanceHandler.java deleted file mode 100644 index 9433147dda..0000000000 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapViewInstanceHandler.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.mogo.map; - -import android.content.Context; - -public -/** - * @author congtaowang - * @since 2020/9/10 - * - * 描述 - */ -class MogoMapViewInstanceHandler implements IMogoMapViewInstanceHandler { - - private static volatile MogoMapViewInstanceHandler sInstance; - - private MogoMapViewInstanceHandler(){} - - public static MogoMapViewInstanceHandler getInstance(){ - if( sInstance == null ){ - synchronized( MogoMapViewInstanceHandler.class ) { - if( sInstance == null ){ - sInstance = new MogoMapViewInstanceHandler(); - } - } - } - return sInstance; - } - - public synchronized void release(){ - sInstance = null; - } - - private Object readResolve() { - // 阻止反序列化，必须实现 Serializable 接口 - return sInstance; - } - - @Override - public void createMapViewInstance( Context context ) { - MogoMapDelegateFactory.createMapViewInstance( context ); - } - - @Override - public void destroy() { - MogoMapDelegateFactory.destroy(); - } -} diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoRoadSearch.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoRoadSearch.java deleted file mode 100644 index 5853df9389..0000000000 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoRoadSearch.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.mogo.map; - -import android.content.Context; - -import com.mogo.map.search.drive.IMogoRoadSearch; -import com.mogo.map.search.drive.IMogoRoadSearchListener; -import com.mogo.map.search.drive.MogoRoadSearchQuery; - -/** - * @author congtaowang - * @since 2020/6/1 - *

- * 描述 - */ -public class MogoRoadSearch implements IMogoRoadSearch { - - private IMogoRoadSearch mDelegate; - - public MogoRoadSearch() { - mDelegate = MogoMapDelegateFactory.getRoadSearchDelegate(); - } - - @Override - public void searchRoadPath( Context context, MogoRoadSearchQuery query ) { - if ( mDelegate != null ) { - mDelegate.searchRoadPath( context, query ); - } - } - - @Override - public void setRoadPathSearchListener( IMogoRoadSearchListener listener ) { - if ( mDelegate != null ) { - mDelegate.setRoadPathSearchListener( listener ); - } - } -}