diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 69469df4b9..fc88910937 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -805,9 +805,9 @@ import java.util.* /** * 闪动动画 */ - fun flicker(view: View) { - val alphaAnimation = AlphaAnimation(0f, 0.88f) - alphaAnimation.setDuration(600) + private fun flicker(view: View) { + val alphaAnimation = AlphaAnimation(0f, 0.9f) + alphaAnimation.setDuration(300) //600 alphaAnimation.setInterpolator(LinearInterpolator()) alphaAnimation.setRepeatCount(Animation.INFINITE) alphaAnimation.setRepeatMode(Animation.REVERSE) diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt index d069cac805..65fdaa930e 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt @@ -23,9 +23,9 @@ class MoGoObuProvider : IMoGoObuProvider { private var mContext: Context? = null private val busObuIp = "192.168.8.199" - // private val taxiObuIp = "192.168.1.199" + private val taxiObuIp = "192.168.1.199" - private val taxiObuIp = "192.168.0.56" //TODO +// private val taxiObuIp = "192.168.0.56" override val functionName: String get() = TAG diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt index 198d8b81c9..87ae7654c8 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt @@ -232,14 +232,9 @@ class MogoPrivateObuNewManager private constructor() { val status = data.status val level = data.warning_Msg[0].warningLevel val direction = getMessageDirection(data.warning_Msg[0].targetPosition) - CallerLogger.d( "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", - "onCvxRtiThreatIndInfo direction = $direction -- targetPosition = ${data.warning_Msg[0].targetPosition}" - ) - CallerLogger.d( - "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", - "onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- eventSerialNum = ${data.warning_Msg[0].eventSerialNum} --direction = $direction" + "onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- eventSerialNum = ${data.warning_Msg[0].eventSerialNum} -- direction = $direction -- targetPosition = ${data.warning_Msg[0].targetPosition}" ) when (appId) { @@ -270,9 +265,8 @@ class MogoPrivateObuNewManager private constructor() { ttsContent = EventTypeEnum.getWarningTts(appId) } - EventTypeEnum.TYPE_USECASE_ID_IVS.poiType //车内标牌 - -> { - when (data.warning_Msg[0].eventSerialNum) { //TODO + EventTypeEnum.TYPE_USECASE_ID_IVS.poiType -> { //车内标牌 + when (data.warning_Msg[0].eventSerialNum) { MogoObuConstants.RTS.RTI_TYPE_SCHOOL -> { //学校 appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType } @@ -313,7 +307,7 @@ class MogoPrivateObuNewManager private constructor() { MogoObuConstants.STATUS.ADD, MogoObuConstants.STATUS.UPDATE// 更新 -> { - //显示警告红边 TODO 需要确定是什么值 + //显示警告红边 // CallerHmiManager.showWarning(direction) //显示弹框,语音提示 CallerHmiManager.showWarningV2X( @@ -613,7 +607,7 @@ class MogoPrivateObuNewManager private constructor() { //显示警告红边 CallerHmiManager.showWarning(direction) } - //更新周边车辆进行预警颜色变换,车辆实时移动和变色 //TODO UUID不需要匹配了 + //更新周边车辆进行预警颜色变换,车辆实时移动和变色 ,UUID不需要匹配了 TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let { TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it) } diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuTestNewObuReceiver.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuTestNewObuReceiver.kt index b77c0b0b86..4f8d0f1679 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuTestNewObuReceiver.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuTestNewObuReceiver.kt @@ -37,7 +37,7 @@ class ObuTestNewObuReceiver : BroadcastReceiver() { Log.d("liyz", "obuType:$obuType obuStatus:$obuStatus obuLevel:$obuLevel") val vehBasicsMsg = VehBasics(1) - vehBasicsMsg.targetPosition = 0x11 + vehBasicsMsg.targetPosition = direction val warningMsg = V2xWarning(1) diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtilsNew.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtilsNew.kt index f8ca2b2392..daeb89c890 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtilsNew.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtilsNew.kt @@ -30,10 +30,10 @@ object TrafficDataConvertUtilsNew { val trafficData = TrafficData() trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE trafficData.uuid = info.vehBasicsMsg.id - trafficData.lat = info.vehBasicsMsg.latitude.toDouble() - trafficData.lon = info.vehBasicsMsg.longitude.toDouble() - trafficData.heading = info.vehBasicsMsg.heading.toDouble() - trafficData.speed = info.vehBasicsMsg.speed.toDouble() + trafficData.lat = info.vehBasicsMsg.latitude + trafficData.lon = info.vehBasicsMsg.longitude + trafficData.heading = info.vehBasicsMsg.heading + trafficData.speed = info.vehBasicsMsg.speed return trafficData } @@ -49,11 +49,9 @@ object TrafficDataConvertUtilsNew { } val trafficData = TrafficData() trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG - trafficData.uuid = info.warning_Msg[0].signSerialNum.toString() //TODO - trafficData.lat = info.warning_Msg[0].position.latitude.toDouble() - trafficData.lon = info.warning_Msg[0].position.longitude.toDouble() - - //TODO 没有数据 + trafficData.uuid = info.warning_Msg[0].signSerialNum.toString() + trafficData.lat = info.warning_Msg[0].position.latitude + trafficData.lon = info.warning_Msg[0].position.longitude trafficData.threatLevel = info.warning_Msg[0].warningLevel Log.e("liyz", "cvxRtiThreatIndInfo2TrafficData trafficData -- ${trafficData.toString()}") return trafficData @@ -105,19 +103,33 @@ object TrafficDataConvertUtilsNew { when (info.participant.ptcType) { // 未知 - 0x0 -> { + 0 -> { trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI } + //机动车 //TODO + 1 -> { + trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE + } // 非机动车 - 0x1 -> { - trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_MOTO + 2 -> { + trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_BICYCLE } // 行人 - 0x2 -> { + 3 -> { trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_PEOPLE } } + /** + * 交通参与者类型 + * 0:未知 + * 1:机动车 + * 2:非机动车 + * 3:行人 + * 4:OBU自身 + */ + val ptcType = 0 + // 判断车辆V2X预警级别,调整车辆颜色 if (info.m_warning_msg != null && info.m_warning_msg.warningData != null) { trafficData.threatLevel = info.m_warning_msg.warningData[0].warningLevel diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt index b3484db514..b6feebecf3 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt @@ -24,7 +24,7 @@ enum class TrafficTypeEnum( R.raw.traffic_xiankuang ), TYPE_TRAFFIC_ID_PEOPLE( - 1, + 3, "人", R.raw.traffic_people, R.raw.traffic_people_day,