规范类命名

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

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

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

@@ -10,7 +10,7 @@ import com.cusc.map.scenario.mine.MineVehMove
 import com.cusc.map.scenario.mine.MineVehicleModel
 
 /**车辆管理类***/
-object CucsVehicle {
+object CuscVehicle {
 
     //控制车辆是否暂停移动
     private var stopCar = false

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

@@ -4,7 +4,7 @@ import com.cusc.map.map2d.MAP_TYPE
 import com.cusc.map.map2d.MapSdkInit
 import com.cusc.map.map3d.ThreeHighMap
 import com.cusc.map.map3d.UnityPtc
-import com.cusc.map.parkroad.ParkRoadM
+import com.cusc.map.parkroad.ParkRoad
 import com.cusc.map.parkroad.PtcBean
 import com.cusc.map.scenario.bean.Percept
 
@@ -45,7 +45,7 @@ object PerceptionManager {
                 heading = it.heading
             }
         }
-        ParkRoadM.upDatePreTarget(pres)
+        ParkRoad.upDatePreTarget(pres)
     }
 
     //刷新高精图感知物
@@ -66,7 +66,7 @@ object PerceptionManager {
     fun clearAllPerception() {
         when (MapSdkInit.getMapType()) {
             MAP_TYPE.MINE -> {
-                ParkRoadM.clearAllTargets()
+                ParkRoad.clearAllTargets()
                 ThreeHighMap.setPtcData(emptyList())
             }
 

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

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

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

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

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

@@ -5,9 +5,9 @@ import com.cusc.map.map3d.ThreeHighMap
 import com.cusc.map.map3d.HighPos
 import com.cusc.map.map2d.Navigate
 import com.cusc.map.map2d.MethodAdv
-import com.cusc.map.parkroad.ParkRoadM
+import com.cusc.map.parkroad.ParkRoad
 import com.cusc.map.parkroad.RoadPos
-import com.cusc.map.scenario.CucsVehicle
+import com.cusc.map.scenario.CuscVehicle
 import com.cusc.map.scenario.VehicleModel
 import com.cusc.map.scenario.bean.VehiclePos
 import com.cusc.map.utils.SmoothMoveUtils
@@ -49,10 +49,10 @@ internal object MineVehMove {
                 lng = vPos.lng
                 bearing = vPos.heading.toFloat()
             }
-            ParkRoadM.updateMainCar(roadPos, null)
+            ParkRoad.updateMainCar(roadPos, null)
         } else if (moveType == 3) {
             if (Navigate.isStartNai) {//导航中就删除在线地图小车
-                CucsVehicle.deleteCarModel()
+                CuscVehicle.deleteCarModel()
             } else {
                 if (fromLoc == null || fromLoc?.lng == 0.0) {
                     setFromMyLoc(vPos)//设置起始位置

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

@@ -129,7 +129,7 @@ class MapView : LinearLayout {
 //        return null
 //    }
 
-    /**设置局部地图查询地址**/
+    /**更新路网服务的URL地址**/
     fun setRoadBaseUrl(url: String) {
         if (mapType == 0) {//四维地图
             if (childType == 2) {

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

@@ -28,7 +28,7 @@ import com.cusc.map.map2d.mine.MineRoutePlans
 import com.cusc.map.map2d.inters.OnComCan
 import com.cusc.map.map2d.inters.OnNaviPresenterListener
 import com.cusc.map.location.LocCbM
-import com.cusc.map.location.LocationM
+import com.cusc.map.location.LocateMap
 import com.cusc.map.location.OnGpsLoc
 import com.cusc.map.map2d.Navigate
 import com.cusc.map.map2d.PathPlanning
@@ -68,8 +68,8 @@ internal class MineNaiDirActivity : AppCompatActivity(), OnNaviPresenterListener
 
 
         //开启定位
-        LocationM.startLoc(object : OnGpsLoc {
-            override fun onMsGpsLoc(mSLocBean: LocCbM) {
+        LocateMap.startLoc(object : OnGpsLoc {
+            override fun onGpsLoc(mSLocBean: LocCbM) {
                 println("---------mSLocBean = ${mSLocBean.lng}")
             }
         })