diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt index 5196ec261f..ba0b28cc56 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.obu.mogo.utils import com.mogo.eagle.core.utilcode.util.LogUtils -import com.mogo.module.common.drawer.bean.TrafficData +import com.mogo.eagle.core.data.traffic.TrafficData import com.mogo.eagle.core.data.enums.TrafficTypeEnum import com.zhidao.support.obu.constants.ObuConstants import com.zhidao.support.obu.model.CvxPtcThreatIndInfo diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/bean/TrafficData.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/traffic/TrafficData.kt similarity index 63% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/bean/TrafficData.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/traffic/TrafficData.kt index d2cea9954b..2c6ef0b396 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/bean/TrafficData.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/traffic/TrafficData.kt @@ -1,69 +1,68 @@ -package com.mogo.module.common.drawer.bean; +package com.mogo.eagle.core.data.traffic -import com.mogo.eagle.core.data.enums.TrafficTypeEnum; +import com.mogo.eagle.core.data.enums.TrafficTypeEnum /** * @author xiaoyuzhou * @date 2021/8/17 8:41 下午 * 交通元素数据, */ -public class TrafficData { - +class TrafficData { /** * 交通元素类型, 车、人、摩托、大巴车、卡车、自行车 */ - public TrafficTypeEnum type; + var type: TrafficTypeEnum = TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI /** * 识别物体唯一标识 */ - public String uuid; + var uuid: String = "" /** * 识别物体的纬度 */ - public double lat; + var lat = 0.0 /** * 识别物体的经度 */ - public double lon; + var lon = 0.0 /** * 车头朝向 */ - public double heading; + var heading = 0.0 /** * 系统时间 */ - public long systemTime; + var systemTime: Long = 0 /** * 定位卫星时间 */ - public long satelliteTime; + var satelliteTime: Long = 0 /** * 海拔 */ - public double alt; + var alt = 0.0 /** * 速度 */ - public double speed; + var speed = 0.0 /** * 莫顿码 */ - public long mortonCode; + var mortonCode: Long = 0 /** * 实际距离 * 使用distanceX和distanceY计算 */ - public double distance; + var distance = 0.0 /** * 危险等级 @@ -73,5 +72,5 @@ public class TrafficData { * 0x02: 通知 -- 黄 * 0x03: 警告 -- 红 */ - public int threatLevel; -} + var threatLevel = 0 +} \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt index 8eb297e13f..efbc855319 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt @@ -9,7 +9,7 @@ import com.mogo.map.marker.IMogoMarker import com.mogo.map.marker.MogoMarkerOptions import com.mogo.module.common.MogoApisHandler import com.mogo.module.common.constants.DataTypes -import com.mogo.module.common.drawer.bean.TrafficData +import com.mogo.eagle.core.data.traffic.TrafficData import com.mogo.eagle.core.data.enums.TrafficTypeEnum import com.mogo.utils.WorkThreadHandler import com.mogo.utils.logger.Logger