yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optgp

Browse Source
This commit is contained in:
lixiaopeng
2021-10-18 20:12:21 +08:00
parent a4650ca514
commit ffc2c2a278
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/gradle.xml generated
View File

@@ -4,7 +4,7 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="testRunner" value="GRADLE" /> <option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules"> <option name="modules">
@@ -81,6 +81,7 @@
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" /> <option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>

2
config.gradle
View File

@@ -167,7 +167,7 @@ ext {
// obu sdk // obu sdk
obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.16', 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', adasHigh : 'com.zhidao.support.adas:high:1.2.0.4',
// 左侧面板 // 左侧面板

12
core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
View File

@@ -1,6 +1,7 @@
package com.mogo.eagle.core.function.obu.mogo package com.mogo.eagle.core.function.obu.mogo
import android.content.Context import android.content.Context
import android.text.TextUtils
import com.alibaba.android.arouter.launcher.ARouter import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
@@ -117,11 +118,12 @@ class MogoPrivateObuManager private constructor() {
override fun onCvxAppInitIndInfo(info: CvxAppInitIndInfo) { override fun onCvxAppInitIndInfo(info: CvxAppInitIndInfo) {
super.onCvxAppInitIndInfo(info) super.onCvxAppInitIndInfo(info)
Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxAppInitIndInfo ------> $info") Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxAppInitIndInfo ------> $info")
mObuStatusInfo.stackInfo = info.stack_info if (info != null) {
mObuStatusInfo.appInfo = info.app_info mObuStatusInfo.stackInfo = info.stack_info
mObuStatusInfo.hliInfo = info.hli_info mObuStatusInfo.appInfo = info.app_info
mObuStatusInfo.otherInfo = info.other_info mObuStatusInfo.hliInfo = info.hli_info
CallerObuListenerManager.invokeListener(mObuStatusInfo) CallerObuListenerManager.invokeListener(mObuStatusInfo)
}
} }
// (2) 车辆信息：CVX_HV_INFO_IND // (2) 车辆信息：CVX_HV_INFO_IND

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt
View File

@@ -223,7 +223,7 @@ enum class EventTypeEnum(
"车内标牌", "车内标牌",
poiTypeSrcVr=R.drawable.icon_warning_v2x_road_construction, poiTypeSrcVr=R.drawable.icon_warning_v2x_road_construction,
content="车内标牌", content="车内标牌",
tts="车内标牌" tts=""
), ),
TYPE_USECASE_ID_TJW( TYPE_USECASE_ID_TJW(
ObuConstants.USE_CASE_ID.TJW.toString(), ObuConstants.USE_CASE_ID.TJW.toString(),

6
services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java
View File

@@ -123,7 +123,11 @@ public class MogoMapService implements IMogoMapService {
@Override @Override
public String getMapVersion() { public String getMapVersion() {
return MogoMap.getInstance().getMogoMap().getMapVersion(); if (MogoMap.getInstance().getMogoMap() != null) {
return MogoMap.getInstance().getMogoMap().getMapVersion();
} else {
return "0";
}
} }
@Override @Override