拆包

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

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.sd.api.maps.cdata.MSLatLng
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.MSCalcuMapUtil
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
 import com.sd.demo.utils.ToastHelper

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

@@ -2,7 +2,7 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.MethodAdv
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityChangeMapCenterBinding

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

@@ -2,7 +2,7 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityDisplayMapBinding
 

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

@@ -2,7 +2,7 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.Gestures
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityGestureDemoBinding

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

@@ -4,10 +4,10 @@ import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import com.sd.api.maps.cdata.MSLatLng
-import com.sd.api.bean.MSLocBean
+import com.sd.api.location.MSLocBean
 import com.sd.api.core.MShowMainCarModel
-import com.sd.api.core.MapReadyView
-import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.ui.MapReadyView
+import com.sd.api.location.OnMsGpsLoc
 import com.sd.api.factorys.MapCoreApi
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityShowCarOnlineBinding

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

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.LocStyle
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityShowMyLocLandianBinding

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

@@ -2,7 +2,7 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 
 open class TBaseActivity : AppCompatActivity() {
 

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

@@ -2,7 +2,7 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.DelDrawInMap
 import com.sd.api.maps.cdata.MSOverlay
 import com.sd.api.maps.DrawInMap

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

@@ -10,7 +10,7 @@ import com.minedata.minenavi.navi.SmoothNaviData
 import com.minedata.minenavi.navi.TmcSections
 import com.sd.api.maps.cdata.MSLatLng
 import com.sd.api.bean.WayPoi
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.factorys.MapCoreApi
 import com.sd.api.intfaces.OnNaviPresenterListener
 import com.sd.api.ui.MapMultiView.OnMapReadyLis

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

@@ -2,12 +2,13 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.bean.MSLocBean
-import com.sd.api.core.MapReadyView
+import com.sd.api.location.MSLocBean
+import com.sd.api.location.MSLocation
+import com.sd.api.location.OnMsGpsLoc
+import com.sd.api.maps.DrawInMap
 import com.sd.api.maps.cdata.MSMarker
-import com.sd.api.core.basic.OnMsGpsLoc
-import com.sd.api.factorys.MapCoreApi
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.api.ui.MapReadyView
 import com.sd.demo.databinding.ActivityTgpsBinding
 
 /***定位 ，展示我的位置***/
@@ -22,7 +23,7 @@ class TGpsActivity : AppCompatActivity() {
     var lng = 0.0
 
     //获取接口功能实例
-    var mapCoreApi = MapCoreApi.mapCoreApi
+//    var mapCoreApi = MapCoreApi.mapCoreApi
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -40,7 +41,7 @@ class TGpsActivity : AppCompatActivity() {
         })
 
         //开启定位
-        mapCoreApi.startLoc(object : OnMsGpsLoc {
+        MSLocation.startLoc(object : OnMsGpsLoc {
             override fun onMsGpsLoc(mSLocBean: MSLocBean) {
                 println("---------mSLocBean = ${mSLocBean}")
                 lat = mSLocBean.lat
@@ -60,7 +61,7 @@ class TGpsActivity : AppCompatActivity() {
 
         //我的位置
         binding.bt1.setOnClickListener {
-            msMark = mapCoreApi.drawMarket(mapReadView, lat, lng)
+            msMark = DrawInMap.drawMarket(mapReadView, lat, lng)
 //            MSMethodAdv.setMapCenter(mapReadView, lat, lng)
         }
     }
@@ -68,14 +69,14 @@ class TGpsActivity : AppCompatActivity() {
     override fun onStop() {
         super.onStop()
         //停止定位
-        mapCoreApi.stopLoc()
+        MSLocation.stopLoc()
     }
 
 
     override fun onDestroy() {
         super.onDestroy()
         //清理资源
-        mapCoreApi.cleansLoc()
+        MSLocation.cleansLoc()
     }
 
 }
\ No newline at end of file

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

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.factorys.MapCoreApi
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityHighMapBinding
@@ -20,7 +20,7 @@ class THighMapActivity : AppCompatActivity() {
     var mapReadView: MapReadyView? = null
 
     //获取接口功能实例
-    var mapCoreApi = MapCoreApi.mapCoreApi
+//    var mapCoreApi = MapCoreApi.mapCoreApi
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/sd/demo/ui/TLayersActivity.kt

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.Layer
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
 import com.sd.demo.R

app/src/main/java/com/sd/demo/ui/TLineActivity.kt

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.sd.api.maps.cdata.MSLatLng
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.DelDrawInMap
 import com.sd.api.maps.cdata.MSOverlay
 import com.sd.api.maps.DrawInMap

app/src/main/java/com/sd/demo/ui/TMarkerActivity.kt

@@ -2,7 +2,7 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.DelDrawInMap
 import com.sd.api.maps.cdata.MSMarker
 import com.sd.api.maps.DrawInMap

app/src/main/java/com/sd/demo/ui/TPoiSearchActivity.kt

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.sd.api.maps.cdata.PoiSearchRes
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.inters.OnMSPoiSearchLis
 import com.sd.api.factorys.MapCoreApi
 import com.sd.api.maps.MSPoi

app/src/main/java/com/sd/demo/ui/TPolygonActivity.kt

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.sd.api.maps.cdata.MSLatLng
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.DelDrawInMap
 import com.sd.api.maps.cdata.MSOverlay
 import com.sd.api.maps.DrawInMap

app/src/main/java/com/sd/demo/ui/TReGeocodeActivity.kt

@@ -2,7 +2,7 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.api.bean.RegeocodeRes
+import com.sd.api.maps.cdata.RegeocodeRes
 import com.sd.api.maps.MSRegeoCode
 import com.sd.demo.databinding.ActivityTreGeocodeBinding
 

mapapi/src/main/java/com/sd/api/core/MSRoutePlans.kt

@@ -32,6 +32,7 @@ import com.sd.api.bean.WayPoi
 import com.sd.api.core.basic.OnDriveRoute
 import com.sd.api.intfaces.MyAMapNaviListener
 import com.sd.api.intfaces.MyMineNaviListener
+import com.sd.api.ui.MapReadyView
 import com.sd.api.utils.DisplayUtil
 import com.amap.api.maps.model.LatLng as ALatLng
 

mapapi/src/main/java/com/sd/api/core/MShowMainCarModel.kt

@@ -9,6 +9,7 @@ import com.minedata.minenavi.mapdal.LatLng
 import com.sd.api.MAP_TYPE
 import com.sd.api.MSDKInitializer
 import com.sd.api.maps.cdata.MSLatLng
+import com.sd.api.ui.MapReadyView
 import com.sd.api.utils.SmoothMoveUtils
 import com.sd.api.utils.FileIoUtils
 import kotlinx.coroutines.CoroutineScope

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

@@ -7,8 +7,8 @@ import com.amap.api.location.AMapLocationClientOption.AMapLocationMode
 import com.amap.api.location.AMapLocationClientOption.AMapLocationProtocol
 import com.amap.api.location.AMapLocationListener
 import com.sd.api.UserCtx
-import com.sd.api.bean.MSLocBean
-import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.location.MSLocBean
+import com.sd.api.location.OnMsGpsLoc
 
 /**GPS定位类*/
 class AmapGpsLocation {