Merge remote-tracking branch 'origin/feature/feature_mogo_obu' into feature/feature_mogo_obu

This commit is contained in:
董宏宇
2021-08-24 10:28:51 +08:00
2 changed files with 5 additions and 2 deletions

View File

@@ -176,6 +176,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
@Override
public void warningChangedWithDirection(int type) {
Log.d(TAG, "显示红色预警蒙层");
Log.d("MogoObu", "显示红色预警蒙层 ------> type = " + type);
switch (type) {
case ALERT_THE_FRONT_CRASH_WARNING_TOP:
mWarningTop.setVisibility(View.VISIBLE);

View File

@@ -1,6 +1,7 @@
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.drawer.TrafficMarkerDrawer
import com.mogo.module.common.enums.WarningTypeEnum
@@ -340,7 +341,7 @@ class MogoPrivateObuManager private constructor() {
MogoObuConst.TAG_MOGO_OBU,
"onCvxV2vThreatIndInfo getMessageDirection(direction) = ${
getMessageDirection(direction)
}"
} --- direction = $direction"
)
handleSdkObu(appId, getMessageDirection(direction), status, level, info)
}
@@ -500,6 +501,7 @@ class MogoPrivateObuManager private constructor() {
info: CvxV2vThreatIndInfo
) {
// 这里排除需要特殊定制的语音及文案外,其余的都可以使用 WarningTypeEnum 提供的
Log.d(MogoObuConst.TAG_MOGO_OBU, "appId = $appId --- handleDirection = $direction ")
var alertContent = ""
var ttsContent = ""
when (appId) {
@@ -571,7 +573,7 @@ class MogoPrivateObuManager private constructor() {
ObuConstants.STATUS.ADD -> {
//显示警告红边
mMogoServiceApis!!.v2XListenerManager.warningChangedForListenerWithDirection(
getMessageDirection(direction),
direction,
"ACTION_V2X_FRONT_WARNING"
)
//显示弹框,语音提示