修改类名让人好懂

mapapi/src/main/java/com/cusc/map/maps/MSLayer.kt → mapapi/src/main/java/com/cusc/map/maps/LayerOpt.kt

@@ -8,7 +8,7 @@ import com.cusc.map.maps.mine.MineLayers
 /**
  * 图层操作
  */
-object MSLayer : MsOperationParent() {
+object LayerOpt : MsOperationParent() {
 
     /**
      * 切换地图图层

mapapi/src/main/java/com/cusc/map/maps/LocStyle.kt

@@ -20,7 +20,7 @@ object LocStyle {
      */
     fun setLocationStyle(
         mapReadView: MapReadyView?,
-        type: Int = MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE
+        type: Int = LocStyleConstant.LOCATION_TYPE_LOCATION_ROTATE
     ){
         when (MapSdkInit.getMapType()) {
             MAP_TYPE.MINE -> {

mapapi/src/main/java/com/cusc/map/maps/MSLocStyle.kt → mapapi/src/main/java/com/cusc/map/maps/LocStyleConstant.kt

@@ -3,7 +3,7 @@ package com.cusc.map.maps
 /**
  * 定位蓝点常量
  */
-object MSLocStyle {
+object LocStyleConstant {
     /**定位一次，且将视角移动到地图中心点**/
     const val LOCATION_TYPE_LOCATE: Int = 2
 

mapapi/src/main/java/com/cusc/map/maps/MSNavi.kt → mapapi/src/main/java/com/cusc/map/maps/Navigate.kt

@@ -6,14 +6,14 @@ import com.cusc.map.bean.DriverRouteBean
 import com.cusc.map.bean.WayPoi
 import com.cusc.map.intfaces.OnNaviPresenterListener
 import com.cusc.map.maps.amap.AmapNai
-import com.cusc.map.maps.cdata.MSLatLng
+import com.cusc.map.maps.cdata.LatLngM
 import com.cusc.map.maps.mine.MineNai
 import com.cusc.map.ui.MapReadyView
 
 /**
  * 导航相关
  */
-object MSNavi {
+object Navigate {
     /**是否开启导航**/
     var isStartNai = false
 
@@ -41,9 +41,9 @@ object MSNavi {
     fun startNavi(
         mapReadView: MapReadyView?,
         nType: Int,
-        starPoint: MSLatLng,
+        starPoint: LatLngM,
         startName: String,
-        endPoint: MSLatLng,
+        endPoint: LatLngM,
         endName: String,
         ways: List<WayPoi>,
         onNaviPresenterListener: OnNaviPresenterListener?
@@ -85,7 +85,7 @@ object MSNavi {
 
     fun startSimNavi(
         mapReadView: MapReadyView?,
-        starPoint: MSLatLng,
+        starPoint: LatLngM,
         driverRouteBean: DriverRouteBean?,
         onNaviPresenterListener: OnNaviPresenterListener?
     ) {

mapapi/src/main/java/com/cusc/map/maps/MSRoutePlans.kt → mapapi/src/main/java/com/cusc/map/maps/PathPlanning.kt

@@ -4,13 +4,13 @@ import com.cusc.map.MAP_TYPE
 import com.cusc.map.MapSdkInit
 import com.cusc.map.bean.WayPoi
 import com.cusc.map.maps.amap.AmapRoutePlans
-import com.cusc.map.maps.cdata.MSLatLng
+import com.cusc.map.maps.cdata.LatLngM
 import com.cusc.map.maps.inters.OnDriveRoute
 import com.cusc.map.maps.mine.MineRoutePlans
 
 
 /**路劲规划 **/
-object MSRoutePlans : MsOperationParent() {
+object PathPlanning : MsOperationParent() {
 
     /**驾车路径规划
      * @param starPoint 起点坐标
@@ -22,9 +22,9 @@ object MSRoutePlans : MsOperationParent() {
      * @param onDriveRoute 路径规划结果回调
      */
     fun drivingPathPlanning(
-        starPoint: MSLatLng,
+        starPoint: LatLngM,
         startName: String = "当前位置",
-        endPoint: MSLatLng,
+        endPoint: LatLngM,
         endName: String = "",
         ways: List<WayPoi>,
         onDriveRoute: OnDriveRoute?

mapapi/src/main/java/com/cusc/map/maps/MSPoi.kt → mapapi/src/main/java/com/cusc/map/maps/PoiSearch.kt

@@ -9,7 +9,7 @@ import com.cusc.map.maps.mine.MinePoiSearch
 /**
  * poi 搜索
  */
-object MSPoi {
+object PoiSearch {
 
     /**关键字搜索
      * @param keyWord 关键字

mapapi/src/main/java/com/cusc/map/maps/MSRegeoCode.kt → mapapi/src/main/java/com/cusc/map/maps/ReGeography.kt

@@ -14,7 +14,7 @@ import com.amap.api.services.geocoder.GeocodeSearch as AGeocodeSearch
 import com.amap.api.services.geocoder.GeocodeResult as AGeocodeResult
 
 /**逆地理编码*/
-object MSRegeoCode : GeocodeSearch.OnGeocodeSearchListener, AGeocodeSearch.OnGeocodeSearchListener {
+object ReGeography : GeocodeSearch.OnGeocodeSearchListener, AGeocodeSearch.OnGeocodeSearchListener {
 
     private var mSOnRegeo: OnMsRegeo? = null
 

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

@@ -13,10 +13,10 @@ import com.cusc.map.UserCtx
 import com.cusc.map.maps.MsCircleOptions
 import com.cusc.map.maps.MsPolygonOptions
 import com.cusc.map.maps.MsPolylineOptions
-import com.cusc.map.maps.cdata.MSLatLng
+import com.cusc.map.maps.cdata.LatLngM
 import com.cusc.map.ui.MapReadyView
-import com.cusc.map.maps.cdata.MSOverlay
-import com.cusc.map.maps.cdata.MSMarker
+import com.cusc.map.maps.cdata.MapOverlay
+import com.cusc.map.maps.cdata.MarkerM
 
 /**
  * 在地图上绘制
@@ -35,7 +35,7 @@ object AmapDrawInMap {
         mapReadView: MapReadyView?,
         lat: Double,
         lng: Double
-    ): MSMarker {
+    ): MarkerM {
         var context = UserCtx.Companion.instance.mContext
 
         // 处理高德地图类型的标记点绘制
@@ -50,8 +50,8 @@ object AmapDrawInMap {
             )
         }
         var aMaker = mapReadView?.aMap?.addMarker(aMarkerOption)
-        MSMarker.amaker = aMaker
-        return MSMarker
+        MarkerM.amaker = aMaker
+        return MarkerM
     }
 
 
@@ -64,9 +64,9 @@ object AmapDrawInMap {
      */
     fun drawPolyline(
         mapReadView: MapReadyView?,
-        msLatLng: List<MSLatLng>,
+        msLatLng: List<LatLngM>,
         msPolylineOptions: MsPolylineOptions
-    ): MSOverlay {
+    ): MapOverlay {
         // 绘制高德地图的线
         var latLngs = msLatLng.map {
             LatLng(it.lat, it.lng)
@@ -76,8 +76,8 @@ object AmapDrawInMap {
             .color(msPolylineOptions.fcolor)
             .setDottedLine(msPolylineOptions.isDotted)
         var polyline = mapReadView?.aMap?.addPolyline(aOption)
-        MSOverlay.aPolyline = polyline
-        return MSOverlay
+        MapOverlay.aPolyline = polyline
+        return MapOverlay
     }
 
 
@@ -89,9 +89,9 @@ object AmapDrawInMap {
      */
     fun drawCircle(
         mapReadView: MapReadyView?,
-        center: MSLatLng,
+        center: LatLngM,
         msCircleOptions:MsCircleOptions?
-    ): MSOverlay {
+    ): MapOverlay {
         var latLng = LatLng(center.lat, center.lng)
         val options = CircleOptions()
             .center(latLng)
@@ -100,8 +100,8 @@ object AmapDrawInMap {
             .strokeColor(msCircleOptions?.strokeColor?:"#500000FF".toColorInt())
             .strokeWidth(msCircleOptions?.strokeWidth?:15f)
         var circle = mapReadView?.aMap?.addCircle(options)
-        MSOverlay.aCircle = circle
-        return MSOverlay
+        MapOverlay.aCircle = circle
+        return MapOverlay
     }
 
 
@@ -112,9 +112,9 @@ object AmapDrawInMap {
      */
     fun drawPolygon(
         mapReadView: MapReadyView?,
-        msLatLng: List<MSLatLng>,
+        msLatLng: List<LatLngM>,
         msPolygonOptions:MsPolygonOptions
-    ): MSOverlay {
+    ): MapOverlay {
         var latLngs = msLatLng.map {
             LatLng(it.lat, it.lng)
         }
@@ -125,8 +125,8 @@ object AmapDrawInMap {
             strokeColor(msPolygonOptions.strokeColor)
         }
         var polygon = mapReadView?.aMap?.addPolygon(aPolygonOptions)
-        MSOverlay.aPolygon = polygon
-        return MSOverlay
+        MapOverlay.aPolygon = polygon
+        return MapOverlay
     }
 
 }
\ No newline at end of file

mapapi/src/main/java/com/cusc/map/maps/amap/AmapLocationStyle.kt

 package com.cusc.map.maps.amap
 
 import com.amap.api.maps.model.MyLocationStyle
-import com.cusc.map.maps.MSLocStyle
+import com.cusc.map.maps.LocStyleConstant
 import com.cusc.map.ui.MapReadyView
 
 /**
@@ -12,13 +12,13 @@ internal object AmapLocationStyle {
 
     // 高德定位类型
     private var styleAMap = mapOf(
-        MSLocStyle.LOCATION_TYPE_LOCATE to MyLocationStyle.LOCATION_TYPE_LOCATE,
-        MSLocStyle.LOCATION_TYPE_FOLLOW to MyLocationStyle.LOCATION_TYPE_FOLLOW,
-        MSLocStyle.LOCATION_TYPE_MAP_ROTATE to MyLocationStyle.LOCATION_TYPE_MAP_ROTATE,
-        MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE to MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE,
-        MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER to MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER,
-        MSLocStyle.LOCATION_TYPE_FOLLOW_NO_CENTER to MyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER,
-        MSLocStyle.LOCATION_TYPE_MAP_ROTATE_NO_CENTER to MyLocationStyle.LOCATION_TYPE_MAP_ROTATE_NO_CENTER
+        LocStyleConstant.LOCATION_TYPE_LOCATE to MyLocationStyle.LOCATION_TYPE_LOCATE,
+        LocStyleConstant.LOCATION_TYPE_FOLLOW to MyLocationStyle.LOCATION_TYPE_FOLLOW,
+        LocStyleConstant.LOCATION_TYPE_MAP_ROTATE to MyLocationStyle.LOCATION_TYPE_MAP_ROTATE,
+        LocStyleConstant.LOCATION_TYPE_LOCATION_ROTATE to MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE,
+        LocStyleConstant.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER to MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER,
+        LocStyleConstant.LOCATION_TYPE_FOLLOW_NO_CENTER to MyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER,
+        LocStyleConstant.LOCATION_TYPE_MAP_ROTATE_NO_CENTER to MyLocationStyle.LOCATION_TYPE_MAP_ROTATE_NO_CENTER
     )
 
     //高德初始化定位蓝点样式类
@@ -31,7 +31,7 @@ internal object AmapLocationStyle {
      */
     fun setLocationStyle(
         mapReadView: MapReadyView?,
-        type: Int = MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE
+        type: Int = LocStyleConstant.LOCATION_TYPE_LOCATION_ROTATE
     ) {
         var aMap = mapReadView?.aMap
         aMyLocationStyle.myLocationType(styleAMap.get(type)!!)

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

@@ -8,7 +8,7 @@ import com.amap.api.navi.AmapNaviType
 import com.amap.api.navi.AmapPageType
 import com.cusc.map.UserCtx
 import com.cusc.map.bean.WayPoi
-import com.cusc.map.maps.cdata.MSLatLng
+import com.cusc.map.maps.cdata.LatLngM
 
 /**
  * 高德导航
@@ -25,9 +25,9 @@ object AmapNai {
      * @param ways
      */
     fun startNavi(
-        starPoint: MSLatLng,
+        starPoint: LatLngM,
         startName: String,
-        endPoint: MSLatLng,
+        endPoint: LatLngM,
         endName: String,
         ways: List<WayPoi>
     ) {
@@ -67,9 +67,9 @@ object AmapNai {
      * @param ways
      */
     fun startPlanNavi(
-        starPoint: MSLatLng,
+        starPoint: LatLngM,
         startName: String,
-        endPoint: MSLatLng,
+        endPoint: LatLngM,
         endName: String,
         ways: List<WayPoi>
     ) {

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

@@ -12,7 +12,7 @@ import com.cusc.map.UserCtx
 import com.cusc.map.bean.DriverRouteBean
 import com.cusc.map.bean.WayPoi
 import com.cusc.map.intfaces.MyAMapNaviListener
-import com.cusc.map.maps.cdata.MSLatLng
+import com.cusc.map.maps.cdata.LatLngM
 import com.cusc.map.maps.inters.OnDriveRoute
 import com.cusc.map.ui.MapReadyView
 
@@ -47,9 +47,9 @@ class AmapRoutePlans {
      * @param mapReadView 地图对象
      */
     fun drivingPathPlanning(
-        starPoint: MSLatLng,
+        starPoint: LatLngM,
         startName: String = "当前位置",
-        endPoint: MSLatLng,
+        endPoint: LatLngM,
         endName: String = "",
         ways: List<WayPoi>,
         mapReadView: MapReadyView?,

mapapi/src/main/java/com/cusc/map/maps/cdata/MSLatLng.kt → mapapi/src/main/java/com/cusc/map/maps/cdata/LatLngM.kt

@@ -5,7 +5,7 @@ import kotlinx.parcelize.Parcelize
 
 /**经纬度*/
 @Parcelize
-data class MSLatLng
+data class LatLngM
     (
     var lat: Double = 0.0,
     var lng: Double = 0.0

mapapi/src/main/java/com/cusc/map/maps/cdata/MSOverlay.kt → mapapi/src/main/java/com/cusc/map/maps/cdata/MapOverlay.kt

@@ -5,8 +5,8 @@ import com.amap.api.maps.model.Polygon
 import com.amap.api.maps.model.Polyline
 import com.minedata.minenavi.map.Overlay
 
-/**返回的图层*/
-object MSOverlay {
+/**返回的地图覆盖物图层*/
+object MapOverlay {
     //四维线图层
     var polyline: Overlay? = null
 

mapapi/src/main/java/com/cusc/map/maps/cdata/MSMarker.kt → mapapi/src/main/java/com/cusc/map/maps/cdata/MarkerM.kt

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

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

@@ -12,9 +12,9 @@ import com.cusc.map.UserCtx
 import com.cusc.map.maps.MsCircleOptions
 import com.cusc.map.maps.MsPolygonOptions
 import com.cusc.map.maps.MsPolylineOptions
-import com.cusc.map.maps.cdata.MSLatLng
-import com.cusc.map.maps.cdata.MSMarker
-import com.cusc.map.maps.cdata.MSOverlay
+import com.cusc.map.maps.cdata.LatLngM
+import com.cusc.map.maps.cdata.MarkerM
+import com.cusc.map.maps.cdata.MapOverlay
 import com.cusc.map.ui.MapReadyView
 
 /**
@@ -34,7 +34,7 @@ internal object MineDrawInMap {
         mapReadView: MapReadyView?,
         lat: Double,
         lng: Double
-    ): MSMarker {
+    ): MarkerM {
         var context = UserCtx.Companion.instance.mContext
         // 根据不同的地图类型绘制标记点
         val icon = BitmapFactory.decodeResource(context?.resources, R.drawable.market_loc)
@@ -44,8 +44,8 @@ internal object MineDrawInMap {
             // 位置坐标
             .position(latLng)
         var maker = mapReadView?.mMineMap?.addMarker(options)
-        MSMarker.maker = maker
-        return MSMarker
+        MarkerM.maker = maker
+        return MarkerM
     }
 
 
@@ -57,9 +57,9 @@ internal object MineDrawInMap {
      */
     fun drawPolyline(
         mapReadView: MapReadyView?,
-        msLatLng: List<MSLatLng>,
+        msLatLng: List<LatLngM>,
         msPolylineOptions:MsPolylineOptions
-    ): MSOverlay {
+    ): MapOverlay {
         // 绘制自定义地图的线
         var latLngs = msLatLng.map {
             LatLng(it.lat, it.lng)
@@ -72,8 +72,8 @@ internal object MineDrawInMap {
             .outlineColor(msPolylineOptions.outlineColor)
             .setDottedLine(msPolylineOptions.isDotted)
         var polyline = mapReadView?.mMineMap?.addPolyline(options)
-        MSOverlay.polyline = polyline
-        return MSOverlay
+        MapOverlay.polyline = polyline
+        return MapOverlay
     }
 
 
@@ -85,9 +85,9 @@ internal object MineDrawInMap {
      */
     fun drawCircle(
         mapReadView: MapReadyView?,
-        center: MSLatLng,
+        center: LatLngM,
         msCircleOptions:MsCircleOptions?
-    ): MSOverlay {
+    ): MapOverlay {
         // 根据地图类型绘制不同类型的圆形
         var latLng = LatLng(center.lat, center.lng)
         val options = CircleOptions()
@@ -97,8 +97,8 @@ internal object MineDrawInMap {
             .strokeColor(msCircleOptions?.strokeColor?:"#500000FF".toColorInt())
             .strokeWidth(msCircleOptions?.strokeWidth?:15f)
         var circle = mapReadView?.mMineMap?.addCircle(options)
-        MSOverlay.circle = circle
-        return MSOverlay
+        MapOverlay.circle = circle
+        return MapOverlay
     }
 
 
@@ -109,9 +109,9 @@ internal object MineDrawInMap {
      */
     fun drawPolygon(
         mapReadView: MapReadyView?,
-        msLatLng: List<MSLatLng>,
+        msLatLng: List<LatLngM>,
         msPolygonOptions:MsPolygonOptions
-    ): MSOverlay {
+    ): MapOverlay {
         var latLngs = msLatLng.map {
             LatLng(it.lat, it.lng)
         }
@@ -124,8 +124,8 @@ internal object MineDrawInMap {
             dottedLine(msPolygonOptions.dLine)
         }
         var polygon = mapReadView?.mMineMap?.addPolygon(polygonOptions)
-        MSOverlay.polygon = polygon
-        return MSOverlay
+        MapOverlay.polygon = polygon
+        return MapOverlay
     }
 
 }
\ No newline at end of file

mapapi/src/main/java/com/cusc/map/maps/mine/MineLocationStyle.kt

@@ -2,7 +2,7 @@ package com.cusc.map.maps.mine
 
 import com.minedata.minenavi.map.MyLocationStyle
 import com.cusc.map.ui.MapReadyView
-import com.cusc.map.maps.MSLocStyle
+import com.cusc.map.maps.LocStyleConstant
 
 /**
  * 四维显示定位小圆点
@@ -19,7 +19,7 @@ internal object MineLocationStyle {
      */
     fun setLocationStyle(
         mapReadView: MapReadyView?,
-        type: Int = MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE
+        type: Int = LocStyleConstant.LOCATION_TYPE_LOCATION_ROTATE
     ) {
         var mMineMap = mapReadView?.mMineMap
 

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

@@ -23,7 +23,7 @@ import com.cusc.map.UserCtx
 import com.cusc.map.bean.WayPoi
 import com.cusc.map.intfaces.MyMineNaviListener
 import com.cusc.map.intfaces.OnNaviPresenterListener
-import com.cusc.map.maps.cdata.MSLatLng
+import com.cusc.map.maps.cdata.LatLngM
 import com.cusc.map.ui.MapReadyView
 import com.cusc.map.ui.MineNaiDirActivity
 
@@ -77,7 +77,7 @@ object MineNai {
 
     fun startSimNavi(
         mapReadView: MapReadyView?,
-        starPoint: MSLatLng,
+        starPoint: LatLngM,
         routeBase: RouteBase?,
         onNaviPresenterListener: OnNaviPresenterListener?
     ) {
@@ -99,9 +99,9 @@ object MineNai {
      * 直接跳转页面开启导航
      */
     fun startNaviDirect(
-        starPoint: MSLatLng,
+        starPoint: LatLngM,
         startName: String = "当前位置",
-        endPoint: MSLatLng,
+        endPoint: LatLngM,
         endName: String = "",
         ways: List<WayPoi>
     ) {
@@ -119,7 +119,7 @@ object MineNai {
      */
     fun startNaviFormRouteBase(
         routeBase: RouteBase?,
-        mStartPoint: MSLatLng,
+        mStartPoint: LatLngM,
         mapReadView: MapReadyView?
     ) {
 //            mMineMap = mapReadView?.mMineMap

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

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

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

@@ -16,7 +16,7 @@ import com.minedata.minenavi.util.Tools
 import com.cusc.map.bean.DriverRouteBean
 import com.cusc.map.bean.WayPoi
 import com.cusc.map.intfaces.MyMineNaviListener
-import com.cusc.map.maps.cdata.MSLatLng
+import com.cusc.map.maps.cdata.LatLngM
 import com.cusc.map.maps.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: MSLatLng,
+        starPoint: LatLngM,
         startName: String = "当前位置",
-        endPoint: MSLatLng,
+        endPoint: LatLngM,
         endName: String = "",
         ways: List<WayPoi>,
         mapReadView: MapReadyView?,

mapapi/src/main/java/com/cusc/map/scenario/mine/AmapVehMove.kt

@@ -7,7 +7,7 @@ import com.amap.api.maps.model.Marker
 import com.amap.api.maps.model.MarkerOptions
 import com.amap.api.maps.utils.overlay.MovingPointOverlay
 import com.cusc.map.R
-import com.cusc.map.maps.MSNavi
+import com.cusc.map.maps.Navigate
 import com.cusc.map.maps.MsOperationParent
 import com.cusc.map.scenario.CucsVehicle
 import com.cusc.map.scenario.bean.VehiclePos
@@ -34,7 +34,7 @@ internal object AmapVehMove : MsOperationParent() {
 
     fun aMapCarMove(vPos: VehiclePos, moveType: Int) {
         if (moveType == 3) {
-            if (MSNavi.isStartNai) {//导航中就删除在线地图小车
+            if (Navigate.isStartNai) {//导航中就删除在线地图小车
                 CucsVehicle.deleteCarModel()
             } else {
                 //计算2次定位时间差