规范类命名

mapapi/src/main/java/com/cusc/map/map2d/DelDrawInMap.kt

 package com.cusc.map.map2d
 
 import com.cusc.map.map2d.cdata.MapOverlay
-import com.cusc.map.map2d.cdata.MarkerM
+import com.cusc.map.map2d.cdata.Marker
 
 /**
  * 删除地图上的绘制
@@ -217,7 +217,7 @@ object DelDrawInMap : MsOperationParent() {
      * @param mapReadView 地图准备就绪的视图对象，可能为null
      * @param mSMarker 要删除的标记点对象，可能为null
      */
-    fun deleteMarker(mSMarker: MarkerM?) {
+    fun deleteMarker(mSMarker: Marker?) {
         if (mSMarker == null)
             return
         var mapReadView = getMapReadView()
@@ -230,7 +230,7 @@ object DelDrawInMap : MsOperationParent() {
 
             MAP_TYPE.AMAP -> {
                 //移除指定的标记点
-                MarkerM.amaker?.remove()
+                Marker.amaker?.remove()
                 // 清空高德地图上所有已经标注的marker
 //            mapReadView?.aMap?.clear()
             }

mapapi/src/main/java/com/cusc/map/map2d/DrawInMap.kt

@@ -2,8 +2,8 @@ package com.cusc.map.map2d
 
 import androidx.core.graphics.toColorInt
 import com.cusc.map.map2d.amap.AmapDrawInMap
-import com.cusc.map.map2d.cdata.LatLngM
-import com.cusc.map.map2d.cdata.MarkerM
+import com.cusc.map.map2d.cdata.LatLng
+import com.cusc.map.map2d.cdata.Marker
 import com.cusc.map.map2d.cdata.MapOverlay
 import com.cusc.map.map2d.mine.MineDrawInMap
 
@@ -24,7 +24,7 @@ class PolylineOptions {
 
 
 /**绘制圆形选项**/
-class CircleOptionsM {
+class CircleOptions {
     /**半径（米）**/
     var radius = 100f
 
@@ -68,7 +68,7 @@ object DrawInMap : MsOperationParent() {
     fun drawMarket(
         lat: Double,
         lng: Double
-    ): MarkerM {
+    ): Marker {
         val mapReadView = getMapReadView()
         when (MapSdkInit.getMapType()) {
             MAP_TYPE.MINE -> {
@@ -88,7 +88,7 @@ object DrawInMap : MsOperationParent() {
      * @return MSOverlay 覆盖物对象
      */
     fun drawPolyline(
-        msLatLng: List<LatLngM>, msPolylineOptions: PolylineOptions
+        msLatLng: List<LatLng>, msPolylineOptions: PolylineOptions
     ): MapOverlay {
         val mapReadView = getMapReadView()
         when (MapSdkInit.getMapType()) {
@@ -113,8 +113,8 @@ object DrawInMap : MsOperationParent() {
      * @return MSOverlay 返回覆盖物对象
      */
     fun drawCircle(
-        center: LatLngM,
-        msCircleOptions: CircleOptionsM?
+        center: LatLng,
+        msCircleOptions: CircleOptions?
     ): MapOverlay {
         val mapReadView = getMapReadView()
         when (MapSdkInit.getMapType()) {
@@ -141,7 +141,7 @@ object DrawInMap : MsOperationParent() {
      * @param msPolygonOptions 多边形绘制选型
      */
     fun drawPolygon(
-        msLatLng: List<LatLngM>,
+        msLatLng: List<LatLng>,
         msPolygonOptions: PolygonOptions
     ): MapOverlay {
         val mapReadView = getMapReadView()

mapapi/src/main/java/com/cusc/map/map2d/MapSdkInit.kt

@@ -9,7 +9,7 @@ import com.minedata.minenavi.SDKInitializer
 import com.minedata.minenavi.SDKInitializer.InitListener
 import com.minedata.minenavi.map.MineMap
 import com.permissionx.guolindev.PermissionX
-import com.cusc.map.location.LocationM
+import com.cusc.map.location.LocateMap
 import com.cusc.map.ui.MapReadyView
 
 
@@ -102,8 +102,8 @@ object MapSdkInit {
             }
 
             MAP_TYPE.MINE -> {
-                LocationM.initLoc()
-                LocationM.startLoc(null)
+                LocateMap.initLoc()
+                LocateMap.startLoc(null)
                 SDKInitializer.debug(false)
 //                SDKInitializer.enableEtaLog(false)
 //                SDKInitializer.outputLog(false)

mapapi/src/main/java/com/cusc/map/map2d/Navigate.kt

@@ -3,7 +3,7 @@ package com.cusc.map.map2d
 import com.cusc.map.map2d.inters.OnNaviPresenterListener
 import com.cusc.map.map2d.amap.AmapNai
 import com.cusc.map.map2d.cdata.DriverRouteBean
-import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLng
 import com.cusc.map.map2d.cdata.WayPoi
 import com.cusc.map.map2d.mine.MineNai
 import com.cusc.map.ui.MapReadyView
@@ -39,9 +39,9 @@ object Navigate {
     fun startNavi(
         mapReadView: MapReadyView?,
         nType: Int,
-        starPoint: LatLngM,
+        starPoint: LatLng,
         startName: String,
-        endPoint: LatLngM,
+        endPoint: LatLng,
         endName: String,
         ways: List<WayPoi>,
         onNaviPresenterListener: OnNaviPresenterListener?
@@ -83,7 +83,7 @@ object Navigate {
 
     fun startSimNavi(
         mapReadView: MapReadyView?,
-        starPoint: LatLngM,
+        starPoint: LatLng,
         driverRouteBean: DriverRouteBean?,
         onNaviPresenterListener: OnNaviPresenterListener?
     ) {

mapapi/src/main/java/com/cusc/map/map2d/PathPlanning.kt

 package com.cusc.map.map2d
 
 import com.cusc.map.map2d.amap.AmapRoutePlans
-import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLng
 import com.cusc.map.map2d.cdata.WayPoi
 import com.cusc.map.map2d.inters.OnDriveRoute
 import com.cusc.map.map2d.mine.MineRoutePlans
@@ -20,9 +20,9 @@ object PathPlanning : MsOperationParent() {
      * @param onDriveRoute 路径规划结果回调
      */
     fun drivingPathPlanning(
-        starPoint: LatLngM,
+        starPoint: LatLng,
         startName: String = "当前位置",
-        endPoint: LatLngM,
+        endPoint: LatLng,
         endName: String = "",
         ways: List<WayPoi>,
         onDriveRoute: OnDriveRoute?

mapapi/src/main/java/com/cusc/map/map2d/PoiSearch.kt

 package com.cusc.map.map2d
 
 import com.cusc.map.map2d.amap.AmapPoiSearch
-import com.cusc.map.map2d.inters.OnMSPoiSearchLis
+import com.cusc.map.map2d.inters.OnPoiSearchLis
 import com.cusc.map.map2d.mine.MinePoiSearch
 
 /**
@@ -21,7 +21,7 @@ object PoiSearch {
         lat: Double,
         lng: Double,
         adCode: String,
-        onMSPoiSearchLis: OnMSPoiSearchLis
+        onMSPoiSearchLis: OnPoiSearchLis
     ){
         when (MapSdkInit.getMapType()) {
             MAP_TYPE.MINE -> {
@@ -47,7 +47,7 @@ object PoiSearch {
         lat: Double,
         lng: Double,
         radios: Int,
-        onMSPoiSearchLis: OnMSPoiSearchLis
+        onMSPoiSearchLis: OnPoiSearchLis
     ){
         when (MapSdkInit.getMapType()) {
             MAP_TYPE.MINE -> {

mapapi/src/main/java/com/cusc/map/map2d/amap/AmapDrawInMap.kt

@@ -3,20 +3,18 @@ package com.cusc.map.map2d.amap
 import android.graphics.BitmapFactory
 import androidx.core.graphics.toColorInt
 import com.amap.api.maps.model.BitmapDescriptorFactory
-import com.amap.api.maps.model.CircleOptions
-import com.amap.api.maps.model.LatLng
+import com.amap.api.maps.model.CircleOptions as ACircleOptions
+import com.amap.api.maps.model.LatLng as ALatLng
 import com.amap.api.maps.model.MarkerOptions
 import com.amap.api.maps.model.PolygonOptions as APolygonOptions
 import com.amap.api.maps.model.PolylineOptions as APolylineOptions
 import com.cusc.map.R
 import com.cusc.map.map2d.UserCtx
-import com.cusc.map.map2d.CircleOptionsM
-import com.cusc.map.map2d.PolygonOptions
-import com.cusc.map.map2d.PolylineOptions
-import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.CircleOptions
+import com.cusc.map.map2d.cdata.LatLng
 import com.cusc.map.ui.MapReadyView
 import com.cusc.map.map2d.cdata.MapOverlay
-import com.cusc.map.map2d.cdata.MarkerM
+import com.cusc.map.map2d.cdata.Marker
 
 /**
  * 在地图上绘制
@@ -35,11 +33,11 @@ object AmapDrawInMap {
         mapReadView: MapReadyView?,
         lat: Double,
         lng: Double
-    ): MarkerM {
+    ): Marker {
         var context = UserCtx.Companion.instance.mContext
 
         // 处理高德地图类型的标记点绘制
-        val aLatLng = LatLng(lat, lng)
+        val aLatLng = ALatLng(lat, lng)
         val aMarkerOption = MarkerOptions().apply {
             position(aLatLng)
             icon(
@@ -50,8 +48,8 @@ object AmapDrawInMap {
             )
         }
         var aMaker = mapReadView?.aMap?.addMarker(aMarkerOption)
-        MarkerM.amaker = aMaker
-        return MarkerM
+        Marker.amaker = aMaker
+        return Marker
     }
 
 
@@ -64,12 +62,12 @@ object AmapDrawInMap {
      */
     fun drawPolyline(
         mapReadView: MapReadyView?,
-        msLatLng: List<LatLngM>,
+        msLatLng: List<com.cusc.map.map2d.cdata.LatLng>,
         msPolylineOptions: com.cusc.map.map2d.PolylineOptions
     ): MapOverlay {
         // 绘制高德地图的线
         var latLngs = msLatLng.map {
-            LatLng(it.lat, it.lng)
+            ALatLng(it.lat, it.lng)
         }
         val aOption = APolylineOptions().addAll(latLngs)
             .width(msPolylineOptions.width)
@@ -89,11 +87,11 @@ object AmapDrawInMap {
      */
     fun drawCircle(
         mapReadView: MapReadyView?,
-        center: LatLngM,
-        msCircleOptions:CircleOptionsM?
+        center: com.cusc.map.map2d.cdata.LatLng,
+        msCircleOptions: com.cusc.map.map2d.CircleOptions?
     ): MapOverlay {
-        var latLng = LatLng(center.lat, center.lng)
-        val options = CircleOptions()
+        var latLng = ALatLng(center.lat, center.lng)
+        val options = ACircleOptions()
             .center(latLng)
             .radius(msCircleOptions?.radius?.toDouble()?:100.0)
             .fillColor(msCircleOptions?.fillColor?:"#50FF0000".toColorInt())
@@ -112,11 +110,11 @@ object AmapDrawInMap {
      */
     fun drawPolygon(
         mapReadView: MapReadyView?,
-        msLatLng: List<LatLngM>,
+        msLatLng: List<com.cusc.map.map2d.cdata.LatLng>,
         msPolygonOptions: com.cusc.map.map2d.PolygonOptions
     ): MapOverlay {
         var latLngs = msLatLng.map {
-            LatLng(it.lat, it.lng)
+            ALatLng(it.lat, it.lng)
         }
         val aPolygonOptions = APolygonOptions().apply {
             addAll(latLngs)

mapapi/src/main/java/com/cusc/map/map2d/amap/AmapGpsLocation.kt

@@ -93,7 +93,7 @@ class AmapGpsLocation {
                         accuracy = location?.accuracy ?: 0f
                         altitude = location?.altitude ?: 0.0
                     }
-                    onMsGpsLoc?.onMsGpsLoc(loc)
+                    onMsGpsLoc?.onGpsLoc(loc)
                 }
             } else {
 

mapapi/src/main/java/com/cusc/map/map2d/amap/AmapNai.kt

 package com.cusc.map.map2d.amap
 
-import com.amap.api.maps.model.LatLng
+import com.amap.api.maps.model.LatLng as ALatLng
 import com.amap.api.maps.model.Poi
 import com.amap.api.navi.AmapNaviPage
 import com.amap.api.navi.AmapNaviParams
@@ -8,7 +8,7 @@ import com.amap.api.navi.AmapNaviType
 import com.amap.api.navi.AmapPageType
 import com.cusc.map.map2d.UserCtx
 import com.cusc.map.map2d.cdata.WayPoi
-import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLng
 
 /**
  * 高德导航
@@ -25,9 +25,9 @@ object AmapNai {
      * @param ways
      */
     fun startNavi(
-        starPoint: LatLngM,
+        starPoint: com.cusc.map.map2d.cdata.LatLng,
         startName: String,
-        endPoint: LatLngM,
+        endPoint: com.cusc.map.map2d.cdata.LatLng,
         endName: String,
         ways: List<WayPoi>
     ) {
@@ -39,16 +39,16 @@ object AmapNai {
                 poiList.add(
                     Poi(
                         wpoi.passName,
-                        LatLng(wpoi.passPoint!!.lat, wpoi.passPoint!!.lng),
+                        ALatLng(wpoi.passPoint!!.lat, wpoi.passPoint!!.lng),
                         ""
                     )
                 )
             }
         }
         val params = AmapNaviParams(
-            Poi(startName, LatLng(starPoint.lat, starPoint.lng), ""),
+            Poi(startName, ALatLng(starPoint.lat, starPoint.lng), ""),
             poiList,
-            Poi(endName, LatLng(endPoint.lat, endPoint.lng), ""),
+            Poi(endName, ALatLng(endPoint.lat, endPoint.lng), ""),
             AmapNaviType.DRIVER, AmapPageType.NAVI
         )
         params.setUseInnerVoice(true)
@@ -67,9 +67,9 @@ object AmapNai {
      * @param ways
      */
     fun startPlanNavi(
-        starPoint: LatLngM,
+        starPoint: com.cusc.map.map2d.cdata.LatLng,
         startName: String,
-        endPoint: LatLngM,
+        endPoint: com.cusc.map.map2d.cdata.LatLng,
         endName: String,
         ways: List<WayPoi>
     ) {
@@ -81,16 +81,16 @@ object AmapNai {
                 poiList.add(
                     Poi(
                         wpoi.passName,
-                        LatLng(wpoi.passPoint!!.lat, wpoi.passPoint!!.lng),
+                        ALatLng(wpoi.passPoint!!.lat, wpoi.passPoint!!.lng),
                         ""
                     )
                 )
             }
         }
         val params = AmapNaviParams(
-            Poi(startName, LatLng(starPoint.lat, starPoint.lng), ""),
+            Poi(startName, ALatLng(starPoint.lat, starPoint.lng), ""),
             poiList,
-            Poi(endName, LatLng(endPoint.lat, endPoint.lng), ""),
+            Poi(endName, ALatLng(endPoint.lat, endPoint.lng), ""),
             AmapNaviType.DRIVER, AmapPageType.ROUTE
         )
         params.setUseInnerVoice(true)

mapapi/src/main/java/com/cusc/map/map2d/amap/AmapPoiSearch.kt

@@ -7,7 +7,7 @@ import com.amap.api.services.poisearch.PoiResult
 import com.amap.api.services.poisearch.PoiSearch
 import com.cusc.map.map2d.UserCtx
 import com.cusc.map.map2d.cdata.PoiSearchRes
-import com.cusc.map.map2d.inters.OnMSPoiSearchLis
+import com.cusc.map.map2d.inters.OnPoiSearchLis
 
 /**
  * 高配的Poi 搜索相关
@@ -15,7 +15,7 @@ import com.cusc.map.map2d.inters.OnMSPoiSearchLis
 object AmapPoiSearch : PoiSearch.OnPoiSearchListener {
 
 
-    private var onMSPoiSearchLis: OnMSPoiSearchLis? = null
+    private var onMSPoiSearchLis: OnPoiSearchLis? = null
 
 
     /**关键字搜索
@@ -28,7 +28,7 @@ object AmapPoiSearch : PoiSearch.OnPoiSearchListener {
         keyWord: String,
         lat: Double = 41.80196,
         lng: Double = 123.43326,
-        onMSPoiSearchLis: OnMSPoiSearchLis
+        onMSPoiSearchLis: OnPoiSearchLis
     ) {
         this.onMSPoiSearchLis = onMSPoiSearchLis
         var context = UserCtx.Companion.instance.mContext
@@ -59,7 +59,7 @@ object AmapPoiSearch : PoiSearch.OnPoiSearchListener {
         lat: Double,
         lng: Double,
         radios: Int,
-        onMSPoiSearchLis: OnMSPoiSearchLis
+        onMSPoiSearchLis: OnPoiSearchLis
     ) {
         this.onMSPoiSearchLis = onMSPoiSearchLis
         var context = UserCtx.Companion.instance.mContext

mapapi/src/main/java/com/cusc/map/map2d/amap/AmapRoutePlans.kt

 package com.cusc.map.map2d.amap
 
 import com.amap.api.maps.CameraUpdateFactory
-import com.amap.api.maps.model.LatLng
+import com.amap.api.maps.model.LatLng as ALatLng
 import com.amap.api.maps.model.Poi
 import com.amap.api.navi.AMapNavi
 import com.amap.api.navi.model.AMapCalcRouteResult
@@ -12,7 +12,7 @@ import com.cusc.map.map2d.UserCtx
 import com.cusc.map.map2d.cdata.DriverRouteBean
 import com.cusc.map.map2d.cdata.WayPoi
 import com.cusc.map.map2d.inters.MyAMapNaviListener
-import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLng
 import com.cusc.map.map2d.inters.OnDriveRoute
 import com.cusc.map.ui.MapReadyView
 
@@ -47,9 +47,9 @@ class AmapRoutePlans {
      * @param mapReadView 地图对象
      */
     fun drivingPathPlanning(
-        starPoint: LatLngM,
+        starPoint: com.cusc.map.map2d.cdata.LatLng,
         startName: String = "当前位置",
-        endPoint: LatLngM,
+        endPoint: com.cusc.map.map2d.cdata.LatLng,
         endName: String = "",
         ways: List<WayPoi>,
         mapReadView: MapReadyView?,
@@ -70,7 +70,7 @@ class AmapRoutePlans {
                 poiList.add(
                     Poi(
                         wpoi.passName,
-                        LatLng(wpoi.passPoint!!.lat, wpoi.passPoint!!.lng),
+                        ALatLng(wpoi.passPoint!!.lat, wpoi.passPoint!!.lng),
                         ""
                     )
                 )

mapapi/src/main/java/com/cusc/map/map2d/cdata/LatLngM.kt → mapapi/src/main/java/com/cusc/map/map2d/cdata/LatLng.kt

@@ -3,9 +3,9 @@ package com.cusc.map.map2d.cdata
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
-/**经纬度*/
+/**纬度,经*/
 @Parcelize
-data class LatLngM
+data class LatLng
     (
     var lat: Double = 0.0,
     var lng: Double = 0.0

mapapi/src/main/java/com/cusc/map/map2d/cdata/MarkerM.kt → mapapi/src/main/java/com/cusc/map/map2d/cdata/Marker.kt

@@ -4,7 +4,7 @@ import com.minedata.minenavi.map.Marker
 import com.amap.api.maps.model.Marker as AMarker
 
 /**返回的mark*/
-object MarkerM {
+object Marker {
     /**四维mark*/
     var maker: Marker? = null
 

mapapi/src/main/java/com/cusc/map/map2d/cdata/WayPoi.kt

@@ -7,7 +7,7 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class WayPoi(
     /**途经点名坐标*/
-    var passPoint: LatLngM,
+    var passPoint: LatLng,
     /**经点名字*/
     var passName: String
 ) : Parcelable

mapapi/src/main/java/com/cusc/map/map2d/inters/OnMSPoiSearchLis.kt → mapapi/src/main/java/com/cusc/map/map2d/inters/OnPoiSearchLis.kt

@@ -5,7 +5,7 @@ import com.cusc.map.map2d.cdata.PoiSearchRes
 /**
  * POI搜素回调
  */
-interface OnMSPoiSearchLis {
+interface OnPoiSearchLis {
     /**
      * 搜索返回
      * @param poiList 返回列表

mapapi/src/main/java/com/cusc/map/map2d/mine/MineDrawInMap.kt

@@ -2,18 +2,16 @@ package com.cusc.map.map2d.mine
 
 import android.graphics.BitmapFactory
 import androidx.core.graphics.toColorInt
-import com.minedata.minenavi.map.CircleOptions
+import com.minedata.minenavi.map.CircleOptions as FCircleOptions
 import com.minedata.minenavi.map.MarkerOptions
-import com.minedata.minenavi.map.PolygonOptions as MPolygonOptions
-import com.minedata.minenavi.map.PolylineOptions as MPolylineOptions
-import com.minedata.minenavi.mapdal.LatLng
+import com.minedata.minenavi.map.PolygonOptions as FPolygonOptions
+import com.minedata.minenavi.map.PolylineOptions as FPolylineOptions
+import com.minedata.minenavi.mapdal.LatLng as FLatLng
 import com.cusc.map.R
 import com.cusc.map.map2d.UserCtx
-import com.cusc.map.map2d.CircleOptionsM
-import com.cusc.map.map2d.PolygonOptions
-import com.cusc.map.map2d.PolylineOptions
-import com.cusc.map.map2d.cdata.LatLngM
-import com.cusc.map.map2d.cdata.MarkerM
+import com.cusc.map.map2d.CircleOptions
+import com.cusc.map.map2d.cdata.LatLng
+import com.cusc.map.map2d.cdata.Marker
 import com.cusc.map.map2d.cdata.MapOverlay
 import com.cusc.map.ui.MapReadyView
 
@@ -34,18 +32,18 @@ internal object MineDrawInMap {
         mapReadView: MapReadyView?,
         lat: Double,
         lng: Double
-    ): MarkerM {
+    ): Marker {
         var context = UserCtx.Companion.instance.mContext
         // 根据不同的地图类型绘制标记点
         val icon = BitmapFactory.decodeResource(context?.resources, R.drawable.market_loc)
-        val latLng = LatLng(lat, lng)
+        val latLng = FLatLng(lat, lng)
         var options = MarkerOptions()
             .bitmap(icon)
             // 位置坐标
             .position(latLng)
         var maker = mapReadView?.mMineMap?.addMarker(options)
-        MarkerM.maker = maker
-        return MarkerM
+        Marker.maker = maker
+        return Marker
     }
 
 
@@ -57,14 +55,14 @@ internal object MineDrawInMap {
      */
     fun drawPolyline(
         mapReadView: MapReadyView?,
-        msLatLng: List<LatLngM>,
+        msLatLng: List<com.cusc.map.map2d.cdata.LatLng>,
         msPolylineOptions: com.cusc.map.map2d.PolylineOptions
     ): MapOverlay {
         // 绘制自定义地图的线
         var latLngs = msLatLng.map {
-            LatLng(it.lat, it.lng)
+            FLatLng(it.lat, it.lng)
         }
-        var options = MPolylineOptions()
+        var options = FPolylineOptions()
             // 添加顶点坐标
             .addAll(latLngs)
             .width(msPolylineOptions.width)
@@ -85,12 +83,12 @@ internal object MineDrawInMap {
      */
     fun drawCircle(
         mapReadView: MapReadyView?,
-        center: LatLngM,
-        msCircleOptions:CircleOptionsM?
+        center: LatLng,
+        msCircleOptions: CircleOptions?
     ): MapOverlay {
         // 根据地图类型绘制不同类型的圆形
-        var latLng = LatLng(center.lat, center.lng)
-        val options = CircleOptions()
+        var latLng = FLatLng(center.lat, center.lng)
+        val options = FCircleOptions()
             .center(latLng)
             .radius(msCircleOptions?.radius?:100f)
             .fillColor(msCircleOptions?.fillColor?:"#50FF0000".toColorInt())
@@ -109,14 +107,14 @@ internal object MineDrawInMap {
      */
     fun drawPolygon(
         mapReadView: MapReadyView?,
-        msLatLng: List<LatLngM>,
+        msLatLng: List<com.cusc.map.map2d.cdata.LatLng>,
         msPolygonOptions: com.cusc.map.map2d.PolygonOptions
     ): MapOverlay {
         var latLngs = msLatLng.map {
-            LatLng(it.lat, it.lng)
+            FLatLng(it.lat, it.lng)
         }
         // 声明 多边形参数对象
-        val polygonOptions = MPolygonOptions().apply {
+        val polygonOptions = FPolygonOptions().apply {
             addAll(latLngs)
             fillColor(msPolygonOptions.fillColor)
             strokeWidth(msPolygonOptions.strokeWidth)

mapapi/src/main/java/com/cusc/map/map2d/mine/MineNai.kt

@@ -7,7 +7,7 @@ import com.minedata.minenavi.map.Model
 import com.minedata.minenavi.map.ModelOptions
 import com.minedata.minenavi.map.Overlay
 import com.minedata.minenavi.mapdal.DataPreference
-import com.minedata.minenavi.mapdal.LatLng
+import com.minedata.minenavi.mapdal.LatLng as FLatLng
 import com.minedata.minenavi.navi.GuidanceText
 import com.minedata.minenavi.navi.NaviProgressData
 import com.minedata.minenavi.navi.NaviSession
@@ -23,7 +23,7 @@ import com.cusc.map.map2d.UserCtx
 import com.cusc.map.map2d.cdata.WayPoi
 import com.cusc.map.map2d.inters.MyMineNaviListener
 import com.cusc.map.map2d.inters.OnNaviPresenterListener
-import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLng
 import com.cusc.map.ui.MapReadyView
 import com.cusc.map.ui.MineNaiDirActivity
 
@@ -77,14 +77,14 @@ object MineNai {
 
     fun startSimNavi(
         mapReadView: MapReadyView?,
-        starPoint: LatLngM,
+        starPoint: com.cusc.map.map2d.cdata.LatLng,
         routeBase: RouteBase?,
         onNaviPresenterListener: OnNaviPresenterListener?
     ) {
         if (routeBase != null) {
             addNaviListener(onNaviPresenterListener)
             mMineMap = mapReadView?.mMineMap
-            val point = Tools.latLngToPoint(LatLng(starPoint.lat, starPoint.lng))
+            val point = Tools.latLngToPoint(FLatLng(starPoint.lat, starPoint.lng))
             drawNavingCar(point)
             NaviSpeaker.stop()
             mNaviSession?.takeRouteQuietly(routeBase)
@@ -99,9 +99,9 @@ object MineNai {
      * 直接跳转页面开启导航
      */
     fun startNaviDirect(
-        starPoint: LatLngM,
+        starPoint: com.cusc.map.map2d.cdata.LatLng,
         startName: String = "当前位置",
-        endPoint: LatLngM,
+        endPoint: com.cusc.map.map2d.cdata.LatLng,
         endName: String = "",
         ways: List<WayPoi>
     ) {
@@ -119,7 +119,7 @@ object MineNai {
      */
     fun startNaviFormRouteBase(
         routeBase: RouteBase?,
-        mStartPoint: LatLngM,
+        mStartPoint: LatLng,
         mapReadView: MapReadyView?
     ) {
 //            mMineMap = mapReadView?.mMineMap
@@ -128,7 +128,7 @@ object MineNai {
         mMineMap = mapReadView?.mMineMap
 //        mNaviSession?.removeMineNaviListeners()
 //        mNaviSession?.addMineNaviListener(myMineNaviListener)
-        val starPoint = Tools.latLngToPoint(LatLng(mStartPoint.lat, mStartPoint.lng))
+        val starPoint = Tools.latLngToPoint(FLatLng(mStartPoint.lat, mStartPoint.lng))
         drawNavingCar(starPoint)
         mNaviSession?.takeRoute(routeBase)
     }

mapapi/src/main/java/com/cusc/map/map2d/mine/MineNaiParams.kt

@@ -2,7 +2,7 @@ package com.cusc.map.map2d.mine
 
 import android.os.Parcelable
 import com.cusc.map.map2d.cdata.WayPoi
-import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLng
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -10,9 +10,9 @@ import kotlinx.parcelize.Parcelize
  */
 @Parcelize
 data class MineNaiParams(
-    val starPoint: LatLngM,
+    val starPoint: LatLng,
     val startName: String,
-    val endPoint: LatLngM,
+    val endPoint: LatLng,
     val endName: String,
     val ways: List<WayPoi>
 ) : Parcelable
\ No newline at end of file

mapapi/src/main/java/com/cusc/map/map2d/mine/MinePoiSearch.kt

@@ -8,7 +8,7 @@ import com.minedata.minenavi.poiquery.SearchErrorCode
 import com.minedata.minenavi.poiquery.SortType
 import com.cusc.map.map2d.UserCtx
 import com.cusc.map.map2d.cdata.PoiSearchRes
-import com.cusc.map.map2d.inters.OnMSPoiSearchLis
+import com.cusc.map.map2d.inters.OnPoiSearchLis
 
 /**
  * 四维Poi搜索相关
@@ -16,7 +16,7 @@ import com.cusc.map.map2d.inters.OnMSPoiSearchLis
 object MinePoiSearch : PoiSearch.OnPoiSearchListener {
 
 
-    private var onMSPoiSearchLis: OnMSPoiSearchLis? = null
+    private var onMSPoiSearchLis: OnPoiSearchLis? = null
 
 
     /**关键字搜索
@@ -30,7 +30,7 @@ object MinePoiSearch : PoiSearch.OnPoiSearchListener {
         lat: Double = 41.80196,
         lng: Double = 123.43326,
         adCode: String,
-        onMSPoiSearchLis: OnMSPoiSearchLis
+        onMSPoiSearchLis: OnPoiSearchLis
     ) {
         this.onMSPoiSearchLis = onMSPoiSearchLis
         var context = UserCtx.Companion.instance.mContext
@@ -65,7 +65,7 @@ object MinePoiSearch : PoiSearch.OnPoiSearchListener {
         lat: Double,
         lng: Double,
         radios: Int,
-        onMSPoiSearchLis: OnMSPoiSearchLis
+        onMSPoiSearchLis: OnPoiSearchLis
     ) {
         this.onMSPoiSearchLis = onMSPoiSearchLis
         var context = UserCtx.Companion.instance.mContext

mapapi/src/main/java/com/cusc/map/map2d/mine/MineRoutePlans.kt

@@ -5,7 +5,7 @@ import android.graphics.Rect
 import com.minedata.minenavi.map.Route
 import com.minedata.minenavi.map.RouteOptions
 import com.minedata.minenavi.mapdal.DataPreference
-import com.minedata.minenavi.mapdal.LatLng
+import com.minedata.minenavi.mapdal.LatLng as FLatLng
 import com.minedata.minenavi.mapdal.PoiFavorite
 import com.minedata.minenavi.navi.NaviSession
 import com.minedata.minenavi.navi.RouteBase
@@ -16,7 +16,7 @@ import com.minedata.minenavi.util.Tools
 import com.cusc.map.map2d.cdata.DriverRouteBean
 import com.cusc.map.map2d.cdata.WayPoi
 import com.cusc.map.map2d.inters.MyMineNaviListener
-import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLng
 import com.cusc.map.map2d.inters.OnDriveRoute
 import com.cusc.map.ui.MapReadyView
 import com.cusc.map.utils.DisplayUtil
@@ -58,9 +58,9 @@ object MineRoutePlans {
      * @param onDriveRoute 路径规划结果回调
      */
     fun drivingPathPlanning(
-        starPoint: LatLngM,
+        starPoint: com.cusc.map.map2d.cdata.LatLng,
         startName: String = "当前位置",
-        endPoint: LatLngM,
+        endPoint: com.cusc.map.map2d.cdata.LatLng,
         endName: String = "",
         ways: List<WayPoi>,
         mapReadView: MapReadyView?,
@@ -75,15 +75,15 @@ object MineRoutePlans {
         mNaviSession?.setDataPreference(DataPreference.preferOnline)
         mNaviSession?.addMineNaviListener(planiListener)
 
-        mStartPoint = Tools.latLngToPoint(LatLng(starPoint.lat, starPoint.lng))
-        val endPoint = Tools.latLngToPoint(LatLng(endPoint.lat, endPoint.lng))
+        mStartPoint = Tools.latLngToPoint(FLatLng(starPoint.lat, starPoint.lng))
+        val endPoint = Tools.latLngToPoint(FLatLng(endPoint.lat, endPoint.lng))
         var startName = startName
         var endName = endName
         var wayPoints = mutableListOf<PoiFavorite>()
         if (ways.count() > 0) {
             ways.forEach { wpoi ->
                 var passPoint =
-                    Tools.latLngToPoint(LatLng(wpoi.passPoint!!.lat, wpoi.passPoint!!.lng))
+                    Tools.latLngToPoint(FLatLng(wpoi.passPoint!!.lat, wpoi.passPoint!!.lng))
                 wayPoints.add(PoiFavorite(passPoint, wpoi.passName))
             }
         }