修改包名

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

-package com.sd.maplibrary.factorys
+package com.sd.api.factorys
 
 import androidx.core.graphics.toColorInt
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.bean.WayPoi
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSLocStyle
-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.api.bean.MSLatLng
+import com.sd.api.bean.WayPoi
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSLocStyle
+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
 
 /**
  * 基础接口
@@ -206,14 +207,17 @@ interface IMapBasic {
      * @param endPoint 终点坐标
      * @param endName 终点名称
      * @param ways 途经点集合
+     * @param onNaviPresenterListener 四维导航监听回调
      */
     fun startNavi(
-        mapReadView: MapReadyView?, navType: Int,
+        mapReadView: MapReadyView?,
+        navType: Int,
         starPoint: MSLatLng,
         startName: String = "当前位置",
         endPoint: MSLatLng,
         endName: String = "",
-        ways: List<WayPoi>
+        ways: List<WayPoi>,
+        onNaviPresenterListener:OnNaviPresenterListener?
     )
 
 

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

-package com.sd.maplibrary.factorys
+package com.sd.api.factorys
 /**
  * 业务接口
  */

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

-package com.sd.maplibrary.factorys
+package com.sd.api.factorys
 
 interface IMapFactory {
 

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

-package com.sd.maplibrary.factorys
+package com.sd.api.factorys
 
 class MapCoreApi: AbsMapCore() {
 

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

-package com.sd.maplibrary.factorys
+package com.sd.api.factorys
 
-import com.sd.maplibrary.MAP_TYPE
-import com.sd.maplibrary.MSDKInitializer
+import com.sd.api.MAP_TYPE
+import com.sd.api.MSDKInitializer
 
 /**地图工厂**/
 internal object MapFactory {

maplibrary/src/main/java/com/sd/maplibrary/factorys/MineBasic.kt → maplibrary/src/main/java/com/sd/api/factorys/MineBasic.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.mine.MimeGestures
-import com.sd.maplibrary.core.basic.mine.MineDrawInMap
-import com.sd.maplibrary.core.basic.mine.MineGpsLocation
-import com.sd.maplibrary.core.basic.mine.MineLocationStyle
-import com.sd.maplibrary.core.basic.mine.MineMethodAdv
-import com.sd.maplibrary.core.basic.mine.MineNai
-import com.sd.maplibrary.core.basic.mine.MinePoiSearch
-import com.sd.maplibrary.core.basic.mine.MineRoutePlans
-import com.sd.maplibrary.core.basic.mine.MineToggleLayers
+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.mine.MimeGestures
+import com.sd.api.core.basic.mine.MineDrawInMap
+import com.sd.api.core.basic.mine.MineGpsLocation
+import com.sd.api.core.basic.mine.MineLocationStyle
+import com.sd.api.core.basic.mine.MineMethodAdv
+import com.sd.api.core.basic.mine.MineNai
+import com.sd.api.core.basic.mine.MinePoiSearch
+import com.sd.api.core.basic.mine.MineRoutePlans
+import com.sd.api.core.basic.mine.MineToggleLayers
+import com.sd.api.intfaces.OnNaviPresenterListener
 
 /**
  * 四维基础地图实现
@@ -175,10 +176,11 @@ class MineBasic : IMapBasic {
         startName: String,
         endPoint: MSLatLng,
         endName: String,
-        ways: List<WayPoi>
+        ways: List<WayPoi>,
+        onNaviPresenterListener:OnNaviPresenterListener?
     ) {
         if (navType == 1) {//用户自己实现接口
-            MineNai.startNavi(mapReadView)
+            MineNai.startNavi(mapReadView,onNaviPresenterListener)
         } else if (navType == 2) {//直接到写好的页面
             MineNai.startNaviDirect(starPoint, startName, endPoint, endName, ways)
         }

maplibrary/src/main/java/com/sd/maplibrary/fragments/AMapFragment.kt → maplibrary/src/main/java/com/sd/api/fragments/AMapFragment.kt

-package com.sd.maplibrary.fragments
+package com.sd.api.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,9 +6,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.amap.api.maps.AMap
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.databinding.FragmentAMapBinding
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
+import com.msmap.api.databinding.FragmentAMapBinding
+import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
 
 
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER

maplibrary/src/main/java/com/sd/maplibrary/fragments/ForeMapFragment.kt → maplibrary/src/main/java/com/sd/api/fragments/ForeMapFragment.kt

-package com.sd.maplibrary.fragments
+package com.sd.api.fragments
 
-import android.app.Activity
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import com.minedata.minenavi.map.MineMap
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.databinding.FragmentForeMapBinding
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
+import com.msmap.api.databinding.FragmentForeMapBinding
+import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
 
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
 //private const val ARG_PARAM1 = "param1"

maplibrary/src/main/java/com/sd/maplibrary/fragments/UnityFragment.kt → maplibrary/src/main/java/com/sd/api/fragments/UnityFragment.kt

-package com.ltzw.adasdriver.ui.fragment
+package com.sd.api.fragments
 
 import android.os.Bundle
 import android.util.Log
@@ -37,11 +37,13 @@ class UnityFragment : Fragment(), IUnityPlayerLifecycleEvents {
         mUnityPlayer.onStop()
     }
 
-//    override fun onDestroyView() {
-//        super.onDestroyView()
-//        mUnityPlayer.destroy()
-//    }
-
+    override fun onDestroyView() {
+        super.onDestroyView()
+        try {
+            mUnityPlayer.destroy()
+        } catch (e: Exception) {
+        }
+    }
 
 
     override fun onCreateView(

maplibrary/src/main/java/com/sd/maplibrary/intfaces/MyAMapNaviListener.kt → maplibrary/src/main/java/com/sd/api/intfaces/MyAMapNaviListener.kt

-package com.sd.maplibrary.intfaces
+package com.sd.api.intfaces
 
 import com.amap.api.navi.AMapNaviListener
 import com.amap.api.navi.model.AMapCalcRouteResult

maplibrary/src/main/java/com/sd/maplibrary/intfaces/MyMineNaviListener.kt → maplibrary/src/main/java/com/sd/api/intfaces/MyMineNaviListener.kt

-package com.sd.maplibrary.intfaces
+package com.sd.api.intfaces
 
 import com.minedata.minenavi.mapdal.PoiFavorite
 import com.minedata.minenavi.navi.ArrowInfo

maplibrary/src/main/java/com/sd/maplibrary/intfaces/OnComCan.kt → maplibrary/src/main/java/com/sd/api/intfaces/OnComCan.kt

-package com.sd.maplibrary.intfaces
+package com.sd.api.intfaces
 
 /***
  * 确定取消

maplibrary/src/main/java/com/sd/api/intfaces/OnMsNaviListener.kt

+package com.sd.api.intfaces
+
+interface OnMsNaviListener {
+    /**
+     * 四维 navi  listener
+     */
+    var onNaviPresenterListener:OnNaviPresenterListener
+}
\ No newline at end of file

maplibrary/src/main/java/com/sd/maplibrary/intfaces/OnNaviPresenterListener.kt → maplibrary/src/main/java/com/sd/api/intfaces/OnNaviPresenterListener.kt

-package com.sd.maplibrary.intfaces
+package com.sd.api.intfaces
 
 import com.minedata.minenavi.navi.GuidanceText
 import com.minedata.minenavi.navi.NaviProgressData
-import com.minedata.minenavi.navi.NaviSessionData
-import com.minedata.minenavi.navi.RouteBase
-import com.minedata.minenavi.navi.RouteDetailItem
 import com.minedata.minenavi.navi.SmoothNaviData
 import com.minedata.minenavi.navi.TmcSections
 
 /**
  * 四维导航监听回调
  */
+//四维的
 interface OnNaviPresenterListener {
 
+    /**
+     * 车位置发生改变
+     * @param ratio
+     */
     fun onTracking(ratio: Float)
 
+    /**
+     *导航或者模拟导航时平滑跟踪
+     */
     fun onSmoothTracking(data: SmoothNaviData)
 
+    /**
+     * 解析 naviProgressData 导航更新信息
+     */
     fun onDataUpdated(naviProgressData: NaviProgressData)
 
+    /**
+     *解析 tmcSections 路况(TMC)信息条中的段信息
+     */
     fun onTiBarUpdated(tmcSections: TmcSections)
 
+    /**
+     *解析 guidanceText 引导文字信息
+     */
     fun onTextChanged(guidanceText: GuidanceText)
 
+    /**
+     *导航路口剩余距离
+     */
     fun onDistanceChanged(distance: Int)
 
+    /**
+     *导航路口剩余距离
+     *  目前是没有下一个引导点，距离路线距离10米，即为到达目的地。 有下一个引导点，下一个引导距此引导点距离在10米以内，到此引导距离在3米以内，也为到达目的地。
+     */
     fun onArriveDestination()
 
+    /**
+     *导航结束
+     */
     fun onNaviEnded()
 }
\ No newline at end of file

maplibrary/src/main/java/com/sd/maplibrary/tests/AbsMap.kt → maplibrary/src/main/java/com/sd/api/tests/AbsMap.kt

-package com.sd.maplibrary.tests
+package com.sd.api.tests
 
 abstract class AbsMap : IMap{
 }
\ No newline at end of file

maplibrary/src/main/java/com/sd/maplibrary/tests/IMap.kt → maplibrary/src/main/java/com/sd/api/tests/IMap.kt

-package com.sd.maplibrary.tests
+package com.sd.api.tests
 
 interface IMap {
     fun getMap(): Int

maplibrary/src/main/java/com/sd/maplibrary/ui/ForeMapView.kt → maplibrary/src/main/java/com/sd/api/ui/ForeMapView.kt

-package com.sd.maplibrary.ui
+package com.sd.api.ui
 
 import android.content.Context
 import android.graphics.Rect

maplibrary/src/main/java/com/sd/maplibrary/ui/MapMultiView.kt → maplibrary/src/main/java/com/sd/api/ui/MapMultiView.kt

-package com.sd.maplibrary.ui
+package com.sd.api.ui
 
 import android.content.Context
 import android.util.AttributeSet
@@ -6,16 +6,14 @@ import android.view.LayoutInflater
 import android.widget.LinearLayout
 import androidx.core.content.withStyledAttributes
 import androidx.fragment.app.FragmentActivity
-import com.amap.api.maps.AMap
-import com.ltzw.adasdriver.ui.fragment.UnityFragment
-import com.minedata.minenavi.map.MineMap
-import com.sd.maplibrary.MAP_TYPE
-import com.sd.maplibrary.MSDKInitializer
-import com.sd.maplibrary.R
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.databinding.MultiViewBinding
-import com.sd.maplibrary.fragments.AMapFragment
-import com.sd.maplibrary.fragments.ForeMapFragment
+import com.msmap.api.R
+import com.msmap.api.databinding.MultiViewBinding
+import com.sd.api.MAP_TYPE
+import com.sd.api.MSDKInitializer
+import com.sd.api.core.MapReadyView
+import com.sd.api.fragments.AMapFragment
+import com.sd.api.fragments.ForeMapFragment
+import com.sd.api.fragments.UnityFragment
 
 /**多底图容器**/
 class MapMultiView : LinearLayout {

maplibrary/src/main/java/com/sd/maplibrary/ui/MineNaiDirActivity.kt → maplibrary/src/main/java/com/sd/api/ui/MineNaiDirActivity.kt

-package com.sd.maplibrary.ui
+package com.sd.api.ui
 
 import android.os.Bundle
 import android.view.KeyEvent
@@ -18,20 +18,20 @@ import com.minedata.minenavi.navi.TmcSections
 import com.minedata.minenavi.navi.TurnIconModel
 import com.minedata.minenavi.util.MineNaviUtil
 import com.minedata.minenavi.util.Tools
-import com.sd.maplibrary.R
-import com.sd.maplibrary.bean.DriverRouteBean
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.OnDriveRoute
-import com.sd.maplibrary.core.basic.mine.MineNai
-import com.sd.maplibrary.core.basic.mine.MineNaiParams
-import com.sd.maplibrary.core.basic.mine.MineRoutePlans
-import com.sd.maplibrary.databinding.ActivityMineNaiDirBinding
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.intfaces.OnComCan
-import com.sd.maplibrary.intfaces.OnNaviPresenterListener
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.maplibrary.ui.dialog.ExitNaiDialog
-import com.sd.maplibrary.utils.Utils
+import com.msmap.api.R
+import com.msmap.api.databinding.ActivityMineNaiDirBinding
+import com.sd.api.bean.DriverRouteBean
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.OnDriveRoute
+import com.sd.api.core.basic.mine.MineNai
+import com.sd.api.core.basic.mine.MineNaiParams
+import com.sd.api.core.basic.mine.MineRoutePlans
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.intfaces.OnComCan
+import com.sd.api.intfaces.OnNaviPresenterListener
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.api.ui.dialog.ExitNaiDialog
+import com.sd.api.utils.Utils
 
 /**
  * 直接开始导航
@@ -71,6 +71,8 @@ class MineNaiDirActivity : AppCompatActivity(), OnNaviPresenterListener {
         binding.mapMultiView.addMapRenderCallback(object : OnMapReadyLis {
             override fun onMapReady(mapReadyView: MapReadyView) {
                 this@MineNaiDirActivity.mapReadView = mapReadyView
+                //切换为2D平面图
+                mapReadyView.mMineMap?.elevation=0f
                 //算路成功以后启动导航
                 startPlan()
             }

maplibrary/src/main/java/com/sd/maplibrary/ui/dialog/ExitNaiDialog.kt → maplibrary/src/main/java/com/sd/api/ui/dialog/ExitNaiDialog.kt

-package com.sd.maplibrary.ui.dialog
+package com.sd.api.ui.dialog
 
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
-import com.sd.maplibrary.intfaces.OnComCan
+import com.sd.api.intfaces.OnComCan
 
 
 class ExitNaiDialog : DialogFragment() {