diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/adapter/holder/V2XBaseViewHolder.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/adapter/holder/V2XBaseViewHolder.java index 3a63c832a9..1a6361adff 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/adapter/holder/V2XBaseViewHolder.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/adapter/holder/V2XBaseViewHolder.java @@ -24,7 +24,6 @@ import com.mogo.eagle.core.utilcode.util.TimeUtils; import com.mogo.eagle.core.utilcode.util.Utils; import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.navi.MogoNaviInfo; -import com.mogo.map.navi.MogoTraffic; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.common.entity.V2XEventZanData; @@ -245,8 +244,4 @@ public abstract class V2XBaseViewHolder } - @Override - public void onUpdateTraffic(MogoTraffic traffic) { - - } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoHosListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoHosListenerRegister.java index 59f78dc16b..318321b46a 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoHosListenerRegister.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoHosListenerRegister.java @@ -1,7 +1,6 @@ package com.mogo.map.listener; import com.mogo.map.marker.IMogoMarkerClickListenerRegister; -import com.mogo.map.navi.IMogoNaviListenerRegister; /** * @author congtaowang @@ -9,7 +8,7 @@ import com.mogo.map.navi.IMogoNaviListenerRegister; *

* 主模块需要注册监听的事件 */ -public interface IMogoHosListenerRegister extends IMogoNaviListenerRegister, +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 index 13fad36120..eb26a6daa9 100644 --- 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 @@ -2,9 +2,6 @@ package com.mogo.map.listener; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.marker.MogoMarkersHandler; -import com.mogo.map.navi.IMogoAimlessModeListener; -import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.map.navi.MogoNaviListenerHandler; /** * @author congtaowang @@ -45,16 +42,6 @@ public class MogoHosListenerRegister implements IMogoHosListenerRegister { MogoMapListenerHandler.getInstance().unregisterHostMapListener(); } - @Override - public void registerHostNaviListener( IMogoNaviListener listener ) { - MogoNaviListenerHandler.getInstance().registerHostNaviListener( listener ); - } - - @Override - public void unregisterHostNaviListener() { - MogoNaviListenerHandler.getInstance().unregisterHostNaviListener(); - } - @Override public void registerMarkerClickListener( IMogoMarkerClickListener listener ) { MogoMarkersHandler.getInstance().registerMarkerClickListener( listener ); @@ -65,13 +52,4 @@ public class MogoHosListenerRegister implements IMogoHosListenerRegister { MogoMarkersHandler.getInstance().unregisterMarkerClickListener(); } - @Override - public void registerHostAimlessModeListener( IMogoAimlessModeListener listener ) { - MogoNaviListenerHandler.getInstance().registerHostAimlessModeListener( listener ); - } - - @Override - public void unregisterHostAimlessModeListener() { - MogoNaviListenerHandler.getInstance().unregisterHostAimlessModeListener(); - } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoAimlessModeListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoAimlessModeListener.java deleted file mode 100644 index 4d36b30fb0..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoAimlessModeListener.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mogo.map.navi; - -/** - * @author congtaowang - * @since 2020-03-09 - *

- * 续航模式回调 - */ -public interface IMogoAimlessModeListener { - - /** - * 巡航信息发生改变 - */ - default void onUpdateTraffic2( MogoTraffic traffic ){} - - /** - * 拥堵信息 - * - * @param info - */ - default void onUpdateCongestion( MogoCongestionInfo info ){} -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener.java index ff989a920f..0a1993ecd9 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener.java @@ -45,10 +45,4 @@ public interface IMogoNaviListener { */ default void onoCalculateFailed(){} - /** - * 巡航信息发生改变 - * Deprecated, use {@link IMogoAimlessModeListener#onUpdateTraffic2(MogoTraffic)} instead. - */ - @Deprecated - default void onUpdateTraffic( MogoTraffic traffic ){} } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener2.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener2.java deleted file mode 100644 index c0d261c1d6..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener2.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mogo.map.navi; - -/** - * @author congtaowang - * @since 2019-12-25 - *

- * 导航监听:区分导航结束 - */ -public interface IMogoNaviListener2 extends IMogoNaviListener { - - /** - * 实际导航结束 - */ - default void onArriveDestination() { } - - /** - * 模拟导航结束 - */ - default void onEndEmulatorNavi(){} -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListenerRegister.java deleted file mode 100644 index b61789d1ad..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListenerRegister.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.mogo.map.navi; - -/** - * @author congtaowang - * @since 2019-12-23 - *

- * 地图操作回调 - */ -public interface IMogoNaviListenerRegister { - - /** - * 注册导航回调，各业务模块不用关注 - * - * @param listener 回调函数 - */ - void registerHostNaviListener( IMogoNaviListener listener ); - - /** - * 注册巡航模式回调，各业务模块不用关注 - * - * @param listener - */ - void registerHostAimlessModeListener( IMogoAimlessModeListener listener ); - - /** - * 注销导航回调，各业务模块不用关注 - */ - void unregisterHostNaviListener(); - - /** - * 注销巡航回调，各业务模块不用关注 - */ - void unregisterHostAimlessModeListener(); -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionInfo.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionInfo.java deleted file mode 100644 index b064864c39..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionInfo.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.mogo.map.navi; - -import android.os.Parcel; -import android.os.Parcelable; - -import java.util.List; - -/** - * @author congtaowang - * @since 2020-03-09 - *

- * 拥堵详情 - */ -public class MogoCongestionInfo implements Parcelable { - - private int mTime; - private int mLength; - private String mRoadName; - private int mCongestionStatus; - private int mEventType; - private double mEventLon; - private double mEventLat; - - private List< MogoCongestionLink > mCongestionLinks; - - - public MogoCongestionInfo() { - } - - public int getTime() { - return mTime; - } - - public void setTime( int mTime ) { - this.mTime = mTime; - } - - public int getLength() { - return mLength; - } - - public void setLength( int mLength ) { - this.mLength = mLength; - } - - public String getRoadName() { - return mRoadName; - } - - public void setRoadName( String mRoadName ) { - this.mRoadName = mRoadName; - } - - public int getCongestionStatus() { - return mCongestionStatus; - } - - public void setCongestionStatus( int mCongestionStatus ) { - this.mCongestionStatus = mCongestionStatus; - } - - public int getEventType() { - return mEventType; - } - - public void setEventType( int mEventType ) { - this.mEventType = mEventType; - } - - public double getEventLon() { - return mEventLon; - } - - public void setEventLon( double mEventLon ) { - this.mEventLon = mEventLon; - } - - public double getEventLat() { - return mEventLat; - } - - public void setEventLat( double mEventLat ) { - this.mEventLat = mEventLat; - } - - public List< MogoCongestionLink > getCongestionLinks() { - return mCongestionLinks; - } - - public void setCongestionLinks( List< MogoCongestionLink > mCongestionLinks ) { - this.mCongestionLinks = mCongestionLinks; - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel( Parcel dest, int flags ) { - dest.writeInt( this.mTime ); - dest.writeInt( this.mLength ); - dest.writeString( this.mRoadName ); - dest.writeInt( this.mCongestionStatus ); - dest.writeInt( this.mEventType ); - dest.writeDouble( this.mEventLon ); - dest.writeDouble( this.mEventLat ); - dest.writeTypedList( this.mCongestionLinks ); - } - - protected MogoCongestionInfo( Parcel in ) { - this.mTime = in.readInt(); - this.mLength = in.readInt(); - this.mRoadName = in.readString(); - this.mCongestionStatus = in.readInt(); - this.mEventType = in.readInt(); - this.mEventLon = in.readDouble(); - this.mEventLat = in.readDouble(); - this.mCongestionLinks = in.createTypedArrayList( MogoCongestionLink.CREATOR ); - } - - public static final Creator< MogoCongestionInfo > CREATOR = new Creator< MogoCongestionInfo >() { - @Override - public MogoCongestionInfo createFromParcel( Parcel source ) { - return new MogoCongestionInfo( source ); - } - - @Override - public MogoCongestionInfo[] newArray( int size ) { - return new MogoCongestionInfo[size]; - } - }; -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionLink.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionLink.java deleted file mode 100644 index 228cf2ebc5..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionLink.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.mogo.map.navi; - -import android.os.Parcel; -import android.os.Parcelable; - -import com.mogo.eagle.core.data.map.MogoLatLng; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author congtaowang - * @since 2020-03-09 - *

- * 描述 - */ -public class MogoCongestionLink implements Parcelable { - - private ArrayList< MogoLatLng > mCoords; - private int mCongestionStatus; - - - public MogoCongestionLink() { - } - - public List< MogoLatLng > getCoords() { - return mCoords; - } - - public void setCoords( ArrayList< MogoLatLng > mCoords ) { - this.mCoords = mCoords; - } - - public int getCongestionStatus() { - return mCongestionStatus; - } - - public void setCongestionStatus( int mCongestionStatus ) { - this.mCongestionStatus = mCongestionStatus; - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel( Parcel dest, int flags ) { - dest.writeTypedList( this.mCoords ); - dest.writeInt( this.mCongestionStatus ); - } - - protected MogoCongestionLink( Parcel in ) { - this.mCoords = in.createTypedArrayList( MogoLatLng.CREATOR ); - this.mCongestionStatus = in.readInt(); - } - - public static final Creator< MogoCongestionLink > CREATOR = new Creator< MogoCongestionLink >() { - @Override - public MogoCongestionLink createFromParcel( Parcel source ) { - return new MogoCongestionLink( source ); - } - - @Override - public MogoCongestionLink[] newArray( int size ) { - return new MogoCongestionLink[size]; - } - }; -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java deleted file mode 100644 index a4f7ec758c..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.mogo.map.navi; - -/** - * @author congtaowang - * @since 2019-12-24 - *

- * 地图监听注册管理 - */ -public class MogoNaviListenerHandler implements IMogoNaviListener2, IMogoNaviListenerRegister, IMogoAimlessModeListener { - - private static volatile MogoNaviListenerHandler sInstance; - - private MogoNaviListenerHandler() { - } - - public static MogoNaviListenerHandler getInstance() { - if ( sInstance == null ) { - synchronized ( MogoNaviListenerHandler.class ) { - if ( sInstance == null ) { - sInstance = new MogoNaviListenerHandler(); - } - } - } - return sInstance; - } - - public synchronized void release() { - sInstance = null; - } - - /** - * 上层模块代理对象 - */ - private IMogoNaviListener mDelegateListener = null; - - /** - * @return - */ - public boolean hasDelegateListener(){ - return mDelegateListener != null; - } - - /** - * 上层模块代理对象 - */ - private IMogoAimlessModeListener mAimlessDelegateListener = null; - - @Override - public void registerHostNaviListener( IMogoNaviListener listener ) { - mDelegateListener = listener; - } - - @Override - public void unregisterHostNaviListener() { - mDelegateListener = null; - } - - @Override - public void registerHostAimlessModeListener( IMogoAimlessModeListener listener ) { - mAimlessDelegateListener = listener; - } - - @Override - public void unregisterHostAimlessModeListener() { - mAimlessDelegateListener = null; - } - - @Override - public synchronized void onInitNaviFailure() { - if ( mDelegateListener != null ) { - mDelegateListener.onInitNaviFailure(); - } - } - - @Override - public synchronized void onInitNaviSuccess() { - if ( mDelegateListener != null ) { - mDelegateListener.onInitNaviSuccess(); - } - } - - @Override - public synchronized void onNaviInfoUpdate( MogoNaviInfo naviinfo ) { - if ( mDelegateListener != null ) { - mDelegateListener.onNaviInfoUpdate( naviinfo ); - } - } - - @Override - public synchronized void onStartNavi() { - if ( mDelegateListener != null ) { - mDelegateListener.onStartNavi(); - } - } - - @Override - public synchronized void onStopNavi() { - if ( mDelegateListener != null ) { - mDelegateListener.onStopNavi(); - } - } - - @Override - public void onCalculateSuccess() { - if ( mDelegateListener != null ) { - mDelegateListener.onCalculateSuccess(); - } - } - - @Override - public void onoCalculateFailed() { - if ( mDelegateListener != null ) { - mDelegateListener.onoCalculateFailed(); - } - } - - @Override - @Deprecated - public void onUpdateTraffic( MogoTraffic traffic ) { - if ( mDelegateListener != null ) { - mDelegateListener.onUpdateTraffic( traffic ); - } - } - - @Override - public void onUpdateTraffic2( MogoTraffic traffic ) { - if ( mAimlessDelegateListener != null ) { - mAimlessDelegateListener.onUpdateTraffic2( traffic ); - } - } - - @Override - public void onUpdateCongestion( MogoCongestionInfo info ) { - if ( mAimlessDelegateListener != null ) { - mAimlessDelegateListener.onUpdateCongestion( info ); - } - } - - @Override - public void onArriveDestination() { - if ( mDelegateListener instanceof IMogoNaviListener2 ) { - ( ( IMogoNaviListener2 ) mDelegateListener ).onArriveDestination(); - } - } - - @Override - public void onEndEmulatorNavi() { - if ( mDelegateListener instanceof IMogoNaviListener2 ) { - ( ( IMogoNaviListener2 ) mDelegateListener ).onEndEmulatorNavi(); - } - } -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoTraffic.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoTraffic.java deleted file mode 100644 index bfa29696ec..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoTraffic.java +++ /dev/null @@ -1,246 +0,0 @@ -package com.mogo.map.navi; - -/** - * @author congtaowang - * @since 2020-01-16 - *

- * 巡航信息、导航信息 - */ -public class MogoTraffic { - - /** - * 导航 - */ - public static final int TYPE_NAVI = 1; - - /** - * 巡航 - */ - public static final int TYPE_AIM = 2; - - /** - * 导航 or 巡航 - */ - private int mFromType; - - /** - * 距离 - */ - private int mDistance; - - /** - * 限速 - */ - private int mSpeedLimit; - - /** - * 经度 - */ - private double mLon; - - /** - * 维度 - */ - private double mLat; - - /** - * 交通类型 - * 0 未知道路设施 - * 4 测速摄像头、测速雷达 - * 5 违章摄像头 - * 10 请谨慎驾驶 - * 11 有连续拍照 - * 12 铁路道口 - * 13 注意落石（左侧） - * 14 事故易发地段 - * 15 易滑 - * 16 村庄 - * 18 前方学校 - * 19 有人看管的铁路道口 - * 20 无人看管的铁路道口 - * 21 两侧变窄 - * 22 向左急弯路 - * 23 向右急弯路 - * 24 反向弯路 - * 25 连续弯路 - * 26 左侧合流标识牌 - * 27 右侧合流标识牌 - * 28 监控摄像头 - * 29 专用道摄像头 - * 31 禁止超车 - * 36 右侧变窄 - * 37 左侧变窄 - * 38 窄桥 - * 39 左右绕行 - * 40 左侧绕行 - * 41 右侧绕行 - * 42 注意落石（右侧） - * 43 傍山险路（左侧） - * 44 傍山险路（右侧） - * 47 上陡坡 - * 48 下陡坡 - * 49 过水路面 - * 50 路面不平 - * 52 慢行 - * 53 注意危险 - * 58 隧道 - * 59 渡口 - * 92 闯红灯 - * 93 应急车道 - * 94 非机动车道 - * 100 不绑定电子眼高发地 - * 101 车道违章 - * 102 超速违章 - */ - private int mTrafficType; - - public MogoTraffic( int fromType ) { - mFromType = fromType; - } - - public int getFromType() { - return mFromType; - } - - public void setFromType( int fromType ) { - this.mFromType = fromType; - } - - public int getDistance() { - return mDistance; - } - - public void setDistance( int distance ) { - this.mDistance = distance; - } - - public int getSpeedLimit() { - return mSpeedLimit < 0 ? 0 : mSpeedLimit; - } - - public void setSpeedLimit( int speedLimit ) { - this.mSpeedLimit = speedLimit; - } - - public String getDesc() { - switch ( getTrafficType() ) { - case 0: - default: - return "未知道路设施"; - case 4: - return "测速摄像头、测速雷达"; - case 5: - return "违章摄像头"; - case 10: - return "请谨慎驾驶"; - case 11: - return "有连续拍照"; - case 12: - return "铁路道口"; - case 13: - return "注意落石（左侧）"; - case 14: - return "事故易发地段"; - case 15: - return "易滑"; - case 16: - return "村庄"; - case 18: - return "前方学校"; - case 19: - return "有人看管的铁路道口"; - case 20: - return "无人看管的铁路道口"; - case 21: - return "两侧变窄"; - case 22: - return "向左急弯路"; - case 23: - return "向右急弯路"; - case 24: - return "反向弯路"; - case 25: - return "连续弯路"; - case 26: - return "左侧合流标识牌"; - case 27: - return "右侧合流标识牌"; - case 28: - return "监控摄像头"; - case 29: - return "专用道摄像头"; - case 31: - return "禁止超车"; - case 36: - return "右侧变窄"; - case 37: - return "左侧变窄"; - case 38: - return "窄桥"; - case 39: - return "左右绕行"; - case 40: - return "左侧绕行"; - case 41: - return "右侧绕行"; - case 42: - return "注意落石（右侧）"; - case 43: - return "傍山险路（左侧）"; - case 44: - return "傍山险路（右侧）"; - case 47: - return "上陡坡"; - case 48: - return "下陡坡"; - case 49: - return "过水路面"; - case 50: - return "路面不平"; - case 52: - return "慢行"; - case 53: - return "注意危险"; - case 58: - return "隧道"; - case 59: - return "渡口"; - case 92: - return "闯红灯"; - case 93: - return "应急车道"; - case 94: - return "非机动车道"; - case 100: - return "不绑定电子眼高发地"; - case 101: - return "车道违章"; - case 102: - return "超速违章"; - } - } - - public double getLon() { - return mLon; - } - - public void setLon( double lon ) { - this.mLon = lon; - } - - public double getLat() { - return mLat; - } - - public void setLat( double lat ) { - this.mLat = lat; - } - - public int getTrafficType() { - return mTrafficType; - } - - public void setTrafficType( int trafficType ) { - this.mTrafficType = trafficType; - } -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearch.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearch.java deleted file mode 100644 index 934380bb86..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearch.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.mogo.map.search.drive; - -import android.content.Context; - -/** - * @author congtaowang - * @since 2020/6/1 - *

- * 驾驶路线 - */ -public interface IMogoRoadSearch { - - void searchRoadPath( Context context, MogoRoadSearchQuery query ); - - void setRoadPathSearchListener( IMogoRoadSearchListener listener ); -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearchListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearchListener.java deleted file mode 100644 index 101ac5f250..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearchListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.mogo.map.search.drive; - -import com.mogo.eagle.core.data.map.MogoLatLng; - -import java.util.List; - -/** - * @author congtaowang - * @since 2020/6/1 - *

- * 描述 - */ -public interface IMogoRoadSearchListener { - - void onDrivePathSearched( List< MogoLatLng > points ); -} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/MogoRoadSearchQuery.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/MogoRoadSearchQuery.java deleted file mode 100644 index b85d3b1553..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/MogoRoadSearchQuery.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.mogo.map.search.drive; - -import com.mogo.eagle.core.data.map.MogoLatLng; - -import java.util.List; - -/** - * @author congtaowang - * @since 2020/6/1 - *

- * 描述 - */ -public class MogoRoadSearchQuery { - - public MogoLatLng mStart; - public MogoLatLng mTarget; - public List mWays; - - public MogoRoadSearchQuery() { - } - - public MogoRoadSearchQuery setStart( MogoLatLng start ) { - this.mStart = start; - return this; - } - - public MogoRoadSearchQuery setTarget( MogoLatLng target ) { - this.mTarget = target; - return this; - } - - public MogoRoadSearchQuery setWays( List< MogoLatLng > ways ) { - this.mWays = ways; - return this; - } -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 4d9c01e2d7..7b9ccd0799 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -18,10 +18,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.listener.MogoMapListenerHandler; -import com.mogo.map.navi.IMogoAimlessModeListener; import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.navi.MogoNaviInfo; -import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.module.common.MogoApisHandler; @@ -49,7 +47,6 @@ public class EntranceFragment extends MvpFragment iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); - if ( iterator == null ) { - return; - } - while ( iterator.hasNext() ) { - IMogoNaviListener listener = iterator.next(); - if ( listener instanceof IMogoNaviListener2 ) { - try { - ( ( IMogoNaviListener2 ) listener ).onArriveDestination(); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); - } - } - } - } - - @Override - public void onEndEmulatorNavi() { - Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); - if ( iterator == null ) { - return; - } - while ( iterator.hasNext() ) { - IMogoNaviListener listener = iterator.next(); - if ( listener instanceof IMogoNaviListener2 ) { - try { - ( ( IMogoNaviListener2 ) listener ).onEndEmulatorNavi(); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); - } - } - } - } - @Override public void northModel() { Iterator< IMogoADASControlStatusChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index e9bede13a0..7584df6db5 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -191,8 +191,6 @@ public class MainActivity extends MvpActivity implement if (mServiceApis.getMapServiceApi() != null) { mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostMapListener(EventDispatchCenter.getInstance()); - mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostNaviListener(EventDispatchCenter.getInstance()); - mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostAimlessModeListener(EventDispatchCenter.getInstance()); mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener(EventDispatchCenter.getInstance()); } @@ -397,8 +395,6 @@ public class MainActivity extends MvpActivity implement protected void onDestroy() { super.onDestroy(); mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterMarkerClickListener(); - mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostAimlessModeListener(); - mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostNaviListener(); mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostMapListener(); mServiceApis.getRegisterCenterApi().unregisterADASControlStatusChangedListener(TAG); mMogoStatusManager.setMainPageLaunchedStatus(TAG, false); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java index 871dbc4767..d72e7a9fab 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java @@ -3,13 +3,12 @@ package com.mogo.module.main.registercenter; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.navi.IMogoAimlessModeListener; import com.mogo.map.navi.IMogoCarLocationChangedListener; import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoRegisterCenter; @@ -90,16 +89,6 @@ public class MogoRegisterCenter implements IMogoRegisterCenter { MogoRegisterCenterHandler.getInstance().unregisterMogoStaticMarkerClickListener(tag, listener); } - @Override - public void registerMogoAimlessModeListener(String tag, IMogoAimlessModeListener listener) { - MogoRegisterCenterHandler.getInstance().registerMogoAimlessModeListener(tag, listener); - } - - @Override - public void unregisterMogoAimlessModeListener(String tag) { - MogoRegisterCenterHandler.getInstance().unregisterMogoAimlessModeListener(tag); - } - @Override public void registerCarLocationChangedListener(String tag, IMogoCarLocationChangedListener listener) { MogoRegisterCenterHandler.getInstance().registerCarLocationChangedListener(tag, listener); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java index ce38e2d2c1..0faadb5567 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java @@ -5,7 +5,6 @@ import android.content.Context; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.navi.IMogoAimlessModeListener; import com.mogo.map.navi.IMogoCarLocationChangedListener; import com.mogo.map.navi.IMogoNaviListener; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; @@ -34,7 +33,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter { private final Map mLocation = new HashMap<>(); private final Map mMarker = new HashMap<>(); private final Map> mStaticMarker = new HashMap<>(); - private final Map mAimless = new HashMap<>(); private final Map mCarLocations = new ConcurrentHashMap<>(); private final Map mADAS = new HashMap<>(); @@ -128,16 +126,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter { list.remove(listener); } - @Override - public void registerMogoAimlessModeListener(String tag, IMogoAimlessModeListener listener) { - mAimless.put(tag, listener); - } - - @Override - public void unregisterMogoAimlessModeListener(String tag) { - mAimless.remove(tag); - } - @Override public void registerCarLocationChangedListener(String tag, IMogoCarLocationChangedListener listener) { mCarLocations.put(tag, listener); @@ -162,22 +150,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter { public void init(Context context) { } - public IMogoModuleLifecycle getLifecycleListener(String tag) { - return mLifecycle.get(tag); - } - - public IMogoMapListener getMapListener(String tag) { - return mMap.get(tag); - } - - public IMogoNaviListener getNaviListener(String tag) { - return mNavi.get(tag); - } - - public IMogoLocationListener getLocationListener(String tag) { - return mLocation.get(tag); - } - public IMogoMarkerClickListener getMarkerListener(String tag) { return mMarker.get(tag); } @@ -186,10 +158,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter { return mStaticMarker.get(tag); } - public Iterator getLifecycleListeners() { - return mLifecycle.values().iterator(); - } - public Iterator getMapListeners() { return mMap.values().iterator(); } @@ -203,15 +171,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter { return mLocation.values().iterator(); } - public Iterator getMarkerListeners() { - return mMarker.values().iterator(); - } - - public Iterator getAimlessModeListeners() { - return mAimless.values().iterator(); - } - - public Iterator getCarLocationChangedListener() { return mCarLocations.values().iterator(); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 46e040b547..4e654dfac2 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -13,7 +13,6 @@ import android.util.Log; import android.view.MotionEvent; import com.mogo.commons.debug.DebugConfig; -import com.mogo.commons.storage.SpStorage; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo; @@ -25,10 +24,8 @@ import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.map.IDestroyable; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationListener; -import com.mogo.map.navi.IMogoAimlessModeListener; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.MogoApisHandler; @@ -81,7 +78,6 @@ public class MogoServices implements IMogoMapListener, IMogoLocationListener, IMogoNaviListener, IMogoIntentListener, - IMogoAimlessModeListener, IMogoVoiceCmdCallBack, FragmentStackTransactionListener, IMogoCarLocationChangedListener2, @@ -322,7 +318,6 @@ public class MogoServices implements IMogoMapListener, mRegisterCenter.registerMogoMapListener( ServiceConst.TYPE, this ); mRegisterCenter.registerMogoLocationListener( ServiceConst.TYPE, this ); mRegisterCenter.registerMogoNaviListener( ServiceConst.TYPE, this ); - mRegisterCenter.registerMogoAimlessModeListener( ServiceConst.TYPE, this ); mRegisterCenter.registerCarLocationChangedListener( ServiceConst.TYPE, this ); mActionManager = MarkerServiceHandler.getActionManager(); @@ -725,25 +720,6 @@ public class MogoServices implements IMogoMapListener, restartAutoRefreshAtTime( 0 ); } - @Override - public void onUpdateTraffic2( MogoTraffic traffic ) { - - if ( traffic == null ) { - return; - } - - if ( mCurrentLimit == traffic.getSpeedLimit() ) { - return; - } - - mCurrentLimit = traffic.getSpeedLimit(); - - Logger.i( TAG, "speed = %d, desc = %s", traffic.getSpeedLimit(), traffic.getDesc() ); - // 发送当前限速到 adas - Intent intent = new Intent( "com.mogo.launcher.adas" ); - intent.putExtra( "adas_speed_limit", traffic.getSpeedLimit() ); - mContext.sendBroadcast( intent ); - } @Override public void onIntentReceived( String command, Intent intent ) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index cd4119e57a..4a803a2d79 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -30,7 +30,6 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.navi.MogoNaviInfo; -import com.mogo.map.navi.MogoTraffic; import com.mogo.map.search.geo.IMogoGeoSearch; import com.mogo.map.search.geo.IMogoGeoSearchListener; import com.mogo.map.search.geo.MogoGeocodeResult; diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoRegisterCenter.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoRegisterCenter.java index d32f681734..a86d86dfc5 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoRegisterCenter.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoRegisterCenter.java @@ -4,7 +4,6 @@ import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.navi.IMogoAimlessModeListener; import com.mogo.map.navi.IMogoCarLocationChangedListener; import com.mogo.map.navi.IMogoNaviListener; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; @@ -121,21 +120,6 @@ public interface IMogoRegisterCenter extends IProvider { */ void unregisterMogoStaticMarkerClickListener( String tag, IMogoMarkerClickListener listener ); - /** - * 注册巡航监听 - * - * @param tag - * @param listener - * @return - */ - void registerMogoAimlessModeListener( String tag, IMogoAimlessModeListener listener ); - - /** - * 注销定位监听函数 - * - * @param tag - */ - void unregisterMogoAimlessModeListener( String tag ); /** * 注册车辆位置变化监听