修改包名

app/build.gradle.kts

@@ -5,11 +5,10 @@ plugins {
 }
 
 android {
-    namespace = "com.sd.mapmultiengine"
+    namespace = "com.sd.demo"
     compileSdk = 35
 
     defaultConfig {
-        applicationId = "com.sd.mapmultiengine"
         minSdk = 29
 //        targetSdk = 35
         versionCode = 1

app/src/androidTest/java/com/sd/mapmultiengine/ExampleInstrumentedTest.kt → app/src/androidTest/java/com/sd/demo/ExampleInstrumentedTest.kt

-package com.sd.mapmultiengine
+package com.sd.demo
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

app/src/main/AndroidManifest.xml

@@ -85,7 +85,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".TextMainActivity" />
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/sd/mapmultiengine/LayerManage.java → app/src/main/java/com/sd/demo/LayerManage.java

-package com.sd.mapmultiengine;
+package com.sd.demo;
 
 import android.content.Context;
 

app/src/main/java/com/sd/mapmultiengine/MainActivity.kt → app/src/main/java/com/sd/demo/MainActivity.kt

-package com.sd.mapmultiengine
+package com.sd.demo
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.MAP_TYPE
-import com.sd.maplibrary.MSDKInitializer
-import com.sd.maplibrary.OnSdkInitCb
-import com.sd.mapmultiengine.adapter.DemoListAdapter
-import com.sd.mapmultiengine.databinding.ActivityMainBinding
-import com.sd.mapmultiengine.ui.CalculateDistanceActivity
-import com.sd.mapmultiengine.ui.ChangeMapCenterAct
-import com.sd.mapmultiengine.ui.DisplayMapActivity
-import com.sd.mapmultiengine.ui.GestureDemo
-import com.sd.mapmultiengine.ui.ShowMyLocLandian
-import com.sd.mapmultiengine.ui.TCircelActivity
-import com.sd.mapmultiengine.ui.TDriveRouteActivity
-import com.sd.mapmultiengine.ui.TGpsActivity
-import com.sd.mapmultiengine.ui.THighMapActivity
-import com.sd.mapmultiengine.ui.TLayersActivity
-import com.sd.mapmultiengine.ui.TLineActivity
-import com.sd.mapmultiengine.ui.TMarkerActivity
-import com.sd.mapmultiengine.ui.TPoiSearchActivity
-import com.sd.mapmultiengine.ui.TPolygonActivity
-import com.sd.mapmultiengine.ui.TReGeocodeActivity
+import com.sd.api.MAP_TYPE
+import com.sd.api.MSDKInitializer
+import com.sd.api.OnSdkInitCb
+import com.sd.demo.adapter.DemoListAdapter
+import com.sd.demo.databinding.ActivityMainBinding
+import com.sd.demo.ui.CalculateDistanceActivity
+import com.sd.demo.ui.ChangeMapCenterAct
+import com.sd.demo.ui.DisplayMapActivity
+import com.sd.demo.ui.GestureDemo
+import com.sd.demo.ui.ShowMyLocLandian
+import com.sd.demo.ui.TCircelActivity
+import com.sd.demo.ui.TDriveRouteActivity
+import com.sd.demo.ui.TGpsActivity
+import com.sd.demo.ui.THighMapActivity
+import com.sd.demo.ui.TLayersActivity
+import com.sd.demo.ui.TLineActivity
+import com.sd.demo.ui.TMarkerActivity
+import com.sd.demo.ui.TPoiSearchActivity
+import com.sd.demo.ui.TPolygonActivity
+import com.sd.demo.ui.TReGeocodeActivity
 
 
 /**

app/src/main/java/com/sd/mapmultiengine/adapter/DemoListAdapter.kt → app/src/main/java/com/sd/demo/adapter/DemoListAdapter.kt

-package com.sd.mapmultiengine.adapter
+package com.sd.demo.adapter
 
 import android.content.Context
 import android.view.ViewGroup
 import android.widget.TextView
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
-import com.sd.mapmultiengine.MainActivity.DemoDetails
-import com.sd.mapmultiengine.R
+import com.sd.demo.MainActivity.DemoDetails
+import com.sd.demo.R
+
 
 class DemoListAdapter : BaseQuickAdapter<DemoDetails, QuickViewHolder>() {
 

app/src/main/java/com/sd/mapmultiengine/adapter/PoiAdapter.kt → app/src/main/java/com/sd/demo/adapter/PoiAdapter.kt

-package com.sd.mapmultiengine.adapter
+package com.sd.demo.adapter
 
 //import kotlinx.android.synthetic.main.poi_search_list_item.view.*
 import android.content.Context
@@ -11,10 +11,10 @@ import androidx.core.text.set
 import androidx.recyclerview.widget.RecyclerView
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.minedata.minenavi.addons.DistanceBean
-import com.sd.maplibrary.bean.PoiSearchRes
+import com.sd.api.bean.PoiSearchRes
 
-import com.sd.mapmultiengine.databinding.PoiSearchListItemBinding
-import com.sd.mapmultiengine.utils.MyGeoTools
+import com.sd.demo.utils.MyGeoTools
+import com.sd.demo.databinding.PoiSearchListItemBinding
 
 
 class PoiAdapter  : BaseQuickAdapter<PoiSearchRes, PoiAdapter.PoiSH>() {

app/src/main/java/com/sd/mapmultiengine/bean/MyLocBean.kt → app/src/main/java/com/sd/demo/bean/MyLocBean.kt

-package com.sd.mapmultiengine.bean
+package com.sd.demo.bean
 
 class MyLocBean {
     //    返回逆地理编码结果所在区（县）的编码。

app/src/main/java/com/sd/mapmultiengine/ui/AMapWmsActivity.kt → app/src/main/java/com/sd/demo/ui/AMapWmsActivity.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.amap.api.maps.AMap
-import com.sd.mapmultiengine.LayerManage
-import com.sd.mapmultiengine.R
-import com.sd.mapmultiengine.databinding.ActivityAmapWmsBinding
+import com.sd.demo.LayerManage
+import com.sd.demo.databinding.ActivityAmapWmsBinding
 
 
 class AMapWmsActivity : AppCompatActivity() {
@@ -33,11 +30,6 @@ var url: String =
         setContentView(binding.root)
         binding.mapView.onCreate(savedInstanceState)
 
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-            insets
-        }
         aMap = binding.mapView.map
 
         layerManage = LayerManage(this, aMap)

app/src/main/java/com/sd/mapmultiengine/ui/CalculateDistanceActivity.kt → app/src/main/java/com/sd/demo/ui/CalculateDistanceActivity.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.core.basic.MSCalcuMapUtil
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.databinding.ActivityCalculateDistanceBinding
-import com.sd.mapmultiengine.utils.ToastHelper
+import com.sd.api.bean.MSLatLng
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSCalcuMapUtil
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.utils.ToastHelper
+import com.sd.demo.databinding.ActivityCalculateDistanceBinding
 
 /****两点间距离计算***/
 class CalculateDistanceActivity : AppCompatActivity() {

app/src/main/java/com/sd/mapmultiengine/ui/ChangeMapCenterAct.kt → app/src/main/java/com/sd/demo/ui/ChangeMapCenterAct.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.R
-import com.sd.mapmultiengine.databinding.ActivityChangeMapCenterBinding
-import com.sd.mapmultiengine.databinding.ActivityGestureDemoBinding
-import com.sd.mapmultiengine.ui.GestureDemo
+import com.sd.api.core.MapReadyView
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityChangeMapCenterBinding
 
 /***改变地图中心点**/
 class ChangeMapCenterAct : AppCompatActivity() {

app/src/main/java/com/sd/mapmultiengine/ui/DisplayMapActivity.kt → app/src/main/java/com/sd/demo/ui/DisplayMapActivity.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.databinding.ActivityDisplayMapBinding
+import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityDisplayMapBinding
 
 /***展示地图***/
 class DisplayMapActivity : AppCompatActivity() {

app/src/main/java/com/sd/mapmultiengine/ui/GestureDemo.kt → app/src/main/java/com/sd/demo/ui/GestureDemo.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.TextMainActivity
-import com.sd.mapmultiengine.databinding.ActivityGestureDemoBinding
+import com.sd.api.core.MapReadyView
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityGestureDemoBinding
 
 /****手势控制***/
 class GestureDemo : AppCompatActivity() {

app/src/main/java/com/sd/mapmultiengine/ui/ShowCarOnlineActivity.kt → app/src/main/java/com/sd/demo/ui/ShowCarOnlineActivity.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.bean.MSLocBean
-import com.sd.maplibrary.core.MShowMainCarModel
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.OnMsGpsLoc
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.databinding.ActivityShowCarOnlineBinding
+import com.sd.api.bean.MSLatLng
+import com.sd.api.bean.MSLocBean
+import com.sd.api.core.MShowMainCarModel
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityShowCarOnlineBinding
 
 /***在线地推显示小车***/
 class ShowCarOnlineActivity : AppCompatActivity() {

app/src/main/java/com/sd/mapmultiengine/ui/ShowMyLocLandian.kt → app/src/main/java/com/sd/demo/ui/ShowMyLocLandian.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.databinding.ActivityShowMyLocLandianBinding
-import com.sd.mapmultiengine.viewmodels.MapDemoVm
+import com.sd.api.core.MapReadyView
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityShowMyLocLandianBinding
+import com.sd.demo.viewmodels.MapDemoVm
 
 /***显示定位蓝点***/
 class ShowMyLocLandian : AppCompatActivity() {

app/src/main/java/com/sd/mapmultiengine/ui/TBaseActivity.kt → app/src/main/java/com/sd/demo/ui/TBaseActivity.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import com.sd.maplibrary.MAP_TYPE
-import com.sd.maplibrary.MSDKInitializer
-import com.sd.maplibrary.OnSdkInitCb
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.R
-import com.sd.mapmultiengine.TextMainActivity
+import com.sd.api.core.MapReadyView
 
 open class TBaseActivity : AppCompatActivity() {
 

app/src/main/java/com/sd/mapmultiengine/ui/TCircelActivity.kt → app/src/main/java/com/sd/demo/ui/TCircelActivity.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSDrawInMap
-import com.sd.maplibrary.core.basic.MSOverlay
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.databinding.ActivityTcircelBinding
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSDrawInMap
+import com.sd.api.core.basic.MSOverlay
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityTcircelBinding
 
 /***绘制圆形**/
 class TCircelActivity : AppCompatActivity() {

app/src/main/java/com/sd/mapmultiengine/ui/TDriveRouteActivity.kt → app/src/main/java/com/sd/demo/ui/TDriveRouteActivity.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 //import com.sd.maplibrary.core.MSRoutePlans
 //import com.sd.maplibrary.core.MSRoutePlans.OnDriveRoute
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-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.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.databinding.ActivityTdriveRouteBinding
+import com.minedata.minenavi.navi.GuidanceText
+import com.minedata.minenavi.navi.NaviProgressData
+import com.minedata.minenavi.navi.SmoothNaviData
+import com.minedata.minenavi.navi.TmcSections
+import com.sd.api.bean.MSLatLng
+import com.sd.api.bean.WayPoi
+import com.sd.api.core.MapReadyView
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.intfaces.OnNaviPresenterListener
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityTdriveRouteBinding
 
 
 /***驾车路径规划***/
-class TDriveRouteActivity : AppCompatActivity() {
+class TDriveRouteActivity : AppCompatActivity() ,OnNaviPresenterListener{
 
     private lateinit var binding: ActivityTdriveRouteBinding
 
@@ -69,16 +73,54 @@ class TDriveRouteActivity : AppCompatActivity() {
             val endPoint = MSLatLng(39.864311, 116.379311)
             // 终点名称
             val endName = "沈阳火车站"
+            //途经点
             var wayPoi = WayPoi(
                 passName = "鸟巢", passPoint = MSLatLng(39.99300, 116.39524)
             )
             var ways = listOf<WayPoi>(wayPoi)
 
-            mapCoreApi.startNavi(mapReadView, 2/*1=自己实现回调 2=直接调用导航组件*/, startPoint, "当前位置", endPoint, endName, ways)
+            mapCoreApi.startNavi(mapReadView, 2/*1=自己实现回调 2=直接调用导航组件*/, startPoint, "当前位置", endPoint, endName, ways,this)
         }
 
     }
 
+
+ /*   参考DEMO https://gitee.com/cennavi_sy/MineNaviDemo.git
+    中的 app/src/main/java/com/cennavi/minenavidemo/activity/navi/NaviActivity.java
+    和 app/src/main/java/com/cennavi/minenavidemo/presenter/NaviPresenter.java*/
+
+    //车位置发生改变
+    override fun onTracking(ratio: Float) {
+    }
+
+    //导航或者模拟导航时平滑跟踪
+    override fun onSmoothTracking(data: SmoothNaviData) {
+    }
+
+    //解析 naviProgressData 导航更新信息
+    override fun onDataUpdated(naviProgressData: NaviProgressData) {
+    }
+
+    //解析 tmcSections 路况(TMC) 信息条中的段信息
+    override fun onTiBarUpdated(tmcSections: TmcSections) {
+    }
+
+    //解析 guidanceText 引导文字信息
+    override fun onTextChanged(guidanceText: GuidanceText) {
+    }
+
+    //导航路口剩余距离
+    override fun onDistanceChanged(distance: Int) {
+    }
+
+    //导航路口剩余距离 目前是没有下一个引导点，距离路线距离10米，即为到达目的地。 有下一个引导点，下一个引导距此引导点距离在10米以内，到此引导距离在3米以内，也为到达目的地
+    override fun onArriveDestination() {
+    }
+
+    //导航结束
+    override fun onNaviEnded() {
+    }
+
     //算路结果回调
     /*    private var onDriveRoute = object : OnDriveRoute {
             override fun onDriverRoute(driverRouteBean: DriverRouteBean) {

app/src/main/java/com/sd/mapmultiengine/ui/TGpsActivity.kt → app/src/main/java/com/sd/demo/ui/TGpsActivity.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.bean.MSLocBean
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSMarker
-import com.sd.maplibrary.core.basic.OnMsGpsLoc
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.databinding.ActivityTgpsBinding
+import com.sd.api.bean.MSLocBean
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSMarker
+import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityTgpsBinding
 
 /***定位 ，展示我的位置***/
 class TGpsActivity : AppCompatActivity() {

app/src/main/java/com/sd/mapmultiengine/ui/THighMapActivity.kt → app/src/main/java/com/sd/demo/ui/THighMapActivity.kt

-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.R
-import com.sd.mapmultiengine.databinding.ActivityHighMapBinding
-import com.sd.mapmultiengine.databinding.ActivityTcircelBinding
-import com.sd.mapmultiengine.ui.TCircelActivity
+import com.sd.api.core.MapReadyView
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityHighMapBinding
 
 /**
  * T high map activity