修改包名

maplibrary/src/main/java/com/sd/maplibrary/core/basic/amap/AmapGestures.kt → maplibrary/src/main/java/com/sd/api/core/basic/amap/AmapGestures.kt

-package com.sd.maplibrary.core.basic.amap
+package com.sd.api.core.basic.amap
 
 
-import com.sd.maplibrary.core.MapReadyView
+import com.sd.api.core.MapReadyView
 
 /**
  * 高德手势交互

maplibrary/src/main/java/com/sd/maplibrary/core/basic/amap/AmapGpsLocation.kt → maplibrary/src/main/java/com/sd/api/core/basic/amap/AmapGpsLocation.kt

-package com.sd.maplibrary.core.basic.amap
+package com.sd.api.core.basic.amap
 
 import com.amap.api.location.AMapLocation
 import com.amap.api.location.AMapLocationClient
@@ -6,9 +6,9 @@ import com.amap.api.location.AMapLocationClientOption
 import com.amap.api.location.AMapLocationClientOption.AMapLocationMode
 import com.amap.api.location.AMapLocationClientOption.AMapLocationProtocol
 import com.amap.api.location.AMapLocationListener
-import com.sd.maplibrary.UserCtx
-import com.sd.maplibrary.bean.MSLocBean
-import com.sd.maplibrary.core.basic.OnMsGpsLoc
+import com.sd.api.UserCtx
+import com.sd.api.bean.MSLocBean
+import com.sd.api.core.basic.OnMsGpsLoc
 
 /**GPS定位类*/
 class AmapGpsLocation {

maplibrary/src/main/java/com/sd/maplibrary/core/basic/amap/AmapLocationStyle.kt → maplibrary/src/main/java/com/sd/api/core/basic/amap/AmapLocationStyle.kt

-package com.sd.maplibrary.core.basic.amap
+package com.sd.api.core.basic.amap
 
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSLocStyle
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSLocStyle
 import com.amap.api.maps.model.MyLocationStyle as aMapMyLocationStyle
 
 

maplibrary/src/main/java/com/sd/maplibrary/core/basic/amap/AmapMethodAdv.kt → maplibrary/src/main/java/com/sd/api/core/basic/amap/AmapMethodAdv.kt

-package com.sd.maplibrary.core.basic.amap
+package com.sd.api.core.basic.amap
 
 import com.amap.api.maps.CameraUpdateFactory
 import com.amap.api.maps.model.CameraPosition
-import com.sd.maplibrary.core.MapReadyView
+import com.sd.api.core.MapReadyView
 import com.amap.api.maps.model.LatLng as ALatLng
 
 

maplibrary/src/main/java/com/sd/maplibrary/core/basic/amap/AmapNai.kt → maplibrary/src/main/java/com/sd/api/core/basic/amap/AmapNai.kt

-package com.sd.maplibrary.core.basic.amap
+package com.sd.api.core.basic.amap
 
 import com.amap.api.maps.model.Poi
 import com.amap.api.navi.AmapNaviPage
 import com.amap.api.navi.AmapNaviParams
 import com.amap.api.navi.AmapNaviType
 import com.amap.api.navi.AmapPageType
-import com.sd.maplibrary.UserCtx
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.bean.WayPoi
+import com.sd.api.UserCtx
+import com.sd.api.bean.MSLatLng
+import com.sd.api.bean.WayPoi
 import com.amap.api.maps.model.LatLng as ALatLng
 
 

maplibrary/src/main/java/com/sd/maplibrary/core/basic/amap/AmapPoiSearch.kt → maplibrary/src/main/java/com/sd/api/core/basic/amap/AmapPoiSearch.kt

-package com.sd.maplibrary.core.basic.amap
+package com.sd.api.core.basic.amap
 
 import com.amap.api.services.core.AMapException
 import com.amap.api.services.poisearch.PoiSearch.SearchBound
-import com.sd.maplibrary.UserCtx
-import com.sd.maplibrary.bean.PoiSearchRes
-import com.sd.maplibrary.core.basic.OnMSPoiSearchLis
+import com.sd.api.UserCtx
+import com.sd.api.bean.PoiSearchRes
+import com.sd.api.core.basic.OnMSPoiSearchLis
 import com.amap.api.services.core.LatLonPoint as ALatLonPoint
 import com.amap.api.services.poisearch.PoiResult as APoiResult
 import com.amap.api.services.poisearch.PoiSearch as APoiSearch

maplibrary/src/main/java/com/sd/maplibrary/core/basic/amap/AmapRoutePlans.kt → maplibrary/src/main/java/com/sd/api/core/basic/amap/AmapRoutePlans.kt

-package com.sd.maplibrary.core.basic.amap
+package com.sd.api.core.basic.amap
 
 import com.amap.api.maps.CameraUpdateFactory
 import com.amap.api.maps.model.Poi
@@ -7,13 +7,13 @@ import com.amap.api.navi.model.AMapCalcRouteResult
 import com.amap.api.navi.model.AMapNaviPath
 import com.amap.api.navi.model.NaviLatLng
 import com.amap.api.navi.view.RouteOverLay
-import com.sd.maplibrary.UserCtx
-import com.sd.maplibrary.bean.DriverRouteBean
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.bean.WayPoi
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.OnDriveRoute
-import com.sd.maplibrary.intfaces.MyAMapNaviListener
+import com.sd.api.UserCtx
+import com.sd.api.bean.DriverRouteBean
+import com.sd.api.bean.MSLatLng
+import com.sd.api.bean.WayPoi
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.OnDriveRoute
+import com.sd.api.intfaces.MyAMapNaviListener
 import com.amap.api.maps.model.LatLng as ALatLng
 
 

maplibrary/src/main/java/com/sd/maplibrary/core/basic/amap/AmapToggleLayers.kt → maplibrary/src/main/java/com/sd/api/core/basic/amap/AmapToggleLayers.kt

-package com.sd.maplibrary.core.basic.amap
+package com.sd.api.core.basic.amap
 
 import com.amap.api.maps.AMap
-import com.sd.maplibrary.core.MapReadyView
+import com.sd.api.core.MapReadyView
 
 /**
  *高德切换底图图层

maplibrary/src/main/java/com/sd/maplibrary/core/basic/mine/MimeGestures.kt → maplibrary/src/main/java/com/sd/api/core/basic/mine/MimeGestures.kt

-package com.sd.maplibrary.core.basic.mine
+package com.sd.api.core.basic.mine
 
 
-import com.sd.maplibrary.core.MapReadyView
+import com.sd.api.core.MapReadyView
 
 /**
  * 四维手势交互

maplibrary/src/main/java/com/sd/maplibrary/core/basic/mine/MineDrawInMap.kt → maplibrary/src/main/java/com/sd/api/core/basic/mine/MineDrawInMap.kt

-package com.sd.maplibrary.core.basic.mine
+package com.sd.api.core.basic.mine
 
 import android.graphics.BitmapFactory
 import androidx.core.graphics.toColorInt
@@ -7,12 +7,12 @@ import com.minedata.minenavi.map.MarkerOptions
 import com.minedata.minenavi.map.PolygonOptions
 import com.minedata.minenavi.map.PolylineOptions
 import com.minedata.minenavi.mapdal.LatLng
-import com.sd.maplibrary.R
-import com.sd.maplibrary.UserCtx
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSMarker
-import com.sd.maplibrary.core.basic.MSOverlay
+import com.msmap.api.R
+import com.sd.api.UserCtx
+import com.sd.api.bean.MSLatLng
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSMarker
+import com.sd.api.core.basic.MSOverlay
 
 
 /**

maplibrary/src/main/java/com/sd/maplibrary/core/basic/mine/MineGpsLocation.kt → maplibrary/src/main/java/com/sd/api/core/basic/mine/MineGpsLocation.kt

-package com.sd.maplibrary.core.basic.mine
+package com.sd.api.core.basic.mine
 
 import android.os.Bundle
 import com.minedata.minenavi.location.MineLocation
@@ -6,9 +6,9 @@ import com.minedata.minenavi.location.MineLocationListener
 import com.minedata.minenavi.location.MineLocationManager
 import com.minedata.minenavi.location.MineLocationOptions
 import com.minedata.minenavi.mapdal.CoordType
-import com.sd.maplibrary.UserCtx
-import com.sd.maplibrary.bean.MSLocBean
-import com.sd.maplibrary.core.basic.OnMsGpsLoc
+import com.sd.api.UserCtx
+import com.sd.api.bean.MSLocBean
+import com.sd.api.core.basic.OnMsGpsLoc
 
 /**GPS定位类*/
 object MineGpsLocation {

maplibrary/src/main/java/com/sd/maplibrary/core/basic/mine/MineLocationStyle.kt → maplibrary/src/main/java/com/sd/api/core/basic/mine/MineLocationStyle.kt

-package com.sd.maplibrary.core.basic.mine
+package com.sd.api.core.basic.mine
 
 import com.minedata.minenavi.map.MyLocationStyle
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSLocStyle
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSLocStyle
 
 
 /**

maplibrary/src/main/java/com/sd/maplibrary/core/basic/mine/MineMethodAdv.kt → maplibrary/src/main/java/com/sd/api/core/basic/mine/MineMethodAdv.kt

-package com.sd.maplibrary.core.basic.mine
+package com.sd.api.core.basic.mine
 
 import com.minedata.minenavi.mapdal.LatLng
 import com.minedata.minenavi.util.Tools
-import com.sd.maplibrary.core.MapReadyView
+import com.sd.api.core.MapReadyView
 
 
 /**

maplibrary/src/main/java/com/sd/maplibrary/core/basic/mine/MineNai.kt → maplibrary/src/main/java/com/sd/api/core/basic/mine/MineNai.kt

-package com.sd.maplibrary.core.basic.mine
+package com.sd.api.core.basic.mine
 
 import android.content.Intent
 import android.graphics.Point
@@ -18,13 +18,13 @@ import com.minedata.minenavi.navi.RouteExplorer
 import com.minedata.minenavi.navi.SmoothNaviData
 import com.minedata.minenavi.navi.TmcSections
 import com.minedata.minenavi.util.Tools
-import com.sd.maplibrary.UserCtx
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.bean.WayPoi
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.intfaces.MyMineNaviListener
-import com.sd.maplibrary.intfaces.OnNaviPresenterListener
-import com.sd.maplibrary.ui.MineNaiDirActivity
+import com.sd.api.UserCtx
+import com.sd.api.bean.MSLatLng
+import com.sd.api.bean.WayPoi
+import com.sd.api.core.MapReadyView
+import com.sd.api.intfaces.MyMineNaviListener
+import com.sd.api.intfaces.OnNaviPresenterListener
+import com.sd.api.ui.MineNaiDirActivity
 
 /**
  * 四维导航
@@ -58,7 +58,7 @@ object MineNai {
     /**
      * 开启四维导航 客户端自实现数据回调
      */
-    fun startNavi(mapReadView: MapReadyView?) {
+    fun startNavi(mapReadView: MapReadyView?,onNaviPresenterListener:OnNaviPresenterListener?) {
         mNaviSession?.addMineNaviListener(myMineNaviListener)
         var mRouteBas = MineRoutePlans.mRouteBase
         if (mRouteBas != null) {

maplibrary/src/main/java/com/sd/maplibrary/core/basic/mine/MineNaiParams.kt → maplibrary/src/main/java/com/sd/api/core/basic/mine/MineNaiParams.kt

-package com.sd.maplibrary.core.basic.mine
+package com.sd.api.core.basic.mine
 
 import android.os.Parcelable
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.bean.WayPoi
+import com.sd.api.bean.MSLatLng
+import com.sd.api.bean.WayPoi
 import kotlinx.parcelize.Parcelize
 
 

maplibrary/src/main/java/com/sd/maplibrary/core/basic/mine/MinePoiSearch.kt → maplibrary/src/main/java/com/sd/api/core/basic/mine/MinePoiSearch.kt

-package com.sd.maplibrary.core.basic.mine
+package com.sd.api.core.basic.mine
 
 import com.minedata.minenavi.mapdal.PoiItem
 import com.minedata.minenavi.poiquery.LatLonPoint
@@ -6,9 +6,9 @@ import com.minedata.minenavi.poiquery.PoiResult
 import com.minedata.minenavi.poiquery.PoiSearch
 import com.minedata.minenavi.poiquery.SearchErrorCode
 import com.minedata.minenavi.poiquery.SortType
-import com.sd.maplibrary.UserCtx
-import com.sd.maplibrary.bean.PoiSearchRes
-import com.sd.maplibrary.core.basic.OnMSPoiSearchLis
+import com.sd.api.UserCtx
+import com.sd.api.bean.PoiSearchRes
+import com.sd.api.core.basic.OnMSPoiSearchLis
 
 /**
  * 四维Poi搜索相关

maplibrary/src/main/java/com/sd/maplibrary/core/basic/mine/MineRoutePlans.kt → maplibrary/src/main/java/com/sd/api/core/basic/mine/MineRoutePlans.kt

-package com.sd.maplibrary.core.basic.mine
+package com.sd.api.core.basic.mine
 
 import android.graphics.Point
 import android.graphics.Rect
@@ -13,13 +13,13 @@ import com.minedata.minenavi.navi.RouteCollection
 import com.minedata.minenavi.navi.RoutePlan
 import com.minedata.minenavi.navi.RouterErrorInfo
 import com.minedata.minenavi.util.Tools
-import com.sd.maplibrary.bean.DriverRouteBean
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.bean.WayPoi
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.OnDriveRoute
-import com.sd.maplibrary.intfaces.MyMineNaviListener
-import com.sd.maplibrary.utils.DisplayUtil
+import com.sd.api.bean.DriverRouteBean
+import com.sd.api.bean.MSLatLng
+import com.sd.api.bean.WayPoi
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.OnDriveRoute
+import com.sd.api.intfaces.MyMineNaviListener
+import com.sd.api.utils.DisplayUtil
 
 
 /**四维路劲规划*/

maplibrary/src/main/java/com/sd/maplibrary/core/basic/mine/MineToggleLayers.kt → maplibrary/src/main/java/com/sd/api/core/basic/mine/MineToggleLayers.kt

-package com.sd.maplibrary.core.basic.mine
+package com.sd.api.core.basic.mine
 
 import com.minedata.minenavi.map.MineMap
 import com.minedata.minenavi.mapdal.CoordType
 
-import com.sd.maplibrary.core.MapReadyView
+import com.sd.api.core.MapReadyView
 
 /**
  *四维切换底图图层

maplibrary/src/main/java/com/sd/maplibrary/factorys/AbsMapCore.kt → maplibrary/src/main/java/com/sd/api/factorys/AbsMapCore.kt

-package com.sd.maplibrary.factorys
-
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.bean.WayPoi
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSMarker
-import com.sd.maplibrary.core.basic.MSOverlay
-import com.sd.maplibrary.core.basic.OnDriveRoute
-import com.sd.maplibrary.core.basic.OnMSPoiSearchLis
-import com.sd.maplibrary.core.basic.OnMsGpsLoc
+package com.sd.api.factorys
+
+import com.sd.api.bean.MSLatLng
+import com.sd.api.bean.WayPoi
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSMarker
+import com.sd.api.core.basic.MSOverlay
+import com.sd.api.core.basic.OnDriveRoute
+import com.sd.api.core.basic.OnMSPoiSearchLis
+import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.intfaces.OnNaviPresenterListener
 
 /**接口实现抽象**/
 abstract class AbsMapCore : IMapBasic, IMapBusin {
@@ -149,9 +150,10 @@ abstract class AbsMapCore : IMapBasic, IMapBusin {
         startName: String,
         endPoint: MSLatLng,
         endName: String,
-        ways: List<WayPoi>
+        ways: List<WayPoi>,
+        onNaviPresenterListener:OnNaviPresenterListener?
     ) {
-        iMapBasic.startNavi(mapReadView, navType, starPoint, startName, endPoint, endName, ways)
+        iMapBasic.startNavi(mapReadView, navType, starPoint, startName, endPoint, endName, ways,onNaviPresenterListener)
     }
 
 

maplibrary/src/main/java/com/sd/maplibrary/factorys/AmapBasic.kt → maplibrary/src/main/java/com/sd/api/factorys/AmapBasic.kt

-package com.sd.maplibrary.factorys
-
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.bean.WayPoi
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSMarker
-import com.sd.maplibrary.core.basic.MSOverlay
-import com.sd.maplibrary.core.basic.OnDriveRoute
-import com.sd.maplibrary.core.basic.OnMSPoiSearchLis
-import com.sd.maplibrary.core.basic.OnMsGpsLoc
-import com.sd.maplibrary.core.basic.amap.AmapDrawInMap
-import com.sd.maplibrary.core.basic.amap.AmapGestures
-import com.sd.maplibrary.core.basic.amap.AmapGpsLocation
-import com.sd.maplibrary.core.basic.amap.AmapLocationStyle
-import com.sd.maplibrary.core.basic.amap.AmapMethodAdv
-import com.sd.maplibrary.core.basic.amap.AmapNai
-import com.sd.maplibrary.core.basic.amap.AmapPoiSearch
-import com.sd.maplibrary.core.basic.amap.AmapRoutePlans
-import com.sd.maplibrary.core.basic.amap.AmapToggleLayers
+package com.sd.api.factorys
+
+import com.sd.api.bean.MSLatLng
+import com.sd.api.bean.WayPoi
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSMarker
+import com.sd.api.core.basic.MSOverlay
+import com.sd.api.core.basic.OnDriveRoute
+import com.sd.api.core.basic.OnMSPoiSearchLis
+import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.core.basic.amap.AmapDrawInMap
+import com.sd.api.core.basic.amap.AmapGestures
+import com.sd.api.core.basic.amap.AmapGpsLocation
+import com.sd.api.core.basic.amap.AmapLocationStyle
+import com.sd.api.core.basic.amap.AmapMethodAdv
+import com.sd.api.core.basic.amap.AmapNai
+import com.sd.api.core.basic.amap.AmapPoiSearch
+import com.sd.api.core.basic.amap.AmapRoutePlans
+import com.sd.api.core.basic.amap.AmapToggleLayers
+import com.sd.api.intfaces.OnNaviPresenterListener
 
 /**
  * 高德基础实现
@@ -174,7 +175,8 @@ class AmapBasic : IMapBasic {
         startName: String,
         endPoint: MSLatLng,
         endName: String,
-        ways: List<WayPoi>
+        ways: List<WayPoi>,
+        onNaviPresenterListener:OnNaviPresenterListener?
     ) {
         if (navType == 1) {
 //            throw NoSuchMethodException("高德导航暂不支持自己实现回调")