From 351d883388205ca09c6182337e72e712a4c67d51 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:25:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9Obu=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E8=B0=83=E7=94=A8Utils=E4=B8=BA:core:mogo-core-utils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- modules/mogo-module-obu-mogo/build.gradle | 4 +- .../mogo/module/obu/mogo/MoGoObuProvider.kt | 4 +- .../module/obu/mogo/MogoPrivateObuManager.kt | 51 +++++++++---------- .../receiver/ObuRsuTestTriggerReceiver.kt | 4 +- .../mogo/receiver/ObuTestTriggerReceiver.kt | 4 +- .../ObuTestTriggerRecognizedReceiver.kt | 4 +- .../obu/mogo/utils/TrafficDataConvertUtils.kt | 10 ++-- 7 files changed, 40 insertions(+), 41 deletions(-) diff --git a/modules/mogo-module-obu-mogo/build.gradle b/modules/mogo-module-obu-mogo/build.gradle index 0c1725b95c..d74e956534 100644 --- a/modules/mogo-module-obu-mogo/build.gradle +++ b/modules/mogo-module-obu-mogo/build.gradle @@ -51,15 +51,15 @@ dependencies { kapt rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { - api rootProject.ext.dependencies.mogoutils api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.moduledata } else { - api project(":foudations:mogo-utils") api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') + implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-call') } diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt index a42f3f5d0e..c7bbd7d9bf 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt @@ -2,9 +2,9 @@ package com.mogo.module.obu.mogo import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.eagle.core.utilcode.util.LogUtils import com.mogo.service.MogoServicePaths import com.mogo.service.obu.IMoGoObuProvider -import com.mogo.utils.logger.Logger /** * @author xiaoyuzhou @@ -14,7 +14,7 @@ import com.mogo.utils.logger.Logger class MoGoObuProvider : IMoGoObuProvider { private val TAG = "MoGoObuProvider" override fun init(context: Context) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "初始化蘑菇自研OBU……") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "初始化蘑菇自研OBU……") MogoPrivateObuManager.INSTANCE.init(context) } diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt index c1686f80e7..15d8218b40 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt @@ -1,7 +1,6 @@ package com.mogo.module.obu.mogo import android.content.Context -import android.util.Log import com.alibaba.android.arouter.launcher.ARouter import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.mogo.module.common.drawer.TrafficMarkerDrawer @@ -14,7 +13,7 @@ import com.mogo.service.map.IMogoMapService import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener import com.mogo.eagle.core.function.call.hmi.CallerHmiManager -import com.mogo.utils.logger.Logger +import com.mogo.eagle.core.utilcode.util.LogUtils import com.mogo.utils.storage.SharedPrefsMgr import com.zhidao.support.obu.MogoObuManager import com.zhidao.support.obu.OnMogoObuListener @@ -42,7 +41,7 @@ class MogoPrivateObuManager private constructor() { private var mContext: Context? = null fun init(context: Context?) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "obuManager初始化--") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "obuManager初始化--") mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS) .navigation(context) as IMogoServiceApis mContext = context @@ -58,13 +57,13 @@ class MogoPrivateObuManager private constructor() { private val mogoObuListener: OnMogoObuListener = object : OnMogoObuListener() { // OBU连接成功 override fun onConnected() { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onConnected ------> ") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onConnected ------> ") mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU", true) } } // OBU连接失败 override fun onConnectFail(isNeedReconnect: Boolean) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onConnectFail ------> ") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onConnectFail ------> ") mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU", false) } mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_HV", false) } mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_RV", false) } @@ -72,7 +71,7 @@ class MogoPrivateObuManager private constructor() { // OBU断开连接 override fun onDisconnect() { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onDisconnect ------> ") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onDisconnect ------> ") mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU", false) } mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_HV", false) } mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_RV", false) } @@ -81,26 +80,26 @@ class MogoPrivateObuManager private constructor() { // 接收到的原始数据 override fun onReceiveOriginData(data: String) { super.onReceiveOriginData(data) - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onReceiveOriginData ------> data = $data") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onReceiveOriginData ------> data = $data") } // 发送的数据 override fun onSendData(bytes: ByteArray) { super.onSendData(bytes) - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onSendData ------> ") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onSendData ------> ") } // CV2X系统信息 override fun onCvxAppInitIndInfo(info: CvxAppInitIndInfo) { super.onCvxAppInitIndInfo(info) - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxAppInitIndInfo ------> $info") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onCvxAppInitIndInfo ------> $info") } // (2) 车辆信息：CVX_HV_INFO_IND override fun onCvxHvInfoIndInfo(info: CvxHvInfoIndInfo?) { mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_HV", true) } - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxHvInfoIndInfo ------> $info") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onCvxHvInfoIndInfo ------> $info") if (info != null && info.basic_info != null && info.basic_info.position != null) { val movingObjectInfo = info.basic_info val position = movingObjectInfo.position @@ -147,7 +146,7 @@ class MogoPrivateObuManager private constructor() { // (3) 远车信息：CVX_RV_INFO_IND override fun onCvxRvInfoIndInfo(info: CvxRvInfoIndInfo) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxRvInfoIndInfo ------> $info") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onCvxRvInfoIndInfo ------> $info") mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_RV", true) } // 更新数据 TrafficDataConvertUtils.cvxRvInfoIndInfo2TrafficData(info)?.let { @@ -157,7 +156,7 @@ class MogoPrivateObuManager private constructor() { // (3) 道路事件预警信息：CVX_RTI_THREAT_IND override fun onCvxRtiThreatIndInfo(info: CvxRtiThreatIndInfo?) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxRtiThreatIndInfo ------> $info") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onCvxRtiThreatIndInfo ------> $info") if (info != null && info.threat_info != null && info.ext_info != null) { var alertContent = "" @@ -170,7 +169,7 @@ class MogoPrivateObuManager private constructor() { when (appId) { // 道路危险情况预警 EventTypeEnum.TYPE_USECASE_ID_HLW.poiType -> { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- handleDirection = $direction --rtiType = ${info.ext_info.rti_type}") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- handleDirection = $direction --rtiType = ${info.ext_info.rti_type}") when (info.ext_info.rti_type) { //急转弯 0x2 -> { @@ -291,7 +290,7 @@ class MogoPrivateObuManager private constructor() { // (4) V2I预警信息：CVX_IVP_THREAT_IND override fun onCvxIvpThreatIndInfo(info: CvxIvpThreatIndInfo?) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "CvxIvpThreatIndInfo ------> $info") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "CvxIvpThreatIndInfo ------> $info") if (info != null && info.ext_info != null && info.threat_info != null && info.ext_info.lights != null && info.ext_info.lights.isNotEmpty()) { handlerTrafficLight( info.threat_info.app_id, @@ -304,7 +303,7 @@ class MogoPrivateObuManager private constructor() { // (6) 地图红绿灯信息：CVX_MAP_SPAT_INFO_IND override fun onCvxMapSpatInfoIndInfo(info: CvxMapSpatInfoIndInfo?) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxMapSpatInfoIndInfo ------> $info") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onCvxMapSpatInfoIndInfo ------> $info") if (info != null && info.ivp_threat_ext != null && info.ivp_threat_ext.lights != null && info.ivp_threat_ext.lights.isNotEmpty()) { handlerTrafficLight( info.ivp_threat_info.app_id, @@ -317,9 +316,9 @@ class MogoPrivateObuManager private constructor() { // (2) 弱势交通参与者预警信息：CVX_PTC_THREAT_IND override fun onCvxPtcThreatIndInfo(info: CvxPtcThreatIndInfo?) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxPtcInfoIndInfo ------> $info") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onCvxPtcInfoIndInfo ------> $info") if (info != null) { - Logger.d( + LogUtils.dTag( MogoObuConst.TAG_MOGO_OBU, "onCvxPtcInfoIndInfo ---status---> ${info.status}" ) @@ -381,7 +380,7 @@ class MogoPrivateObuManager private constructor() { // (5) 限速预警信息：CVX_SLW_THREAT_IND override fun onCvxSlwThreatIndInfo(info: CvxSlwThreatIndInfo?) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxSlwThreatIndInfo ------> $info") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onCvxSlwThreatIndInfo ------> $info") if (info != null) { when (info.status) { // 添加 @@ -403,7 +402,7 @@ class MogoPrivateObuManager private constructor() { // (1) V2V预警信息：CVX_V2V_THREAT_IND override fun onCvxV2vThreatIndInfo(info: CvxV2vThreatIndInfo?) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxV2vThreatIndInfo ------> $info") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "onCvxV2vThreatIndInfo ------> $info") info?.let { //预警信息,预警类型 threat_level 2、3 info.threat_info?.let { @@ -413,7 +412,7 @@ class MogoPrivateObuManager private constructor() { val appId = info.threat_info.app_id val level = info.threat_info.threat_level val status = info.status - Logger.d( + LogUtils.dTag( MogoObuConst.TAG_MOGO_OBU, "onCvxV2vThreatIndInfo target_classification = ${ getMessageDirection(info.ext_info.target_classification) @@ -436,7 +435,7 @@ class MogoPrivateObuManager private constructor() { * 获取消息的方位 车辆相关 */ private fun getMessageDirection(targetClassification: Int): WarningDirectionEnum { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "预警红边：预警方向->$targetClassification") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "预警红边：预警方向->$targetClassification") return when (targetClassification) { ObuConstants.TARGET_CLASSIFICATION.TC_ONCOMING_IN_LANE, ObuConstants.TARGET_CLASSIFICATION.TC_AHEAD_IN_LANE, @@ -480,7 +479,7 @@ class MogoPrivateObuManager private constructor() { * 处理红绿灯 */ private fun handlerTrafficLight(appId: Int, status: Int, lights: List, indicator: Int) { - Logger.d( + LogUtils.dTag( MogoObuConst.TAG_MOGO_OBU, "handlerTrafficLight appId = $appId --- status = $status ---indicator = $indicator ---lights = $lights ---lights.size = ${lights.size}" ) @@ -516,7 +515,7 @@ class MogoPrivateObuManager private constructor() { // TODO 这里需要根据真实数据确定 indicator 取值方式，暂时写 0 调试 if (lights.size >= indicator) { val currentLight = lights[0] - Logger.d(MogoObuConst.TAG_MOGO_OBU, "currentLight = $currentLight ---currentLight.phase = ${currentLight.phase} --- indicator = $indicator ---appId = $appId") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "currentLight = $currentLight ---currentLight.phase = ${currentLight.phase} --- indicator = $indicator ---appId = $appId") when (currentLight.phase) { // 灯光不可用 0x0 -> { @@ -554,7 +553,7 @@ class MogoPrivateObuManager private constructor() { mIMoGoWaringProvider?.changeCountdownRed(0) mIMoGoWaringProvider?.changeCountdownYellow(0) // 拼接建议速度 - Logger.d(MogoObuConst.TAG_MOGO_OBU, "speed_min = ${currentLight.glosa_suggested_speed_min} --speed_max = ${currentLight.glosa_suggested_speed_max.toInt()}") + LogUtils.dTag(MogoObuConst.TAG_MOGO_OBU, "speed_min = ${currentLight.glosa_suggested_speed_min} --speed_max = ${currentLight.glosa_suggested_speed_max.toInt()}") val adviceSpeed = "${currentLight.glosa_suggested_speed_min.toInt()} - ${currentLight.glosa_suggested_speed_max.toInt()}" @@ -611,7 +610,7 @@ class MogoPrivateObuManager private constructor() { info: CvxV2vThreatIndInfo ) { // 这里排除需要特殊定制的语音及文案外,其余的都可以使用 EventTypeEnum 提供的 - Log.d( + LogUtils.dTag( MogoObuConst.TAG_MOGO_OBU, "handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status" ) @@ -707,7 +706,7 @@ class MogoPrivateObuManager private constructor() { // 添加,更新 add的时候，可能级别是2， ObuConstants.STATUS.ADD, ObuConstants.STATUS.UPDATE -> { - Log.d( + LogUtils.dTag( MogoObuConst.TAG_MOGO_OBU, "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction" ) diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt index e8e311e69c..f09d70a8b8 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt @@ -3,9 +3,9 @@ package com.mogo.module.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.utils.logger.Logger import com.zhidao.support.obu.constants.ObuConstants import com.zhidao.support.obu.model.CvxIvpThreatIndInfo import com.zhidao.support.obu.model.CvxPtcThreatIndInfo @@ -38,7 +38,7 @@ class ObuRsuTestTriggerReceiver : BroadcastReceiver() { val pctType = intent.getIntExtra(MogoObuConst.BROADCAST_PTC_INFO_EXTRA_KEY, 0) val rtiType = intent.getIntExtra(MogoObuConst.BROADCAST_RTI_TYPE_EXTRA_KEY, 0) - Logger.d( + LogUtils.dTag( TAG, "obuStatus:$obuStatus phase:$indicator obuType:$obuType obuLevel:$obuLevel" ) diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt index 2e2127ccba..8635f9fb09 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt @@ -3,9 +3,9 @@ package com.mogo.module.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.utils.logger.Logger import com.zhidao.support.obu.constants.ObuConstants import com.zhidao.support.obu.model.CvxV2vThreatIndInfo import com.zhidao.support.obu.model.advance.MovingObjectInfo @@ -38,7 +38,7 @@ class ObuTestTriggerReceiver : BroadcastReceiver() { val obuLevel = intent.getIntExtra(MogoObuConst.BROADCAST_OBU_LEVEL_EXTRA_KEY, 3) val obuDirection = intent.getIntExtra(MogoObuConst.BROADCAST_OBU_EVENT_DIRECTION_EXTRA_KEY, 0x11) - Logger.d( + LogUtils.dTag( TAG, "obuType:$obuType obuStatus:$obuStatus obuDirection$obuDirection" ) diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt index af9cfb90a5..286f28ccf3 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt @@ -3,9 +3,9 @@ package com.mogo.module.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.utils.logger.Logger import com.zhidao.support.obu.model.CvxHvInfoIndInfo import com.zhidao.support.obu.model.advance.MovingObjectInfo import com.zhidao.support.obu.model.advance.Position @@ -33,7 +33,7 @@ class ObuTestTriggerRecognizedReceiver : BroadcastReceiver() { val obuType = intent.getIntExtra(MogoObuConst.BROADCAST_OBU_TYPE_EXTRA_KEY, 0) val obuStatus = intent.getIntExtra(MogoObuConst.BROADCAST_OBU_STATES_EXTRA_KEY, 0) val obuLevel = intent.getIntExtra(MogoObuConst.BROADCAST_OBU_LEVEL_EXTRA_KEY, 3) - Logger.d(TAG, "obuType:$obuType obuStatus:$obuStatus obuLevel:$obuLevel") + LogUtils.dTag(TAG, "obuType:$obuType obuStatus:$obuStatus obuLevel:$obuLevel") val cvxHvInfoIndInfo = CvxHvInfoIndInfo(0, 1, 2) diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt index 8adcd22292..936a294c39 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt @@ -1,8 +1,8 @@ package com.mogo.module.obu.mogo.utils +import com.mogo.eagle.core.utilcode.util.LogUtils import com.mogo.module.common.drawer.bean.TrafficData import com.mogo.module.common.enums.TrafficTypeEnum -import com.mogo.utils.logger.Logger import com.zhidao.support.obu.constants.ObuConstants import com.zhidao.support.obu.model.CvxPtcThreatIndInfo import com.zhidao.support.obu.model.CvxRtiThreatIndInfo @@ -21,7 +21,7 @@ object TrafficDataConvertUtils { */ fun cvxRvInfoIndInfo2TrafficData(info: CvxRvInfoIndInfo): TrafficData? { if (info.basic_info == null || info.basic_info.position == null) { - Logger.e(TAG, "cvxRvInfoIndInfo2TrafficData 数据转换异常，请检查参数是否齐全") + LogUtils.eTag(TAG, "cvxRvInfoIndInfo2TrafficData 数据转换异常，请检查参数是否齐全") return null } val trafficData = TrafficData() @@ -45,7 +45,7 @@ object TrafficDataConvertUtils { || info.zones_info.first().path_points.first() == null || info.threat_info == null ) { - Logger.e(TAG, "数据转换异常，请检查参数是否齐全") + LogUtils.eTag(TAG, "数据转换异常，请检查参数是否齐全") return null } val trafficData = TrafficData() @@ -65,7 +65,7 @@ object TrafficDataConvertUtils { */ fun cvxV2vThreatIndInfo2TrafficData(info: CvxV2vThreatIndInfo): TrafficData? { if (info.basic_info == null || info.basic_info.position == null || info.threat_info == null) { - Logger.e(TAG, "数据转换异常，请检查参数是否齐全") + LogUtils.eTag(TAG, "数据转换异常，请检查参数是否齐全") return null } val trafficData = TrafficData() @@ -91,7 +91,7 @@ object TrafficDataConvertUtils { */ fun cvxPtcThreatIndInfo2TrafficData(info: CvxPtcThreatIndInfo): TrafficData? { if (info.ptc_pos == null || info.threat_info == null) { - Logger.e(TAG, "数据转换异常，请检查参数是否齐全") + LogUtils.eTag(TAG, "数据转换异常，请检查参数是否齐全") return null } val trafficData = TrafficData() From ef8f6592e8dbb081e853258c8519c8798ce75c4f 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:38:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E7=A0=94OBU?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .idea/gradle.xml | 2 +- app/build.gradle | 4 ++-- .../mogo-core-function-obu-mogo}/.gitignore | 0 .../mogo-core-function-obu-mogo}/README.md | 0 .../mogo-core-function-obu-mogo}/build.gradle | 0 .../mogo-core-function-obu-mogo}/consumer-rules.pro | 0 .../ALPSALPINE CV2X AMI Specification v1.0.7.pdf | Bin .../doc/AMI通讯协议.docx | Bin .../doc/CV2X_HLI_v1.0.1.pdf | Bin .../doc/HLI通讯协议.docx | Bin .../mogo-core-function-obu-mogo}/gradle.properties | 0 .../mogo-core-function-obu-mogo}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../com/mogo/module/obu/mogo/MoGoObuProvider.kt | 2 +- .../java/com/mogo/module/obu/mogo/MogoObuConst.java | 0 .../mogo/module/obu/mogo/MogoPrivateObuManager.kt | 0 .../obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt | 0 .../obu/mogo/receiver/ObuTestTriggerReceiver.kt | 0 .../receiver/ObuTestTriggerRecognizedReceiver.kt | 0 .../obu/mogo/utils/TrafficDataConvertUtils.kt | 0 .../core/function/api}/obu/IMoGoObuProvider.java | 2 +- modules.txt | 2 +- .../java/com/mogo/service/IMogoServiceApis.java | 2 +- .../java/com/mogo/service/impl/MogoServiceApis.java | 2 +- settings.gradle | 3 ++- 25 files changed, 10 insertions(+), 9 deletions(-) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/.gitignore (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/README.md (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/build.gradle (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/consumer-rules.pro (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/doc/ALPSALPINE CV2X AMI Specification v1.0.7.pdf (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/doc/AMI通讯协议.docx (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/doc/CV2X_HLI_v1.0.1.pdf (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/doc/HLI通讯协议.docx (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/gradle.properties (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/proguard-rules.pro (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/AndroidManifest.xml (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt (90%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt (100%) rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt (100%) rename {services/mogo-service-api/src/main/java/com/mogo/service => core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api}/obu/IMoGoObuProvider.java (82%) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index c6183ce37c..7b6fd7b2be 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -19,6 +19,7 @@