fixed conflict
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
package com.mogo.module.obu.mogo
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.util.Log
|
||||
import com.alibaba.android.arouter.launcher.ARouter
|
||||
import com.mogo.module.common.enum.WarningTypeEnum
|
||||
@@ -9,6 +11,7 @@ import com.mogo.module.obu.mogo.map.ObuVulnerableGroupsDrawer
|
||||
import com.mogo.service.IMogoServiceApis
|
||||
import com.mogo.service.MogoServicePaths
|
||||
import com.mogo.service.warning.IMoGoWaringProvider
|
||||
import com.mogo.utils.UiThreadHandler
|
||||
import com.mogo.utils.logger.Logger
|
||||
import com.zhidao.support.obu.MogoObuManager
|
||||
import com.zhidao.support.obu.OnMogoObuListener
|
||||
@@ -54,7 +57,6 @@ class MogoPrivateObuManager private constructor() {
|
||||
//自研obu
|
||||
MogoObuManager.getInstance().connect(context, "192.168.1.199")
|
||||
MogoObuManager.getInstance().registerListener(mogoObuListener)
|
||||
|
||||
}
|
||||
|
||||
private val mogoObuListener: OnMogoObuListener = object : OnMogoObuListener() {
|
||||
@@ -328,7 +330,7 @@ class MogoPrivateObuManager private constructor() {
|
||||
) {
|
||||
var alertContent = ""
|
||||
var ttsContent = ""
|
||||
Log.d(MogoObuConst.TAG_MOGO_OBU, "useCaseId = $ " + useCaseId)
|
||||
Log.d(MogoObuConst.TAG_MOGO_OBU, "useCaseId = $useCaseId ---level = $level --direction = $direction ---status = $status ")
|
||||
// TODO 这里排除需要特殊定制的语音及文案外,其余的都可以使用 WarningTypeEnum 提供的
|
||||
when (useCaseId) {
|
||||
// 变道预警,注意左后车辆/注意右后车辆
|
||||
|
||||
Reference in New Issue
Block a user