diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 97a9cb7d46..8bc2337f09 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/config.gradle b/config.gradle index abeb2b6f37..21ac5be8ec 100644 --- a/config.gradle +++ b/config.gradle @@ -167,7 +167,7 @@ ext { // obu sdk obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.16', - mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.3', + mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.4', adasHigh : 'com.zhidao.support.adas:high:1.2.0.4', // 左侧面板 diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/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 index dc8ba2576d..9cb670dc94 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/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,6 +1,7 @@ package com.mogo.eagle.core.function.obu.mogo import android.content.Context +import android.text.TextUtils import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener @@ -117,11 +118,12 @@ class MogoPrivateObuManager private constructor() { override fun onCvxAppInitIndInfo(info: CvxAppInitIndInfo) { super.onCvxAppInitIndInfo(info) Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxAppInitIndInfo ------> $info") - mObuStatusInfo.stackInfo = info.stack_info - mObuStatusInfo.appInfo = info.app_info - mObuStatusInfo.hliInfo = info.hli_info - mObuStatusInfo.otherInfo = info.other_info - CallerObuListenerManager.invokeListener(mObuStatusInfo) + if (info != null) { + mObuStatusInfo.stackInfo = info.stack_info + mObuStatusInfo.appInfo = info.app_info + mObuStatusInfo.hliInfo = info.hli_info + CallerObuListenerManager.invokeListener(mObuStatusInfo) + } } // (2) 车辆信息:CVX_HV_INFO_IND diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt index fbbe5bdb39..18b11c830c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt @@ -223,7 +223,7 @@ enum class EventTypeEnum( "车内标牌", poiTypeSrcVr=R.drawable.icon_warning_v2x_road_construction, content="车内标牌", - tts="车内标牌" + tts="" ), TYPE_USECASE_ID_TJW( ObuConstants.USE_CASE_ID.TJW.toString(), diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java index 72fde0dede..6142e8101b 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java @@ -123,7 +123,11 @@ public class MogoMapService implements IMogoMapService { @Override public String getMapVersion() { - return MogoMap.getInstance().getMogoMap().getMapVersion(); + if (MogoMap.getInstance().getMogoMap() != null) { + return MogoMap.getInstance().getMogoMap().getMapVersion(); + } else { + return "0"; + } } @Override