From 40e272cb0bea490a629f0438b9dd41575a84e60e Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 6 Jan 2023 14:22:31 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[1?= =?UTF-8?q?=E3=80=81=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83geo=20search]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../function/api/map/IMogoMapService.java | 3 - .../java/com/mogo/map/IMogoMapApiBuilder.java | 6 +- .../mogo/map/search/geo/IMogoGeoSearch.java | 58 ---------- .../search/geo/IMogoGeoSearchListener.java | 24 ---- .../inputtips/IMogoInputtipsListener.java | 14 --- .../inputtips/IMogoInputtipsSearch.java | 23 ---- .../com/mogo/map/CustomMapApiBuilder.java | 7 -- .../main/java/com/mogo/map/MogoGeoSearch.java | 73 ------------ .../com/mogo/map/MogoMapDelegateFactory.java | 5 - .../mogo/map/search/GeocodeSearchClient.java | 109 ------------------ .../com/mogo/map/search/InputtipsSearch.java | 87 -------------- 11 files changed, 1 insertion(+), 408 deletions(-) delete mode 100644 libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/IMogoGeoSearch.java delete mode 100644 libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/IMogoGeoSearchListener.java delete mode 100644 libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/IMogoInputtipsListener.java delete mode 100644 libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/IMogoInputtipsSearch.java delete mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/MogoGeoSearch.java delete mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/search/GeocodeSearchClient.java delete mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/search/InputtipsSearch.java diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java index e2a75e1d76..280efe3649 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java @@ -8,9 +8,6 @@ import com.mogo.map.location.IMogoGDLocationClient; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.overlay.IMogoOverlayManager; -import com.mogo.map.search.geo.IMogoGeoSearch; -import com.mogo.map.search.poisearch.IMogoPoiSearch; -import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.uicontroller.IMogoMapUIController; /** 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 0c2ffc0c78..dbfbef6deb 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 @@ -4,21 +4,17 @@ import android.content.Context; import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.map.location.IMogoLocationClient; -import com.mogo.map.search.geo.IMogoGeoSearch; import com.mogo.map.search.poisearch.IMogoPoiSearch; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.uicontroller.IMogoMapUIController; -public /** * @author congtaowang * @since 2020/12/9 * * 地图实例构建 */ -interface IMogoMapApiBuilder extends IProvider { - - IMogoGeoSearch getGeoSearch( Context context ); +public interface IMogoMapApiBuilder extends IProvider { IMogoLocationClient getLocationClient( Context context ); diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/IMogoGeoSearch.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/IMogoGeoSearch.java deleted file mode 100644 index 1517e517f6..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/IMogoGeoSearch.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.mogo.map.search.geo; - -import com.mogo.map.IDestroyable; -import com.mogo.map.exception.MogoMapException; -import com.mogo.map.search.geo.query.MogoGeocodeQuery; -import com.mogo.map.search.geo.query.MogoRegeocodeQuery; - -import java.util.List; - -/** - * @author congtaowang - * @since 2019-12-19 - *

- * 地理/逆地理位置搜索 - */ -public interface IMogoGeoSearch extends IDestroyable { - - /** - * 添加异步编码回调 - * - * @param listener - */ - void setGeoSearchListener( IMogoGeoSearchListener listener ); - - /** - * 同步获取逆地理编码地址 - * - * @param query - * @return - * @throws MogoMapException - */ - @Deprecated - MogoRegeocodeAddress getFromLocation( MogoRegeocodeQuery query ) throws MogoMapException; - - /** - * 同步获取地理编码地址列表 - * - * @param query - * @return - * @throws MogoMapException - */ - @Deprecated - List< MogoGeocodeAddress > getFromLocationName( MogoGeocodeQuery query ) throws MogoMapException; - - /** - * 异步获取逆地理编码 - * - * @param query - */ - void getFromLocationAsyn( MogoRegeocodeQuery query ); - - /** - * 同步获取地理编码回调 - * - * @param query - */ - void getFromLocationNameAsyn( MogoGeocodeQuery query ); -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/IMogoGeoSearchListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/IMogoGeoSearchListener.java deleted file mode 100644 index 5f895a7db9..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/IMogoGeoSearchListener.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.mogo.map.search.geo; - -/** - * @author congtaowang - * @since 2019-12-19 - *

- * 逆地理/地理编码回调 - */ -public interface IMogoGeoSearchListener { - - /** - * 逆地理编码（根据经纬度获取地理位置信息） - * - * @param regeocodeResult - */ - default void onRegeocodeSearched( MogoRegeocodeResult regeocodeResult ){} - - /** - * 根据名称和城市获取地理位置信息 - * - * @param geocodeResult - */ - default void onGeocodeSearched( MogoGeocodeResult geocodeResult ){} -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/IMogoInputtipsListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/IMogoInputtipsListener.java deleted file mode 100644 index 76dffd78bd..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/IMogoInputtipsListener.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mogo.map.search.inputtips; - -import java.util.List; - -/** - * @author congtaowang - * @since 2019-12-20 - *

- * 描述 - */ -public interface IMogoInputtipsListener { - - void onGetInputtips( List< MogoTip > result ); -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/IMogoInputtipsSearch.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/IMogoInputtipsSearch.java deleted file mode 100644 index 29ac55bd09..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/IMogoInputtipsSearch.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.mogo.map.search.inputtips; - -import com.mogo.map.IDestroyable; -import com.mogo.map.exception.MogoMapException; -import com.mogo.map.search.inputtips.query.MogoInputtipsQuery; - -import java.util.List; - -/** - * @author congtaowang - * @since 2019-12-20 - *

- * 描述 - */ -public interface IMogoInputtipsSearch extends IDestroyable { - - void setQuery( MogoInputtipsQuery query ); - - void setInputtipsListener( IMogoInputtipsListener listener ); - - void requestInputtipsAsyn(); -} - 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 f0ad00a383..c3975a3f70 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 @@ -6,9 +6,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; 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.search.GeocodeSearchClient; import com.mogo.map.search.PoiSearchClient; -import com.mogo.map.search.geo.IMogoGeoSearch; import com.mogo.map.search.poisearch.IMogoPoiSearch; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.uicontroller.AMapUIController; @@ -26,11 +24,6 @@ public class CustomMapApiBuilder implements IMogoMapApiBuilder { private static final String TAG = "CustomMapApiBuilder"; - @Override - public IMogoGeoSearch getGeoSearch(Context context) { - return new GeocodeSearchClient(context); - } - @Override public IMogoLocationClient getLocationClient(Context context) { return new ALocationClient(context); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoGeoSearch.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoGeoSearch.java deleted file mode 100644 index d78942bbd4..0000000000 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoGeoSearch.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.mogo.map; - -import android.content.Context; - -import com.mogo.map.exception.MogoMapException; -import com.mogo.map.search.geo.IMogoGeoSearch; -import com.mogo.map.search.geo.IMogoGeoSearchListener; -import com.mogo.map.search.geo.MogoGeocodeAddress; -import com.mogo.map.search.geo.MogoRegeocodeAddress; -import com.mogo.map.search.geo.query.MogoGeocodeQuery; -import com.mogo.map.search.geo.query.MogoRegeocodeQuery; - -import java.util.List; - -/** - * @author congtaowang - * @since 2019-12-19 - *

- * 地理/逆地理位置搜索 - */ -public class MogoGeoSearch implements IMogoGeoSearch { - - private IMogoGeoSearch mDelegate; - - public MogoGeoSearch( Context context ) { - mDelegate = MogoMapDelegateFactory.getGeoSearchDelegate( context ); - } - - @Override - public void setGeoSearchListener( IMogoGeoSearchListener listener ) { - if ( mDelegate != null ) { - mDelegate.setGeoSearchListener( listener ); - } - } - - @Override - public MogoRegeocodeAddress getFromLocation( MogoRegeocodeQuery query ) throws MogoMapException { - if ( mDelegate != null ) { - return mDelegate.getFromLocation( query ); - } - return null; - } - - @Override - public List< MogoGeocodeAddress > getFromLocationName( MogoGeocodeQuery query ) throws MogoMapException { - if ( mDelegate != null ) { - return mDelegate.getFromLocationName( query ); - } - return null; - } - - @Override - public void getFromLocationAsyn( MogoRegeocodeQuery query ) { - if ( mDelegate != null ) { - mDelegate.getFromLocationAsyn( query ); - } - } - - @Override - public void getFromLocationNameAsyn( MogoGeocodeQuery query ) { - if ( mDelegate != null ) { - mDelegate.getFromLocationNameAsyn( query ); - } - } - - @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 55f5130c54..82e0e4d95e 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 @@ -4,7 +4,6 @@ import android.content.Context; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.map.location.IMogoLocationClient; -import com.mogo.map.search.geo.IMogoGeoSearch; import com.mogo.map.search.poisearch.IMogoPoiSearch; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.uicontroller.IMogoMapUIController; @@ -33,10 +32,6 @@ class MogoMapDelegateFactory { return sApiBuilder; } - public static IMogoGeoSearch getGeoSearchDelegate(Context context) { - return getApiBuilder().getGeoSearch(context); - } - public static IMogoLocationClient getLocationClientDelegate(Context context) { return getApiBuilder().getLocationClient(context); } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/search/GeocodeSearchClient.java b/libraries/mogo-map/src/main/java/com/mogo/map/search/GeocodeSearchClient.java deleted file mode 100644 index b1e86482f0..0000000000 --- a/libraries/mogo-map/src/main/java/com/mogo/map/search/GeocodeSearchClient.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.mogo.map.search; - -import android.content.Context; - -import com.mogo.map.exception.MogoMapException; -import com.mogo.map.search.geo.IMogoGeoSearch; -import com.mogo.map.search.geo.IMogoGeoSearchListener; -import com.mogo.map.search.geo.MogoGeocodeAddress; -import com.mogo.map.search.geo.MogoRegeocodeAddress; -import com.mogo.map.search.geo.query.MogoGeocodeQuery; -import com.mogo.map.search.geo.query.MogoRegeocodeQuery; -import com.mogo.map.utils.ObjectUtils; -import com.zhidaoauto.map.sdk.open.query.GeocodeAddress; -import com.zhidaoauto.map.sdk.open.query.GeocodeResult; -import com.zhidaoauto.map.sdk.open.query.GeocodeSearch; -import com.zhidaoauto.map.sdk.open.query.OnGeocodeSearchListener; -import com.zhidaoauto.map.sdk.open.query.RegeocodeAddress; -import com.zhidaoauto.map.sdk.open.query.RegeocodeResult; -import com.zhidaoauto.map.sdk.open.query.RegeocodeQuery; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author congtaowang - * @since 2019-12-19 - *

- * 地理编码/逆地理编码自研实现 - */ -public class GeocodeSearchClient implements IMogoGeoSearch, OnGeocodeSearchListener { - - private GeocodeSearch mClient; - private IMogoGeoSearchListener mListener; - - public GeocodeSearchClient( Context context ) { - mClient = new GeocodeSearch( context ); - mClient.setOnGeocodeSearchListener( this ); - } - - @Override - public void setGeoSearchListener( IMogoGeoSearchListener listener ) { - mListener = listener; - } - - @Override - public MogoRegeocodeAddress getFromLocation( MogoRegeocodeQuery query ) throws MogoMapException { - try { - RegeocodeQuery regeocodeQuery = ObjectUtils.fromMogo(query); - RegeocodeAddress regeocodeAddress = mClient.getFromLocation(regeocodeQuery); - return ObjectUtils.fromAMap( regeocodeAddress ); - } catch ( Exception e ) { - throw new MogoMapException( e ); - } - } - - @Override - public List< MogoGeocodeAddress > getFromLocationName( MogoGeocodeQuery query ) throws MogoMapException { - try { - List geocodeAddress = mClient.getFromLocationName( ObjectUtils.fromMogo( query ) ); - if ( geocodeAddress != null ) { - List< MogoGeocodeAddress > mogoGeocodeAddresses = new ArrayList<>(); - for ( GeocodeAddress address : geocodeAddress ) { - MogoGeocodeAddress mogoGeocodeAddress = ObjectUtils.fromAMap( address ); - if ( mogoGeocodeAddress != null ) { - mogoGeocodeAddresses.add( mogoGeocodeAddress ); - } - } - return mogoGeocodeAddresses; - } - return new ArrayList<>(); - } catch ( Exception e ) { - throw new MogoMapException( e ); - } - } - - @Override - public void getFromLocationAsyn( MogoRegeocodeQuery query ) { - if ( mClient != null ) { - mClient.getFromLocationAsyn( ObjectUtils.fromMogo( query ) ); - } - } - - @Override - public void getFromLocationNameAsyn( MogoGeocodeQuery query ) { - if ( mClient != null ) { - mClient.getFromLocationNameAsyn( ObjectUtils.fromMogo( query ) ); - } - } - - @Override - public void onRegeocodeSearched(RegeocodeResult regeocodeResult, int i ) { - if ( mListener != null ) { - mListener.onRegeocodeSearched( ObjectUtils.fromAMap( regeocodeResult ) ); - } - } - - @Override - public void onGeocodeSearched(GeocodeResult geocodeResult, int i ) { - if ( mListener != null ) { - mListener.onGeocodeSearched( ObjectUtils.fromAMap( geocodeResult ) ); - } - } - - @Override - public void destroy() { - mClient = null; - mListener = null; - } -} diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/search/InputtipsSearch.java b/libraries/mogo-map/src/main/java/com/mogo/map/search/InputtipsSearch.java deleted file mode 100644 index 1399d6e2e8..0000000000 --- a/libraries/mogo-map/src/main/java/com/mogo/map/search/InputtipsSearch.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.mogo.map.search; - -import android.content.Context; - -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.map.search.inputtips.IMogoInputtipsListener; -import com.mogo.map.search.inputtips.IMogoInputtipsSearch; -import com.mogo.map.search.inputtips.MogoTip; -import com.mogo.map.search.inputtips.query.MogoInputtipsQuery; -import com.mogo.map.utils.ObjectUtils; -import com.zhidaoauto.map.sdk.open.query.Inputtips; -import com.zhidaoauto.map.sdk.open.query.InputtipsListener; -import com.zhidaoauto.map.sdk.open.query.InputtipsQuery; -import com.zhidaoauto.map.sdk.open.query.Tip; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author congtaowang - * @since 2019-12-20 - *

- * 自研地图 inputtips搜索实现 - */ -public class InputtipsSearch implements IMogoInputtipsSearch, InputtipsListener { - - private static final String TAG = "InputtipsSearch"; - - private Inputtips mClient; - private InputtipsQuery mQuery; - private IMogoInputtipsListener mListener; - - public InputtipsSearch(Context context, MogoInputtipsQuery query) { - mQuery = ObjectUtils.fromMogo(query); - mClient = new Inputtips(context, mQuery); - mClient.setInputtipsListener(this); - } - - @Override - public void setQuery(MogoInputtipsQuery query) { - this.mQuery = ObjectUtils.fromMogo(query); - } - - @Override - public void setInputtipsListener(IMogoInputtipsListener listener) { - this.mListener = listener; - } - - @Override - public void requestInputtipsAsyn() { - if (mClient != null) { - mClient.requestInputtipsAsyn(); - } - } - - @Override - public void onGetInputtips(List list, int i) { - if (i == 0) { - if (mListener != null) { - mListener.onGetInputtips(getResult(list)); - } - } else { - CallerLogger.INSTANCE.e(TAG, "errorcode = " + i); - } - } - - private List getResult(List tips) { - List mogoTips = new ArrayList<>(); - if (tips != null) { - //只添加有坐标的结果 - for (Tip tip : tips) { - MogoTip mogoTip = ObjectUtils.fromAMap(tip); - if (mogoTip != null && mogoTip.getPoint() != null) { - mogoTips.add(mogoTip); - } - } - } - return mogoTips; - } - - @Override - public void destroy() { - mClient = null; - mListener = null; - mQuery = null; - } -}