修改DEMO

mapapi/src/main/java/com/cusc/map/location/OnMsGpsLoc.kt → mapapi/src/main/java/com/cusc/map/location/OnGpsLoc.kt

 package com.cusc.map.location
 
 /**业务层Gps定位回调接口**/
-interface OnMsGpsLoc {
-    fun onMsGpsLoc(mSLocBean: MSLocCb)
+interface OnGpsLoc {
+    fun onMsGpsLoc(mSLocBean: LocCbM)
 }
\ No newline at end of file

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

@@ -26,7 +26,7 @@ class MsPolylineOptions {
 
 
 /***绘制圆形选项**/
-class MsCircleOptions {
+class CircleOptionsM {
     /**半径（米）**/
     var radius = 100f
 
@@ -116,7 +116,7 @@ object DrawInMap : MsOperationParent() {
      */
     fun drawCircle(
         center: LatLngM,
-        msCircleOptions: MsCircleOptions?
+        msCircleOptions: CircleOptionsM?
     ): MapOverlay {
         val mapReadView = getMapReadView()
         when (MapSdkInit.getMapType()) {

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

@@ -10,7 +10,7 @@ import com.amap.api.maps.model.PolygonOptions
 import com.amap.api.maps.model.PolylineOptions
 import com.cusc.map.R
 import com.cusc.map.UserCtx
-import com.cusc.map.maps.MsCircleOptions
+import com.cusc.map.maps.CircleOptionsM
 import com.cusc.map.maps.MsPolygonOptions
 import com.cusc.map.maps.MsPolylineOptions
 import com.cusc.map.maps.cdata.LatLngM
@@ -90,7 +90,7 @@ object AmapDrawInMap {
     fun drawCircle(
         mapReadView: MapReadyView?,
         center: LatLngM,
-        msCircleOptions:MsCircleOptions?
+        msCircleOptions:CircleOptionsM?
     ): MapOverlay {
         var latLng = LatLng(center.lat, center.lng)
         val options = CircleOptions()

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

@@ -5,8 +5,8 @@ import com.amap.api.location.AMapLocationClient
 import com.amap.api.location.AMapLocationClientOption
 import com.amap.api.location.AMapLocationListener
 import com.cusc.map.UserCtx
-import com.cusc.map.location.MSLocCb
-import com.cusc.map.location.OnMsGpsLoc
+import com.cusc.map.location.LocCbM
+import com.cusc.map.location.OnGpsLoc
 
 /**GPS定位类*/
 class AmapGpsLocation {
@@ -38,7 +38,7 @@ class AmapGpsLocation {
     private var alocationClient: AMapLocationClient? = null
 
     /**业务层Gps定位回调**/
-    private var onMsGpsLoc: OnMsGpsLoc? = null
+    private var onMsGpsLoc: OnGpsLoc? = null
 
     /**初始化定位*/
     private fun initLoc() {
@@ -53,7 +53,7 @@ class AmapGpsLocation {
 
 
     /**开启定位*/
-    fun starLoc(onMsGpsLoc: OnMsGpsLoc?) {
+    fun starLoc(onMsGpsLoc: OnGpsLoc?) {
         this.onMsGpsLoc = onMsGpsLoc
         if (alocationClient == null) {
             initLoc()
@@ -85,7 +85,7 @@ class AmapGpsLocation {
                 //errCode等于0代表定位成功，其他的为定位失败，具体的可以参照官网定位错误码说明
                 if (location.getErrorCode() == 0) {
 //                    println("-------高德定位改变 = ${location?.latitude}   curLng=${location?.longitude}  speed=${location?.speed}")
-                    var loc = MSLocCb.instance.apply {
+                    var loc = LocCbM.instance.apply {
                         lat = location?.latitude ?: 0.0
                         lng = location?.longitude ?: 0.0
                         speed = location?.speed ?: 0f

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

@@ -9,7 +9,7 @@ import com.minedata.minenavi.map.PolylineOptions
 import com.minedata.minenavi.mapdal.LatLng
 import com.cusc.map.R
 import com.cusc.map.UserCtx
-import com.cusc.map.maps.MsCircleOptions
+import com.cusc.map.maps.CircleOptionsM
 import com.cusc.map.maps.MsPolygonOptions
 import com.cusc.map.maps.MsPolylineOptions
 import com.cusc.map.maps.cdata.LatLngM
@@ -86,7 +86,7 @@ internal object MineDrawInMap {
     fun drawCircle(
         mapReadView: MapReadyView?,
         center: LatLngM,
-        msCircleOptions:MsCircleOptions?
+        msCircleOptions:CircleOptionsM?
     ): MapOverlay {
         // 根据地图类型绘制不同类型的圆形
         var latLng = LatLng(center.lat, center.lng)

mapapi/src/main/java/com/cusc/map/parkroad/MsParkRoad.kt → mapapi/src/main/java/com/cusc/map/parkroad/ParkRoadM.kt

@@ -14,7 +14,7 @@ import com.cusc.map.vms.CarRoadVM
 /**
  * 局部图操作类
  */
-object MsParkRoad : MsOperationParent() {
+object ParkRoadM : MsOperationParent() {
 
     private var carRoadVM: CarRoadVM? = null
 

mapapi/src/main/java/com/cusc/map/scenario/CucsVehicle.kt

@@ -3,7 +3,7 @@ package com.cusc.map.scenario
 import com.cusc.map.MAP_TYPE
 import com.cusc.map.MapSdkInit
 import com.cusc.map.highmap.CarNavPath
-import com.cusc.map.highmap.HighMap
+import com.cusc.map.highmap.ThreeHighMap
 import com.cusc.map.scenario.bean.VehiclePos
 import com.cusc.map.scenario.mine.AmapVehMove
 import com.cusc.map.scenario.mine.MineVehMove
@@ -81,7 +81,7 @@ object CucsVehicle {
      * @param carNavPath
      */
     fun setCarNaiPath(carNavPath: CarNavPath) {
-        HighMap.setCarNavPath(carNavPath)
+        ThreeHighMap.setCarNavPath(carNavPath)
     }
 
     /**
@@ -89,7 +89,7 @@ object CucsVehicle {
      */
     fun clearCarNaiPath() {
         var carNavPath = CarNavPath()
-        HighMap.setCarNavPath(carNavPath)
+        ThreeHighMap.setCarNavPath(carNavPath)
     }
 
 

mapapi/src/main/java/com/cusc/map/scenario/PerceptionManager.kt

@@ -2,9 +2,9 @@ package com.cusc.map.scenario
 
 import com.cusc.map.MAP_TYPE
 import com.cusc.map.MapSdkInit
-import com.cusc.map.highmap.HighMap
+import com.cusc.map.highmap.ThreeHighMap
 import com.cusc.map.highmap.UnityPtc
-import com.cusc.map.parkroad.MsParkRoad
+import com.cusc.map.parkroad.ParkRoadM
 import com.cusc.map.parkroad.PtcBean
 import com.cusc.map.scenario.bean.Percept
 
@@ -45,7 +45,7 @@ object PerceptionManager {
                 heading = it.heading
             }
         }
-        MsParkRoad.upDatePreTarget(pres)
+        ParkRoadM.upDatePreTarget(pres)
     }
 
     //刷新高精图感知物
@@ -59,15 +59,15 @@ object PerceptionManager {
                 heading = it.heading
             }
         }
-        HighMap.setPtcData(pres)
+        ThreeHighMap.setPtcData(pres)
     }
 
     /***清除所有感知物**/
     fun clearAllPerception() {
         when (MapSdkInit.getMapType()) {
             MAP_TYPE.MINE -> {
-                MsParkRoad.clearAllTargets()
-                HighMap.setPtcData(emptyList())
+                ParkRoadM.clearAllTargets()
+                ThreeHighMap.setPtcData(emptyList())
             }
 
             MAP_TYPE.AMAP -> {

mapapi/src/main/java/com/cusc/map/scenario/V2xWarn.kt

 package com.cusc.map.scenario
 
 import com.example.car_and_road_3d.models.Alarm
-import com.cusc.map.highmap.HighMap
+import com.cusc.map.highmap.ThreeHighMap
 import com.cusc.map.highmap.WarnPtc
-import com.cusc.map.parkroad.MsParkRoad
+import com.cusc.map.parkroad.ParkRoadM
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -46,8 +46,8 @@ object V2xWarn {
             it.isAlarm = false
             it.time = 0
         }
-        HighMap.setWarnPtc(warnPtcs)
-        MsParkRoad.warnAlerms(alarms)
+        ThreeHighMap.setWarnPtc(warnPtcs)
+        ParkRoadM.warnAlerms(alarms)
         warnPtcs.clear()
         alarms.clear()
     }
@@ -76,21 +76,21 @@ object V2xWarn {
             })
         }
         //高精图预警
-        HighMap.setWarnPtc(warnPtcs)
+        ThreeHighMap.setWarnPtc(warnPtcs)
 
         CoroutineScope(Dispatchers.Main).launch {
-            HighMap.setCarRadarDirection(dirent)
-            HighMap.setCarBottomCircle(true)
+            ThreeHighMap.setCarRadarDirection(dirent)
+            ThreeHighMap.setCarBottomCircle(true)
             delay(5000)
-            HighMap.setCarBottomCircle(false)
-            HighMap.setCarRadarDirection(0)
+            ThreeHighMap.setCarBottomCircle(false)
+            ThreeHighMap.setCarRadarDirection(0)
         }
         //局部图预警
-        MsParkRoad.warnAlerms(alarms)
+        ParkRoadM.warnAlerms(alarms)
         CoroutineScope(Dispatchers.Main).launch {
-            MsParkRoad.toggleRadar(true)
+            ParkRoadM.toggleRadar(true)
             delay(5000)
-            MsParkRoad.toggleRadar(false)
+            ParkRoadM.toggleRadar(false)
         }
     }
 
@@ -99,7 +99,7 @@ object V2xWarn {
      * @param marker 1:结冰 2:施工 3:交叉路口慢行
      * */
     fun setWarnMark(mark: Int) {
-        MsParkRoad.showMarker(mark)
+        ParkRoadM.showMarker(mark)
     }
 
 }
\ No newline at end of file

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

 package com.cusc.map.scenario.mine
 
 import com.minedata.minenavi.mapdal.LatLng
-import com.cusc.map.highmap.HighMap
+import com.cusc.map.highmap.ThreeHighMap
 import com.cusc.map.highmap.HighPos
 import com.cusc.map.maps.Navigate
 import com.cusc.map.maps.MethodAdv
-import com.cusc.map.parkroad.MsParkRoad
+import com.cusc.map.parkroad.ParkRoadM
 import com.cusc.map.parkroad.RoadPos
 import com.cusc.map.scenario.CucsVehicle
 import com.cusc.map.scenario.VehicleModel
@@ -42,14 +42,14 @@ internal object MineVehMove {
                 lon = vPos.lng
                 evel = vPos.evel
             }
-            HighMap.setCarPosition(highPos)
+            ThreeHighMap.setCarPosition(highPos)
         } else if (moveType == 2) {
             var roadPos = RoadPos.instance.apply {
                 lat = vPos.lat
                 lng = vPos.lng
                 bearing = vPos.heading.toFloat()
             }
-            MsParkRoad.updateMainCar(roadPos, null)
+            ParkRoadM.updateMainCar(roadPos, null)
         } else if (moveType == 3) {
             if (Navigate.isStartNai) {//导航中就删除在线地图小车
                 CucsVehicle.deleteCarModel()

mapapi/src/main/java/com/cusc/map/ui/MineNaiDirActivity.kt

@@ -27,9 +27,9 @@ import com.cusc.map.maps.mine.MineNaiParams
 import com.cusc.map.maps.mine.MineRoutePlans
 import com.cusc.map.intfaces.OnComCan
 import com.cusc.map.intfaces.OnNaviPresenterListener
-import com.cusc.map.location.MSLocCb
-import com.cusc.map.location.MSLocation
-import com.cusc.map.location.OnMsGpsLoc
+import com.cusc.map.location.LocCbM
+import com.cusc.map.location.LocationM
+import com.cusc.map.location.OnGpsLoc
 import com.cusc.map.maps.Navigate
 import com.cusc.map.maps.PathPlanning
 import com.cusc.map.ui.MapView.OnMapReadyLis
@@ -68,8 +68,8 @@ class MineNaiDirActivity : AppCompatActivity(), OnNaviPresenterListener {
 
 
         //开启定位
-        MSLocation.startLoc(object : OnMsGpsLoc {
-            override fun onMsGpsLoc(mSLocBean: MSLocCb) {
+        LocationM.startLoc(object : OnGpsLoc {
+            override fun onMsGpsLoc(mSLocBean: LocCbM) {
                 println("---------mSLocBean = ${mSLocBean.lng}")
             }
         })