拆包

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

@@ -11,7 +11,7 @@ import com.sd.api.UserCtx
 import com.sd.api.bean.DriverRouteBean
 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.core.basic.OnDriveRoute
 import com.sd.api.intfaces.MyAMapNaviListener
 import com.amap.api.maps.model.LatLng as ALatLng

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

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

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

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

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

@@ -10,7 +10,7 @@ import com.minedata.minenavi.mapdal.LatLng
 import com.msmap.api.R
 import com.sd.api.UserCtx
 import com.sd.api.maps.cdata.MSLatLng
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.cdata.MSMarker
 import com.sd.api.maps.cdata.MSOverlay
 

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

@@ -21,7 +21,7 @@ import com.minedata.minenavi.util.Tools
 import com.sd.api.UserCtx
 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.intfaces.MyMineNaviListener
 import com.sd.api.intfaces.OnNaviPresenterListener
 import com.sd.api.ui.MineNaiDirActivity

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

@@ -16,7 +16,7 @@ import com.minedata.minenavi.util.Tools
 import com.sd.api.bean.DriverRouteBean
 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.core.basic.OnDriveRoute
 import com.sd.api.intfaces.MyMineNaviListener
 import com.sd.api.utils.DisplayUtil

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

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

mapapi/src/main/java/com/sd/api/factorys/AbsMapCore.kt

@@ -2,12 +2,12 @@ package com.sd.api.factorys
 
 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.maps.cdata.MSMarker
 import com.sd.api.maps.cdata.MSOverlay
 import com.sd.api.core.basic.OnDriveRoute
 import com.sd.api.maps.inters.OnMSPoiSearchLis
-import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.location.OnMsGpsLoc
 import com.sd.api.intfaces.OnNaviPresenterListener
 
 /**接口实现抽象**/

mapapi/src/main/java/com/sd/api/factorys/AmapBasic.kt

@@ -2,12 +2,12 @@ package com.sd.api.factorys
 
 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.maps.cdata.MSMarker
 import com.sd.api.maps.cdata.MSOverlay
 import com.sd.api.core.basic.OnDriveRoute
 import com.sd.api.maps.inters.OnMSPoiSearchLis
-import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.location.OnMsGpsLoc
 import com.sd.api.maps.amap.AmapDrawInMap
 import com.sd.api.maps.amap.AmapGestures
 import com.sd.api.core.basic.amap.AmapGpsLocation

mapapi/src/main/java/com/sd/api/factorys/IMapBasic.kt

@@ -3,13 +3,13 @@ package com.sd.api.factorys
 import androidx.core.graphics.toColorInt
 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.maps.MSLocStyle
 import com.sd.api.maps.cdata.MSMarker
 import com.sd.api.maps.cdata.MSOverlay
 import com.sd.api.core.basic.OnDriveRoute
 import com.sd.api.maps.inters.OnMSPoiSearchLis
-import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.location.OnMsGpsLoc
 import com.sd.api.intfaces.OnNaviPresenterListener
 
 /**

mapapi/src/main/java/com/sd/api/factorys/MineBasic.kt

@@ -2,15 +2,15 @@ package com.sd.api.factorys
 
 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.maps.cdata.MSMarker
 import com.sd.api.maps.cdata.MSOverlay
 import com.sd.api.core.basic.OnDriveRoute
 import com.sd.api.maps.inters.OnMSPoiSearchLis
-import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.location.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.location.MineGpsLocation
 import com.sd.api.maps.mine.MineLocationStyle
 import com.sd.api.maps.mine.MineMethodAdv
 import com.sd.api.core.basic.mine.MineNai

mapapi/src/main/java/com/sd/api/fragments/AMapFragment.kt

@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.amap.api.maps.AMap
 import com.msmap.api.databinding.FragmentAMapBinding
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
 
 

mapapi/src/main/java/com/sd/api/fragments/ForeMapFragment.kt

@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.minedata.minenavi.map.MineMap
 import com.msmap.api.databinding.FragmentForeMapBinding
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.ui.MapMultiView.OnMapReadyLis
 
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER

mapapi/src/main/java/com/sd/api/bean/MSLocBean.kt → mapapi/src/main/java/com/sd/api/location/MSLocBean.kt

-package com.sd.api.bean
+package com.sd.api.location
 
 /**定位数据回调*/
 class MSLocBean {

mapapi/src/main/java/com/sd/api/location/MSLocation.kt

+package com.sd.api.location
+
+import com.sd.api.MAP_TYPE
+import com.sd.api.MSDKInitializer
+import com.sd.api.core.basic.amap.AmapGpsLocation
+
+/**
+ * 定位类
+ */
+object MSLocation {
+
+    /**
+     * 开启定位
+     * 设置GPS定位回调监听器
+     * @param onMsGpsLoc GPS定位回调监听器实例
+     */
+    fun startLoc(onMsGpsLoc: OnMsGpsLoc){
+        when (MSDKInitializer.getMapType()) {
+            MAP_TYPE.MINE -> {
+                MineGpsLocation.starLoc(onMsGpsLoc)
+            }
+
+            MAP_TYPE.AMAP -> {
+                AmapGpsLocation.instance.starLoc(onMsGpsLoc)
+            }
+        }
+    }
+
+    /**停止定位*/
+    fun stopLoc(){
+        when (MSDKInitializer.getMapType()) {
+            MAP_TYPE.MINE -> {
+                MineGpsLocation.stopLoc()
+            }
+
+            MAP_TYPE.AMAP -> {
+                AmapGpsLocation.instance.stopLoc()
+            }
+        }
+    }
+
+    /**清理定位资源**/
+    fun cleansLoc(){
+        when (MSDKInitializer.getMapType()) {
+            MAP_TYPE.MINE -> {
+                MineGpsLocation.cleansLoc()
+            }
+
+            MAP_TYPE.AMAP -> {
+                AmapGpsLocation.instance.cleansLoc()
+            }
+        }
+    }
+}
\ No newline at end of file

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

-package com.sd.api.core.basic.mine
+package com.sd.api.location
 
 import android.os.Bundle
 import com.minedata.minenavi.location.MineLocation
@@ -7,8 +7,7 @@ import com.minedata.minenavi.location.MineLocationManager
 import com.minedata.minenavi.location.MineLocationOptions
 import com.minedata.minenavi.mapdal.CoordType
 import com.sd.api.UserCtx
-import com.sd.api.bean.MSLocBean
-import com.sd.api.core.basic.OnMsGpsLoc
+import com.sd.api.location.MSLocBean
 
 /**GPS定位类*/
 object MineGpsLocation {
@@ -30,7 +29,7 @@ object MineGpsLocation {
 
     /**初始化定位*/
     private fun initLoc() {
-        var context = UserCtx.instance.mContext
+        var context = UserCtx.Companion.instance.mContext
         MineLocationManager.getInstance()
             .init(context, MineLocationManager.LocationSource.gpsAndNetwork)
 //                MineLocationManager.getInstance().removeListener(mineLocationListener)
@@ -64,7 +63,7 @@ object MineGpsLocation {
 
         override fun onLocationChanged(location: MineLocation?) {
 //            println("-------四维定位改变 = ${location?.latitude}   curLng=${location?.longitude}  speed=${location?.speed}")
-            var loc = MSLocBean.instance.apply {
+            var loc = MSLocBean.Companion.instance.apply {
                 lat = location?.latitude ?: 0.0
                 lng = location?.longitude ?: 0.0
                 speed = location?.speed ?: 0f

mapapi/src/main/java/com/sd/api/core/basic/OnMsGpsLoc.kt → mapapi/src/main/java/com/sd/api/location/OnMsGpsLoc.kt

-package com.sd.api.core.basic
+package com.sd.api.location
 
-import com.sd.api.bean.MSLocBean
+import com.sd.api.location.MSLocBean
 
 /**业务层Gps定位回调接口**/
 interface OnMsGpsLoc {

mapapi/src/main/java/com/sd/api/maps/DelDrawInMap.kt

@@ -2,7 +2,7 @@ package com.sd.api.maps
 
 import com.sd.api.MAP_TYPE
 import com.sd.api.MSDKInitializer
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.cdata.MSOverlay
 import com.sd.api.maps.cdata.MSMarker
 

mapapi/src/main/java/com/sd/api/maps/DrawInMap.kt

@@ -3,7 +3,7 @@ package com.sd.api.maps
 import androidx.core.graphics.toColorInt
 import com.sd.api.MAP_TYPE
 import com.sd.api.MSDKInitializer
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.cdata.MSOverlay
 import com.sd.api.core.basic.mine.MineDrawInMap
 import com.sd.api.maps.amap.AmapDrawInMap

mapapi/src/main/java/com/sd/api/maps/Gestures.kt

@@ -2,7 +2,7 @@ package com.sd.api.maps
 
 import com.sd.api.MAP_TYPE
 import com.sd.api.MSDKInitializer
-import com.sd.api.core.MapReadyView
+import com.sd.api.ui.MapReadyView
 import com.sd.api.maps.amap.AmapGestures
 import com.sd.api.maps.mine.MineGestures