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

[3.3.0] code opt

Browse Source
This commit is contained in:
zhongchao
2023-06-30 10:25:29 +08:00
parent d5425214e8
commit 0f6b477f15
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
View File

@@ -115,7 +115,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
}
fun setHvInfoSendCycle(time: Int) {
ObuManager.getInstance().setHvInfoPushCycle(time);
ObuManager.getInstance().setHvInfoPushCycle(time)
}
/**
@@ -136,8 +136,8 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
*/
fun deleteObuFile() {
UiThreadHandler.post {
var isDeleteSuccess = FileUtils.delete(Config.downLoadObuPath)
var isDeleteUnzipSuccess = FileUtils.delete(Config.downLoadUnzipObuPath)
val isDeleteSuccess = FileUtils.delete(Config.downLoadObuPath)
val isDeleteUnzipSuccess = FileUtils.delete(Config.downLoadUnzipObuPath)
CallerLogger.d(
"$M_OBU${MogoObuConst.TAG_UPGRADE_OBU}",
"deleteObuFile isDeleteSuccess = $isDeleteSuccess ----isDeleteUnzipSuccess = $isDeleteUnzipSuccess"
@@ -154,11 +154,11 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
/**
* 传递obu升级包给硬件
* @param upgradePackage 升级包文件绝对路径 只能包含 升级包MD5文件和升级包文件
* @param isUpgradeNow 是否立即升级
* upgradePackage 升级包文件绝对路径 只能包含 升级包MD5文件和升级包文件
* isUpgradeNow 是否立即升级
* false：OBU设备下次上电时执行升级程序
* ture: OBU设备立即执行升级程序 TODO 警告：执行立即升级时请确保车辆是静止状态。车辆在运行过程中升级设备可能会影响驾驶，严重时可能造成安全隐患！！！
* @param listener 升级回调
* listener 升级回调
* @return 是否调用成功
*/
fun uploadObuPack(filePathArray: Array<String>) {
@@ -231,8 +231,11 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
}
override fun onObuCallResult(result: BaseResult?) {
if(result == null){
return
}
val builder = StringBuilder("调用结果:\n")
when (result!!.function) {
when (result.function) {
MogoObuConstants.CALL_FUNCTION.CONFIG -> {
val configResult = result as MogoObuCallConfigResult
builder.append(configResult.type.desc).append("配置调用= ")
@@ -624,13 +627,13 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
) {
CallerLogger.d(
"$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
"onMogoObuRsmWarning ------> ${data.toString()}"
"onMogoObuRsmWarning ------> ${data?.toString()}"
)
if (HmiBuildConfig.isShowObuV2iView) {
if (HmiBuildConfig.isShowObuWeaknessTrafficView) {
// 交通参与者类型 0x0:未知 UNKNOWN | 1机动车 2:非机动车 NON_MOTOR | 3:行人 PEDESTRIAN 4:obu
if (data != null && data.participant != null) {
var v2xType = when (data.participant.ptcType) {
val v2xType = when (data.participant.ptcType) {
1 -> { //机动车
EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType
}
@@ -646,7 +649,6 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
}
val ttsContent = EventTypeEnumNew.getWarningTts(v2xType)
val alertContent = EventTypeEnumNew.getWarningContent(v2xType)
var level = -1
val direction = getMessageDirection(data.participant.targetPosition)
CallerLogger.d(
"$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
@@ -654,10 +656,9 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
)
when (data.status) {
MogoObuShowConstants.STATUS.ADD -> { // 添加
// 更新数据，模型变色的时候是不是update,如果不是更新，可能导致模型不变色，（add的时候，是否有level高的） TODO
// 更新数据，模型变色的时候是不是update,如果不是更新，可能导致模型不变色，（add的时候，是否有level高的）
TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data)
?.let {
TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
}
}
@@ -666,7 +667,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
}
MogoObuShowConstants.STATUS.DELETE -> { // 删除
// 更新数据 TODO 删除原来的，改变颜色，删除marker。不影响别的模型添加
// 更新数据 删除原来的，改变颜色，删除marker。不影响别的模型添加
TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data)
?.let {
// 事件结束，还原交通参与者颜色
@@ -681,7 +682,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
//预警status
if (data.warningMsg != null && data.warningMsg.warningDataList != null && data.warningMsg.warningDataList.size > 0) {
level = data.warningMsg.warningDataList[0].warningLevel //默认是1个
val level = data.warningMsg.warningDataList[0].warningLevel //默认是1个
CallerLogger.d(
"$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
"onMogoObuRsmWarning ---status---> ${data.status} ---data.warningMsg.warningData[0].status = ${data.warningMsg.warningDataList[0].status} ---v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent ---level = $level"
@@ -784,7 +785,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
/**
* 构造对应展示数据和场景 根据obu的场景，add change delete确定是否展示
* @param appId 使用WarningTypeEnum获取icon、提示内容、tts内容
* @see com.mogo.module.common.enums.EventTypeEnumNew
* @see com.mogo.eagle.core.data.enums.EventTypeEnumNew
* EventTypeEnumNew在定义的id为了防止重复，和原始数据是不一样的，有对应关系
*/
private fun handleSdkObu(
@@ -999,7 +1000,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
// 添加
MogoObuShowConstants.STATUS.ADD,
MogoObuShowConstants.STATUS.UPDATE -> {
if (lights != null && lights.isNotEmpty()) {
if (lights.isNotEmpty()) {
changeTrafficLightStatus(appId, lights)
}
}
@@ -1066,8 +1067,8 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
if (HmiBuildConfig.isShowGreenWaveView) {
if (!isShowGreenWave) {
isShowGreenWave = true
var minSpeedTemp = Math.round(currentLight.suggestMinSpeed * 3.6)
var maxSpeedTemp = Math.round(currentLight.suggestMaxSpeed * 3.6)
var minSpeedTemp = (currentLight.suggestMinSpeed * 3.6).roundToInt()
val maxSpeedTemp = (currentLight.suggestMaxSpeed * 3.6).roundToInt()
if (minSpeedTemp == maxSpeedTemp) {
minSpeedTemp -= 5
}
@@ -1087,7 +1088,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
val maxSpeed = currentLight.suggestMaxSpeed
if (maxSpeed > 0) {
var currentSpeed =
val currentSpeed =
CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().gnssSpeed.toDouble()
if (currentSpeed > 0) {
ttsContentNew =