From 8e40cac509b42514ce9939714d472d9eebc58627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 19:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=87=AA=E7=A0=94OBU?= =?UTF-8?q?=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../src/main/AndroidManifest.xml | 8 ++++---- .../core/function}/obu/mogo/MoGoObuProvider.kt | 2 +- .../core/function}/obu/mogo/MogoObuConst.java | 2 +- .../function}/obu/mogo/MogoPrivateObuManager.kt | 14 +++++++------- .../obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt | 6 +++--- .../obu/mogo/receiver/ObuTestTriggerReceiver.kt | 6 +++--- .../receiver/ObuTestTriggerRecognizedReceiver.kt | 6 +++--- .../obu/mogo/utils/TrafficDataConvertUtils.kt | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) rename core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/{module => eagle/core/function}/obu/mogo/MoGoObuProvider.kt (93%) rename core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/{module => eagle/core/function}/obu/mogo/MogoObuConst.java (95%) rename core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/{module => eagle/core/function}/obu/mogo/MogoPrivateObuManager.kt (99%) rename core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/{module => eagle/core/function}/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt (96%) rename core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/{module => eagle/core/function}/obu/mogo/receiver/ObuTestTriggerReceiver.kt (94%) rename core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/{module => eagle/core/function}/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt (91%) rename core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/{module => eagle/core/function}/obu/mogo/utils/TrafficDataConvertUtils.kt (98%) diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-obu-mogo/src/main/AndroidManifest.xml index a368667a0d..ee523e6bfd 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/AndroidManifest.xml @@ -1,17 +1,17 @@ + package="com.mogo.eagle.core.function.obu.mogo"> - + - + @@ -19,7 +19,7 @@ - + diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/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 similarity index 93% rename from core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt index fb3290c6dd..9bf6bf3bea 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/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 @@ -1,4 +1,4 @@ -package com.mogo.module.obu.mogo +package com.mogo.eagle.core.function.obu.mogo import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoObuConst.java similarity index 95% rename from core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoObuConst.java index 75ca9f41ff..d293a3124a 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoObuConst.java @@ -1,4 +1,4 @@ -package com.mogo.module.obu.mogo; +package com.mogo.eagle.core.function.obu.mogo; /** * author : lxiiaopeng diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt similarity index 99% rename from core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index 15d8218b40..0b865a376e 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -1,4 +1,4 @@ -package com.mogo.module.obu.mogo +package com.mogo.eagle.core.function.obu.mogo import android.content.Context import com.alibaba.android.arouter.launcher.ARouter @@ -6,7 +6,7 @@ import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.mogo.module.common.drawer.TrafficMarkerDrawer import com.mogo.module.common.enums.EventTypeEnum import com.mogo.eagle.core.data.enums.WarningDirectionEnum -import com.mogo.module.obu.mogo.utils.TrafficDataConvertUtils +import com.mogo.eagle.core.function.obu.mogo.utils.TrafficDataConvertUtils import com.mogo.service.IMogoServiceApis import com.mogo.service.MogoServicePaths import com.mogo.service.map.IMogoMapService @@ -319,7 +319,7 @@ class MogoPrivateObuManager private constructor() { LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onCvxPtcInfoIndInfo ------> $info") if (info != null) { LogUtils.dTag( - MogoObuConst.TAG_MOGO_OBU, + MogoObuConst.TAG_MOGO_OBU, "onCvxPtcInfoIndInfo ---status---> ${info.status}" ) var v2xType = "" @@ -413,7 +413,7 @@ class MogoPrivateObuManager private constructor() { val level = info.threat_info.threat_level val status = info.status LogUtils.dTag( - MogoObuConst.TAG_MOGO_OBU, + MogoObuConst.TAG_MOGO_OBU, "onCvxV2vThreatIndInfo target_classification = ${ getMessageDirection(info.ext_info.target_classification) } --- direction = $direction --- appId = $appId ---level = $level -- status = $status" @@ -480,7 +480,7 @@ class MogoPrivateObuManager private constructor() { */ private fun handlerTrafficLight(appId: Int, status: Int, lights: List, indicator: Int) { LogUtils.dTag( - MogoObuConst.TAG_MOGO_OBU, + MogoObuConst.TAG_MOGO_OBU, "handlerTrafficLight appId = $appId --- status = $status ---indicator = $indicator ---lights = $lights ---lights.size = ${lights.size}" ) when (status) { @@ -611,7 +611,7 @@ class MogoPrivateObuManager private constructor() { ) { // 这里排除需要特殊定制的语音及文案外,其余的都可以使用 EventTypeEnum 提供的 LogUtils.dTag( - MogoObuConst.TAG_MOGO_OBU, + MogoObuConst.TAG_MOGO_OBU, "handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status" ) var alertContent: String @@ -707,7 +707,7 @@ class MogoPrivateObuManager private constructor() { ObuConstants.STATUS.ADD, ObuConstants.STATUS.UPDATE -> { LogUtils.dTag( - MogoObuConst.TAG_MOGO_OBU, + MogoObuConst.TAG_MOGO_OBU, "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction" ) if (level == 2 || level == 3) { diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt similarity index 96% rename from core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt index f09d70a8b8..ea7df77545 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt @@ -1,11 +1,11 @@ -package com.mogo.module.obu.mogo.receiver +package com.mogo.eagle.core.function.obu.mogo.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.mogo.eagle.core.utilcode.util.LogUtils -import com.mogo.module.obu.mogo.MogoObuConst -import com.mogo.module.obu.mogo.MogoPrivateObuManager +import com.mogo.eagle.core.function.obu.mogo.MogoObuConst +import com.mogo.eagle.core.function.obu.mogo.MogoPrivateObuManager import com.zhidao.support.obu.constants.ObuConstants import com.zhidao.support.obu.model.CvxIvpThreatIndInfo import com.zhidao.support.obu.model.CvxPtcThreatIndInfo diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuTestTriggerReceiver.kt similarity index 94% rename from core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuTestTriggerReceiver.kt index 8635f9fb09..921b04fec9 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuTestTriggerReceiver.kt @@ -1,11 +1,11 @@ -package com.mogo.module.obu.mogo.receiver +package com.mogo.eagle.core.function.obu.mogo.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.mogo.eagle.core.utilcode.util.LogUtils -import com.mogo.module.obu.mogo.MogoObuConst -import com.mogo.module.obu.mogo.MogoPrivateObuManager +import com.mogo.eagle.core.function.obu.mogo.MogoObuConst +import com.mogo.eagle.core.function.obu.mogo.MogoPrivateObuManager import com.zhidao.support.obu.constants.ObuConstants import com.zhidao.support.obu.model.CvxV2vThreatIndInfo import com.zhidao.support.obu.model.advance.MovingObjectInfo diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt similarity index 91% rename from core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt index 286f28ccf3..b13b84b54d 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt @@ -1,11 +1,11 @@ -package com.mogo.module.obu.mogo.receiver +package com.mogo.eagle.core.function.obu.mogo.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.mogo.eagle.core.utilcode.util.LogUtils -import com.mogo.module.obu.mogo.MogoObuConst -import com.mogo.module.obu.mogo.MogoPrivateObuManager +import com.mogo.eagle.core.function.obu.mogo.MogoObuConst +import com.mogo.eagle.core.function.obu.mogo.MogoPrivateObuManager import com.zhidao.support.obu.model.CvxHvInfoIndInfo import com.zhidao.support.obu.model.advance.MovingObjectInfo import com.zhidao.support.obu.model.advance.Position diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/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 similarity index 98% rename from core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt index 936a294c39..73a552b774 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/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,4 +1,4 @@ -package com.mogo.module.obu.mogo.utils +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